Merge branch 'master' of https://github.com/rusefi/rusefi

firmware/config/boards/proteus/adc_hack.cpp

@@ -0,0 +1,54 @@
+/**
+ * @file	adc_hack.cpp
+ * @brief	Hacky support for a single channel on adc3
+ *
+ * @date December 17, 2019
+ * @author Matthew Kennedy, (c) 2019
+ */
+
+#include "ch.h"
+#include "hal.h"
+
+#include "mpu_util.h"
+#include "io_pins.h"
+
+#include "efilib.h"
+
+static ADCConversionGroup adcConvGroup = { FALSE, 1, nullptr, nullptr,
+	0,
+	ADC_CR2_SWSTART,
+	0, // sample times for channels 10...18
+	ADC_SMPR2_SMP_AN9(ADC_SAMPLE_56),
+
+	0,	// htr
+	0,	// ltr
+
+	0,	// sqr1
+	0,	// sqr2
+	ADC_SQR3_SQ1_N(ADC_CHANNEL_IN9)	// sqr3 - vbatt is on pf3 = adc9
+};
+
+__ALIGNED(32) adcsample_t samples[8];
+
+// we use this as a hook to run near the rest of ADC init...
+void setAdcChannelOverrides(void) {
+	efiSetPadMode("adc input", GPIOF_3, PAL_MODE_INPUT_ANALOG);
+
+	adcStart(&ADCD3, nullptr);
+}
+
+adcsample_t vbattSampleProteus = 0;
+
+void proteusAdcHack()
+{
+	adcConvert(&ADCD3, &adcConvGroup, samples, 8);
+	SCB_InvalidateDCache_by_Addr(reinterpret_cast<uint32_t*>(samples), sizeof(samples));
+
+	uint32_t sum = 0;
+
+	for (int i = 0; i < 8; i++) {
+		sum += samples[i];
+	}
+
+	vbattSampleProteus = sum / efi::size(samples);
+}

firmware/config/boards/proteus/board.mk

@@ -1,6 +1,7 @@
 # List of all the board related files.
 BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
-BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/proteus/board_configuration.cpp
+BOARDSRC_CPP =  $(PROJECT_DIR)/config/boards/proteus/board_configuration.cpp \
+				$(PROJECT_DIR)/config/boards/proteus/adc_hack.cpp
 
 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f767 $(PROJECT_DIR)/config/stm32f7ems
@@ -8,4 +9,4 @@ BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f767 $(PROJECT_DIR)/config/stm32f
 LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld
 
 # Override DEFAULT_ENGINE_TYPE
-DDEFS += -DSTM32F767xx -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS
+DDEFS += -DSTM32F767xx -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DUSE_ADC3_VBATT_HACK -DSTM32_ADC_USE_ADC3=TRUE

firmware/config/boards/proteus/board_configuration.cpp

@@ -167,6 +167,3 @@ void setBoardConfigurationOverrides(void) {
 	engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
 	engineConfiguration->injectionMode = IM_SIMULTANEOUS;
 }
-
-void setAdcChannelOverrides(void) {
-}

firmware/controllers/sensors/voltage.cpp

@@ -24,5 +24,10 @@ bool hasVBatt(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 }
 
 float getVBatt(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+#ifdef USE_ADC3_VBATT_HACK
+	extern adcsample_t vbattSampleProteus;
+	return adcToVolts(vbattSampleProteus) * engineConfiguration->vbattDividerCoeff;
+#else
 	return getVoltage("vbatt", engineConfiguration->vbattAdcChannel PASS_ENGINE_PARAMETER_SUFFIX) * engineConfiguration->vbattDividerCoeff;
+#endif
 }

firmware/hw_layer/adc_inputs.cpp

@@ -433,6 +433,11 @@ public:
 				slowAdc.errorsCount++;
 				return;
 			}
+
+#ifdef USE_ADC3_VBATT_HACK
+			void proteusAdcHack();
+			proteusAdcHack();
+#endif
 		}
 
 		{

firmware/hw_layer/ports/stm32/stm32_common_mpu_util.h

@@ -7,6 +7,9 @@
  */
 
 // burnout or 'Burn Out'
+
+#include "rusefi_enums.h"
+
 typedef enum {
 	BOR_Level_None = OB_BOR_OFF, // 0x0C=12  Supply voltage ranges from 1.62 to 2.10 V
 	BOR_Level_1 = OB_BOR_LEVEL1, // 0x08     Supply voltage ranges from 2.10 to 2.40 V

firmware/util/efilib.h

@@ -87,6 +87,8 @@ float expf_taylor(float x);
 #ifdef __cplusplus
 }
 
+#include <cstddef>
+
 // C++ helpers go here
 namespace efi
 {