From 8a13b50d32ed2691306f8308a562ad0a19cf6672 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 25 Apr 2015 21:12:30 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/custom_engine.cpp | 7 --- firmware/config/engines/dodge_neon.cpp | 21 -------- .../config/engines/ford_1995_inline_6.cpp | 11 ---- firmware/config/engines/honda_accord.cpp | 12 ----- .../controllers/algo/engine_configuration.cpp | 18 ------- ...ngine_configuration_generated_structures.h | 6 +-- firmware/controllers/sensors/tps.cpp | 7 ++- firmware/hw_layer/HIP9011.cpp | 1 - firmware/hw_layer/adc_inputs.cpp | 32 ++++++++++-- firmware/hw_layer/hardware.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 52 ++++++------------- 13 files changed, 55 insertions(+), 118 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 96d6aaf6b9..e86502dc3f 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -34,21 +34,14 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { * Frankenso analog #11 PC5 ADC15 * Frankenso analog #12 PC4 ADC14 VBatt */ - boardConfiguration->adcHwChannelEnabled[2] = ADC_FAST; engineConfiguration->tpsAdcChannel = EFI_ADC_2; - boardConfiguration->adcHwChannelEnabled[0] = ADC_FAST; engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; - boardConfiguration->adcHwChannelEnabled[4] = ADC_SLOW; - engineConfiguration->cltAdcChannel = EFI_ADC_12; engineConfiguration->iatAdcChannel = EFI_ADC_11; engineConfiguration->afr.hwChannel = EFI_ADC_13; - boardConfiguration->adcHwChannelEnabled[14] = ADC_SLOW; - engineConfiguration->vbattAdcChannel = EFI_ADC_14; - setCommonNTCSensor(&engineConfiguration->clt); engineConfiguration->clt.bias_resistor = 2700; setCommonNTCSensor(&engineConfiguration->iat); diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index a1c2e8d7a4..c907e19bc5 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -318,27 +318,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { */ engineConfiguration->map.sensor.hwChannel = EFI_ADC_6; - boardConfiguration->adcHwChannelEnabled[0] = ADC_SLOW; // ADC0 - PA0 - boardConfiguration->adcHwChannelEnabled[1] = ADC_SLOW; // just for test - boardConfiguration->adcHwChannelEnabled[2] = ADC_SLOW; // just for test - boardConfiguration->adcHwChannelEnabled[3] = ADC_SLOW; // just for test - - boardConfiguration->adcHwChannelEnabled[4] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[5] = ADC_OFF; - boardConfiguration->adcHwChannelEnabled[6] = ADC_FAST; - boardConfiguration->adcHwChannelEnabled[7] = ADC_SLOW; // just for test - - boardConfiguration->adcHwChannelEnabled[8] = ADC_OFF; - boardConfiguration->adcHwChannelEnabled[9] = ADC_OFF; - boardConfiguration->adcHwChannelEnabled[10] = ADC_OFF; - boardConfiguration->adcHwChannelEnabled[11] = ADC_SLOW; // IAT - - boardConfiguration->adcHwChannelEnabled[12] = ADC_SLOW; // CLT - boardConfiguration->adcHwChannelEnabled[13] = ADC_SLOW; // AFR - boardConfiguration->adcHwChannelEnabled[14] = ADC_SLOW; // VBatt - boardConfiguration->adcHwChannelEnabled[15] = ADC_FAST; // TPS - - /** * TPS */ diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index e6f506418c..0b48cfd094 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -68,17 +68,6 @@ void setFordInline6(DECLARE_ENGINE_PARAMETER_F) { // input channel 10 is PC3, that's ADC13 // input channel 12 is PC1, that's ADC11 - memset(boardConfiguration->adcHwChannelEnabled, 0, sizeof(boardConfiguration->adcHwChannelEnabled)); - boardConfiguration->adcHwChannelEnabled[1] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[2] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[3] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[4] = ADC_SLOW; - - boardConfiguration->adcHwChannelEnabled[7] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[11] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[15] = ADC_FAST; - - engineConfiguration->tpsAdcChannel = EFI_ADC_4; engineConfiguration->iatAdcChannel = EFI_ADC_2; engineConfiguration->cltAdcChannel = EFI_ADC_1; diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 878934f93b..32af5aef9d 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -96,18 +96,6 @@ static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) { * Inp6/ADC1 PA1: TPS * Inp12/ADC14 PC4: VBatt */ - memset(boardConfiguration->adcHwChannelEnabled, 0, sizeof(boardConfiguration->adcHwChannelEnabled)); - boardConfiguration->adcHwChannelEnabled[0] = ADC_FAST; // ADC0 - PA0 - MAP - boardConfiguration->adcHwChannelEnabled[1] = ADC_SLOW; // TPS - boardConfiguration->adcHwChannelEnabled[2] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[3] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[4] = ADC_SLOW; - - boardConfiguration->adcHwChannelEnabled[6] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[11] = ADC_SLOW; // IAT - boardConfiguration->adcHwChannelEnabled[12] = ADC_SLOW; // CLT - boardConfiguration->adcHwChannelEnabled[13] = ADC_SLOW; // AFR - boardConfiguration->adcHwChannelEnabled[14] = ADC_SLOW; // VBatt /** * D14/W10 O2 Sensor diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index c0c4e451ca..82beaabbc5 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -528,23 +528,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->gps_rx_pin = GPIOB_7; boardConfiguration->gps_tx_pin = GPIOB_6; - memset(boardConfiguration->adcHwChannelEnabled, 0, sizeof(boardConfiguration->adcHwChannelEnabled)); - boardConfiguration->adcHwChannelEnabled[0] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[1] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[2] = ADC_SLOW; - - boardConfiguration->adcHwChannelEnabled[3] = ADC_FAST; - engineConfiguration->tpsAdcChannel = EFI_ADC_3; - - boardConfiguration->adcHwChannelEnabled[4] = ADC_FAST; - // boardConfiguration->adcHwChannelEnabled[5] = ADC_SLOW; PA5 is also timer input - boardConfiguration->adcHwChannelEnabled[6] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[7] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[11] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[12] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[13] = ADC_SLOW; - boardConfiguration->adcHwChannelEnabled[14] = ADC_SLOW; - boardConfiguration->triggerInputPins[0] = GPIOC_6; boardConfiguration->triggerInputPins[1] = GPIOA_5; boardConfiguration->logicAnalyzerPins[0] = GPIO_UNASSIGNED; @@ -805,7 +788,6 @@ void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration) { * VBatt */ engineConfiguration->vbattAdcChannel = EFI_ADC_14; - engineConfiguration->bc.adcHwChannelEnabled[14] = ADC_SLOW; } void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) { diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 754398fdf0..0293b4ebe3 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated by config_definition.jar on Thu Apr 23 17:29:25 EDT 2015 +// this section was generated by config_definition.jar on Sat Apr 25 18:11:41 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -372,7 +372,7 @@ typedef struct { /** * offset 232 */ - adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX]; + adc_channel_mode_e unusedADC[HW_MAX_ADC_INDEX]; /** * offset 296 */ @@ -1289,4 +1289,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Thu Apr 23 17:29:25 EDT 2015 +// this section was generated by config_definition.jar on Sat Apr 25 18:11:41 EDT 2015 diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp index f96cfc9fd7..2ba6f8a24e 100644 --- a/firmware/controllers/sensors/tps.cpp +++ b/firmware/controllers/sensors/tps.cpp @@ -88,11 +88,10 @@ int getTPS10bitAdc(DECLARE_ENGINE_PARAMETER_F) { if(engineConfiguration->tpsAdcChannel==EFI_ADC_NONE) return -1; #if EFI_PROD_CODE - if(boardConfiguration->adcHwChannelEnabled[engineConfiguration->tpsAdcChannel]==ADC_FAST) - return tpsFastAdc / 4; + return tpsFastAdc / 4; +#else + return 0; #endif /* EFI_PROD_CODE */ - int adc = getAdcValue(engineConfiguration->tpsAdcChannel); - return (int) adc / 4; // Only for TunerStudio compatibility. Max TS adc value in 1023 } /** diff --git a/firmware/hw_layer/HIP9011.cpp b/firmware/hw_layer/HIP9011.cpp index 752961dfaf..4f713203c5 100644 --- a/firmware/hw_layer/HIP9011.cpp +++ b/firmware/hw_layer/HIP9011.cpp @@ -135,7 +135,6 @@ void setHip9011FrankensoPinout(void) { boardConfiguration->hip9011Gain = 0.1; engineConfiguration->hipThreshold = 2; - boardConfiguration->adcHwChannelEnabled[10] = ADC_FAST; // HIP9011 engineConfiguration->hipOutputChannel = EFI_ADC_10; } diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 4262c03dc7..112ac57692 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -19,6 +19,8 @@ #include "engine_math.h" #include "board_test.h" +static adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX]; + AdcDevice::AdcDevice(ADCConversionGroup* hwConfig) { this->hwConfig = hwConfig; channelCount = 0; @@ -191,11 +193,11 @@ int getInternalAdcValue(adc_channel_e hwChannel) { return -1; } - if (boardConfiguration->adcHwChannelEnabled[hwChannel] == ADC_FAST) { + if (adcHwChannelEnabled[hwChannel] == ADC_FAST) { int internalIndex = fastAdc.internalAdcIndexByHardwareIndex[hwChannel]; return fastAdc.samples[internalIndex]; } - if (boardConfiguration->adcHwChannelEnabled[hwChannel] != ADC_SLOW) { + if (adcHwChannelEnabled[hwChannel] != ADC_SLOW) { warning(OBD_PCM_Processor_Fault, "ADC is off %d", hwChannel); } @@ -463,9 +465,33 @@ static void adc_callback_slow(ADCDriver *adcp, adcsample_t *buffer, size_t n) { } } +static void addChannel(adc_channel_e setting, adc_channel_mode_e mode) { + if (setting == EFI_ADC_NONE) { + return; + } + adcHwChannelEnabled[setting] = mode; +} + +static void configureInputs(void) { + memset(adcHwChannelEnabled, 0, sizeof(adcHwChannelEnabled)); + + addChannel(engineConfiguration->tpsAdcChannel, ADC_FAST); + addChannel(engineConfiguration->map.sensor.hwChannel, ADC_FAST); + addChannel(engineConfiguration->mafAdcChannel, ADC_FAST); + addChannel(engineConfiguration->hipOutputChannel, ADC_FAST); + + addChannel(engineConfiguration->vbattAdcChannel, ADC_SLOW); + addChannel(engineConfiguration->cltAdcChannel, ADC_SLOW); + addChannel(engineConfiguration->iatAdcChannel, ADC_SLOW); + addChannel(engineConfiguration->afr.hwChannel, ADC_SLOW); +} + void initAdcInputs(bool boardTestMode) { printMsg(&logger, "initAdcInputs()"); + configureInputs(); + + printStatus(); addConsoleActionI("adcDebug", &setAdcDebugReporting); @@ -478,7 +504,7 @@ void initAdcInputs(bool boardTestMode) { adcStart(&ADC_FAST_DEVICE, NULL); for (int adc = 0; adc < HW_MAX_ADC_INDEX; adc++) { - adc_channel_mode_e mode = boardConfiguration->adcHwChannelEnabled[adc]; + adc_channel_mode_e mode = adcHwChannelEnabled[adc]; /** * in board test mode all currently enabled ADC channels are running in slow mode diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index ec2829a679..4f509bde47 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -179,7 +179,7 @@ static void calcFastAdcIndexes(void) { hipSampleIndex = engineConfiguration->hipOutputChannel == EFI_ADC_NONE ? -1 : fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->hipOutputChannel]; - if(engineConfiguration->tpsAdcChannel!=EFI_ADC_NONE && boardConfiguration->adcHwChannelEnabled[engineConfiguration->tpsAdcChannel]==ADC_FAST) { + if (engineConfiguration->tpsAdcChannel != EFI_ADC_NONE) { tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tpsAdcChannel]; } else { tpsSampleIndex = TPS_IS_SLOW; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 6872a1ef9a..f86ba4baca 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -307,7 +307,7 @@ spi_device_e digitalPotentiometerSpiDevice;Digital Potentiometer is used by stoc brain_pin_e[DIGIPOT_COUNT iterate] digitalPotentiometerChipSelect; custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fast", "INVALID" - adc_channel_mode_e[HW_MAX_ADC_INDEX iterate] adcHwChannelEnabled; + adc_channel_mode_e[HW_MAX_ADC_INDEX iterate] unusedADC; brain_input_pin_e[3 iterate] triggerInputPins; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 3b3f1c6618..5f31d1ac11 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -290,5 +290,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20150423; + return 20150425; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 5178368b0b..529a24ca55 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Thu Apr 23 17:29:27 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sat Apr 25 18:11:43 EDT 2015 pageSize = 15288 page = 1 @@ -205,22 +205,22 @@ page = 1 digitalPotentiometerChipSelect2 = bits, U32, 836, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" digitalPotentiometerChipSelect3 = bits, U32, 840, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" digitalPotentiometerChipSelect4 = bits, U32, 844, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - adcHwChannelEnabled1 = bits, U32, 848, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled2 = bits, U32, 852, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled3 = bits, U32, 856, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled4 = bits, U32, 860, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled5 = bits, U32, 864, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled6 = bits, U32, 868, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled7 = bits, U32, 872, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled8 = bits, U32, 876, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled9 = bits, U32, 880, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled10 = bits, U32, 884, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled11 = bits, U32, 888, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled12 = bits, U32, 892, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled13 = bits, U32, 896, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled14 = bits, U32, 900, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled15 = bits, U32, 904, [0:1], "Off", "Slow", "Fast", "INVALID" - adcHwChannelEnabled16 = bits, U32, 908, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC1 = bits, U32, 848, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC2 = bits, U32, 852, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC3 = bits, U32, 856, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC4 = bits, U32, 860, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC5 = bits, U32, 864, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC6 = bits, U32, 868, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC7 = bits, U32, 872, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC8 = bits, U32, 876, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC9 = bits, U32, 880, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC10 = bits, U32, 884, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC11 = bits, U32, 888, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC12 = bits, U32, 892, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC13 = bits, U32, 896, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC14 = bits, U32, 900, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC15 = bits, U32, 904, [0:1], "Off", "Slow", "Fast", "INVALID" + unusedADC16 = bits, U32, 908, [0:1], "Off", "Slow", "Fast", "INVALID" triggerInputPins1 = bits, U32, 912, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOA_5", "INVALID", "INVALID", "GPIOA_8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOC_6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOE_5", "INVALID", "GPIOE_7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" triggerInputPins2 = bits, U32, 916, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOA_5", "INVALID", "INVALID", "GPIOA_8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOC_6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOE_5", "INVALID", "GPIOE_7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" triggerInputPins3 = bits, U32, 920, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOA_5", "INVALID", "INVALID", "GPIOA_8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOC_6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOE_5", "INVALID", "GPIOE_7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1111,23 +1111,6 @@ fileVersion = { 20150406 } field = "vBatt ADC input", vbattAdcChannel field = "AFR ADC input", afr_hwChannel - dialog = analogInputMode, "Analog input mode" - field = "ADC on PA0", adcHwChannelEnabled1 - field = "ADC on PA1", adcHwChannelEnabled2 - field = "ADC on PA2", adcHwChannelEnabled3 - field = "ADC on PA3", adcHwChannelEnabled4 - field = "ADC on PA4", adcHwChannelEnabled5 - field = "ADC on PA5", adcHwChannelEnabled6 - field = "ADC on PA6", adcHwChannelEnabled7 - field = "ADC on PA7", adcHwChannelEnabled8 - field = "ADC on PB0", adcHwChannelEnabled9 - field = "ADC on PB1", adcHwChannelEnabled10 - field = "ADC on PC0", adcHwChannelEnabled11 - field = "ADC on PC1", adcHwChannelEnabled12 - field = "ADC on PC2", adcHwChannelEnabled13 - field = "ADC on PC3", adcHwChannelEnabled14 - field = "ADC on PC4", adcHwChannelEnabled15 - field = "ADC on PC5", adcHwChannelEnabled16 dialog = egtInputs, "EGT inputs" field = "SPI", max31855spiDevice @@ -1146,7 +1129,6 @@ fileVersion = { 20150406 } dialog = boardInputDown, "", border panel = boardInputLeft, West - panel = analogInputMode, East dialog = boardInputs, "", border panel = triggerInputs, North