G0 GPIO expansion with ADC and outputs

.gitmodules

@@ -44,3 +44,7 @@
 	path = firmware/ext/build-tools
 	url = https://github.com/FOME-Tech/build-tools.git
 	branch = main
+[submodule "firmware/ext/g0_firmware"]
+	path = firmware/ext/g0_firmware
+	url = https://github.com/dynfer/g0-extension.git
+	branch = main

firmware/config/boards/atlas/board.mk

@@ -13,7 +13,7 @@ DDEFS += -DFIRMWARE_ID=\"atlas\"
 # DDEFS += -DTRIGGER_SCOPE
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 
-DDEFS += -DEFI_SDC_DEVICE=SDCD1
+DDEFS += -DEFI_SDC_DEVICE=SDCD1 -DEFI_MAX_31855=TRUE
 
 # Atlas's LSE runs in bypass mode (doesn't use OSC IN pin)
 DDEFS += -DSTM32_LSE_BYPASS

firmware/config/boards/atlas/board_configuration.cpp

@@ -137,6 +137,12 @@ void setBoardConfigOverrides() {
 	engineConfiguration->spi4misoPin = Gpio::E5;
 	engineConfiguration->spi4mosiPin = Gpio::E6;
 
+	// G0 extension firmware SPI
+	engineConfiguration->is_enabled_spi_5 = true;
+	engineConfiguration->spi5sckPin = Gpio::F7;
+	engineConfiguration->spi5misoPin = Gpio::F8;
+	engineConfiguration->spi5mosiPin = Gpio::F9;
+
 	// Clear SPI SD card pins in case it's enabled from porting a Proteus tune
 	if (engineConfiguration->sdCardSpiDevice || isBrainPinValid(engineConfiguration->sdCardCsPin)) {
 		engineConfiguration->is_enabled_spi_3 = false;

firmware/config/boards/atlas/compile_atlas.sh

@@ -1,5 +1,51 @@
 #!/bin/bash
 
+set -e
+
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+FW_DIR=$(readlink -f "$SCRIPT_DIR/../../..")
+REPO_DIR=$(readlink -f "$FW_DIR/..")
+G0_DIR="$FW_DIR/ext/g0_firmware"
+
 export USE_OPENBLT=yes
 
+git -C "$REPO_DIR" submodule sync firmware/ext/g0_firmware
+if [ "${UPDATE_G0_FIRMWARE-yes}" = "yes" ]; then
+  git -C "$REPO_DIR" submodule update --init --recursive --remote firmware/ext/g0_firmware
+else
+  git -C "$REPO_DIR" submodule update --init --recursive firmware/ext/g0_firmware
+fi
+git -C "$REPO_DIR" submodule update --init --depth=1 firmware/ext/build-tools
+
+UNAME_SM=$(uname -sm)
+case "$UNAME_SM" in
+  "Darwin "*)
+    COMPILER_PLATFORM=arm-gnu-toolchain-11.3.rel1-darwin-x86_64-arm-none-eabi
+    ;;
+  "Linux x86_64")
+    COMPILER_PLATFORM=arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi
+    ;;
+  *)
+    echo "Unsupported compiler platform: $UNAME_SM"
+    exit 1
+    ;;
+esac
+
+G0_TRGT="$FW_DIR/ext/build-tools/$COMPILER_PLATFORM/bin/arm-none-eabi-"
+[ -x "${G0_TRGT}g++" ] || { echo "Compiler not found at ${G0_TRGT}g++"; exit 1; }
+
+make -C "$G0_DIR" -j$(nproc) TRGT="$G0_TRGT" USE_OPT="-Os -ggdb -fomit-frame-pointer -falign-functions=16 --specs=nosys.specs" for_fome_image
+
+G0_IMAGE_HEADER="$G0_DIR/for_fome/g0_firmware_image.h"
+G0_SPI_APP_PROTOCOL="$G0_DIR/spi_app_protocol.cpp"
+if [ ! -f "$G0_SPI_APP_PROTOCOL" ]; then
+  G0_SPI_APP_PROTOCOL="$G0_DIR/source/spi_app_protocol.cpp"
+fi
+G0_APP_VERSION=$(sed -nE 's/.*(APP_VERSION|appVersion) = ([0-9]+)U;.*/\2/p' "$G0_SPI_APP_PROTOCOL" | head -n1)
+[ -n "$G0_APP_VERSION" ] || { echo "Unable to determine G0 app version"; exit 1; }
+if ! grep -q 'build_g0_extension_version' "$G0_IMAGE_HEADER"; then
+  printf '\nstatic const unsigned int build_g0_extension_version = %sU;\n' "$G0_APP_VERSION" >> "$G0_IMAGE_HEADER"
+fi
+
+cd "$SCRIPT_DIR"
 bash ../common_make.sh atlas ARCH_STM32H7

firmware/config/boards/atlas/connectors/g0.yaml

@@ -0,0 +1,80 @@
+pins:
+  - id: EFI_ADC_20
+    class: analog_inputs
+    ts_name: G0 Analog 1
+
+  - id: EFI_ADC_21
+    class: analog_inputs
+    ts_name: G0 Analog 2
+
+  - id: EFI_ADC_22
+    class: analog_inputs
+    ts_name: G0 Analog 3
+
+  - id: EFI_ADC_23
+    class: analog_inputs
+    ts_name: G0 Analog 4
+
+  - id: EFI_ADC_24
+    class: analog_inputs
+    ts_name: G0 Analog 5
+
+  - id: EFI_ADC_25
+    class: analog_inputs
+    ts_name: G0 Analog 6
+
+  - id: EFI_ADC_26
+    class: analog_inputs
+    ts_name: G0 Analog 7
+
+  - id: EFI_ADC_27
+    class: analog_inputs
+    ts_name: G0 Analog 8
+
+  - id: EFI_ADC_28
+    class: analog_inputs
+    ts_name: G0 Analog Temp 1
+
+  - id: EFI_ADC_29
+    class: analog_inputs
+    ts_name: G0 Analog Temp 2
+
+  - id: EFI_ADC_30
+    class: analog_inputs
+    ts_name: G0 Analog Temp 3
+
+  - id: EFI_ADC_31
+    class: analog_inputs
+    ts_name: G0 Analog Temp 4
+
+  - id: G0_DIGITAL_IN_0
+    class: switch_inputs
+    ts_name: G0 Digital 1
+
+  - id: G0_DIGITAL_IN_1
+    class: switch_inputs
+    ts_name: G0 Digital 2
+
+  - id: G0_DIGITAL_IN_2
+    class: switch_inputs
+    ts_name: G0 Digital 3
+
+  - id: G0_DIGITAL_IN_3
+    class: switch_inputs
+    ts_name: G0 Digital 4
+
+  - id: G0_LOWSIDE_0
+    class: outputs
+    ts_name: G0 Lowside 1
+
+  - id: G0_LOWSIDE_1
+    class: outputs
+    ts_name: G0 Lowside 2
+
+  - id: G0_LOWSIDE_2
+    class: outputs
+    ts_name: G0 Lowside 3
+
+  - id: G0_LOWSIDE_3
+    class: outputs
+    ts_name: G0 Lowside 4

firmware/config/boards/atlas/prepend.txt

@@ -1,5 +1,5 @@
 #define ts_show_full_pinout false
-#define ts_show_egt false
+#define ts_show_egt true
 #define ts_show_analog_divider false
 #define ts_show_spi false
 #define ts_show_can_pins false

firmware/config/boards/atlas_meta.h

@@ -65,3 +65,16 @@
 #define PROTEUS_DIGITAL_4 Gpio::E11
 #define PROTEUS_DIGITAL_5 Gpio::E12
 #define PROTEUS_DIGITAL_6 Gpio::E13
+
+#define ATLAS_G0_ANALOG_1 EFI_ADC_20
+#define ATLAS_G0_ANALOG_2 EFI_ADC_21
+#define ATLAS_G0_ANALOG_3 EFI_ADC_22
+#define ATLAS_G0_ANALOG_4 EFI_ADC_23
+#define ATLAS_G0_ANALOG_5 EFI_ADC_24
+#define ATLAS_G0_ANALOG_6 EFI_ADC_25
+#define ATLAS_G0_ANALOG_7 EFI_ADC_26
+#define ATLAS_G0_ANALOG_8 EFI_ADC_27
+#define ATLAS_G0_ANALOG_TEMP_1 EFI_ADC_28
+#define ATLAS_G0_ANALOG_TEMP_2 EFI_ADC_29
+#define ATLAS_G0_ANALOG_TEMP_3 EFI_ADC_30
+#define ATLAS_G0_ANALOG_TEMP_4 EFI_ADC_31

firmware/console/binary/output_channels.txt

@@ -29,6 +29,7 @@ struct_no_prefix output_channels_s
 	bit ignitionFault;Error: Ignition Fault
 	bit isUsbConnected;isUsbConnected\nOriginal reason for this is to check if USB is connected from Lua
 	bit dfcoActive;DFCO: Active
+	bit g0Present;G0 extension: Present
 
 
 	uint16_t RPMValue;@@GAUGE_NAME_RPM@@;"RPM",1, 0, 0, 8000, 0

firmware/console/status_loop.cpp

@@ -38,6 +38,9 @@
 #include "main_trigger_callback.h"
 #include "spark_logic.h"
 #include "gitversion.h"
+#if HW_ATLAS
+#include "hw_layer/g0_extension/g0_extension_io.h"
+#endif
 #include "can_hw.h"
 #include "periodic_thread_controller.h"
 #include "binary_logging.h"
@@ -492,6 +495,11 @@ void updateTunerStudioState() {
 	tsOutputChannels->gyroYaw = engine->sensors.accelerometer.yawRate;
 
 	tsOutputChannels->turboSpeed = Sensor::getOrZero(SensorType::TurbochargerSpeed);
+#if HW_ATLAS
+	tsOutputChannels->g0Present = isG0ExtensionPresent();
+#else
+	tsOutputChannels->g0Present = false;
+#endif
 	extern FrequencySensor vehicleSpeedSensor;
 	tsOutputChannels->vssEdgeCounter = vehicleSpeedSensor.eventCounter;
 

firmware/controllers/algo/rusefi_hw_enums.h

@@ -234,6 +234,27 @@ enum class Gpio : uint16_t {
 	TLE6240_PIN_15 = 213,
 	TLE6240_PIN_16 = 214,
 
+	G0_ANALOG_1 = 215,
+	G0_ANALOG_2 = 216,
+	G0_ANALOG_3 = 217,
+	G0_ANALOG_4 = 218,
+	G0_ANALOG_5 = 219,
+	G0_ANALOG_6 = 220,
+	G0_ANALOG_7 = 221,
+	G0_ANALOG_8 = 222,
+	G0_ANALOG_TEMP_1 = 223,
+	G0_ANALOG_TEMP_2 = 224,
+	G0_ANALOG_TEMP_3 = 225,
+	G0_ANALOG_TEMP_4 = 226,
+	G0_DIGITAL_IN_0 = 227,
+	G0_DIGITAL_IN_1 = 228,
+	G0_DIGITAL_IN_2 = 229,
+	G0_DIGITAL_IN_3 = 230,
+	G0_LOWSIDE_0 = 231,
+	G0_LOWSIDE_1 = 232,
+	G0_LOWSIDE_2 = 233,
+	G0_LOWSIDE_3 = 234,
+
 	CAN_INPUT_0 = 249,
 	CAN_INPUT_1 = 250,
 	CAN_INPUT_2 = 251,

firmware/controllers/controllers.mk

@@ -73,4 +73,3 @@ CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR)/actuators \
 	$(CONTROLLERS_DIR)/actuators/gppwm \
 	$(CONTROLLERS_DIR)/serial \
-

firmware/controllers/system/efi_gpio.cpp

@@ -10,6 +10,9 @@
 #include "engine_sniffer.h"
 
 #include "drivers/gpio/gpio_ext.h"
+#if EFI_PROD_CODE && HW_ATLAS
+#include "hw_layer/g0_extension/g0_extension_io.h"
+#endif
 
 #if HW_HELLEN
 #include "hellen_meta.h"
@@ -458,6 +461,13 @@ void OutputPin::setValue(int logicValue) {
 	int electricalValue = getElectricalValue(logicValue, m_mode);
 
 #if EFI_PROD_CODE
+#if HW_ATLAS
+	if (isG0ExtensionLowsidePin(m_brainPin)) {
+		setG0ExtensionLowsideOutput(m_brainPin, electricalValue != 0);
+		return;
+	}
+#endif
+
 #if (BOARD_EXT_GPIOCHIPS > 0)
 	if (!this->ext) {
 		setOnchipValue(electricalValue);
@@ -575,6 +585,13 @@ void OutputPin::initPin(
 	setDefaultPinState(outputMode);
 
 #if EFI_PROD_CODE
+#if HW_ATLAS
+	if (isG0ExtensionLowsidePin(m_brainPin)) {
+		brain_pin_markUsed(m_brainPin, msg);
+		return;
+	}
+#endif
+
 	iomode_t ioMode = (outputMode == OM_DEFAULT || outputMode == OM_INVERTED) ? PAL_MODE_OUTPUT_PUSHPULL
 																			  : PAL_MODE_OUTPUT_OPENDRAIN;
 
@@ -621,6 +638,17 @@ void OutputPin::deInit() {
 
 	efiPrintf("unregistering %s", hwPortname(m_brainPin));
 
+#if EFI_PROD_CODE
+#if HW_ATLAS
+	if (isG0ExtensionLowsidePin(m_brainPin)) {
+		disableG0ExtensionLowsideOutput(m_brainPin);
+		brain_pin_markUnused(m_brainPin);
+		m_brainPin = Gpio::Unassigned;
+		return;
+	}
+#endif
+#endif
+
 	efiSetPadUnused(m_brainPin);
 
 	// Clear the pin so that it won't get set any more