rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove proteus legacy build -> none exist in the wild 

(cherry picked from commit 2fd26e948a)
This commit is contained in:
Matthew Kennedy 2023-05-18 18:29:31 -04:00 committed by rusefillc
parent efca5e029a
commit 789aa2cf2a
7 changed files with 4 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build-firmware.yaml vendored
View File

@ -280,11 +280,6 @@ jobs:
ini-file: rusefi_proteus_h7.ini
skip-rate: 90
- build-target: proteus_legacy
folder: config/boards/proteus
ini-file: rusefi_proteus_f7.ini
skip-rate: 90
- build-target: stm32f429_nucleo
folder: config/boards/nucleo_f429
ini-file: rusefi_stm32f429_nucleo.ini

3
firmware/config/boards/BB_V2/board.mk
View File

@ -1,6 +1,5 @@
# List of all the board related files.
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp \
$(BOARDS_DIR)/proteus/adc_hack.cpp
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSTM32F407xx

3
firmware/config/boards/BB_V3/board.mk
View File

@ -1,6 +1,5 @@
# List of all the board related files.
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp \
$(BOARDS_DIR)/proteus/adc_hack.cpp
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSTM32F407xx

3
firmware/config/boards/coreECU/board.mk
View File

@ -1,6 +1,5 @@
# List of all the board related files.
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp \
$(BOARDS_DIR)/proteus/adc_hack.cpp
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSTM32F407xx

51
firmware/config/boards/proteus/adc_hack.cpp
View File

@ -1,51 +0,0 @@
/**
* @file adc_hack.cpp
* @brief Hacky support for a single channel on adc3
*
* @date December 17, 2019
* @author Matthew Kennedy, (c) 2019
*/
#include "pch.h"
#if USE_ADC3_VBATT_HACK
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
};
static NO_CACHE adcsample_t samples[8];
// we use this as a hook to run near the rest of ADC init...
void setAdcChannelOverrides() {
efiSetPadMode("adc input", Gpio::F3, PAL_MODE_INPUT_ANALOG);
adcStart(&ADCD3, nullptr);
}
adcsample_t vbattSampleProteus = 0;
void proteusAdcHack()
{
adcConvert(&ADCD3, &adcConvGroup, samples, 8);
uint32_t sum = 0;
for (int i = 0; i < 8; i++) {
sum += samples[i];
}
vbattSampleProteus = sum / efi::size(samples);
}
#endif /* USE_ADC3_VBATT_HACK */

8
firmware/config/boards/proteus/board.mk
View File

@ -1,6 +1,5 @@
# List of all the board related files.
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp \
$(BOARD_DIR)/adc_hack.cpp
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
ifeq ($(PROJECT_CPU),ARCH_STM32F4)
IS_STM32F429 = yes
@ -36,11 +35,6 @@ endif
# We are running on Proteus hardware!
DDEFS += -DHW_PROTEUS=1
# Proteus <=v0.2 needs ADC hack - vbatt is on ADC3
ifeq ($(PROTEUS_LEGACY),TRUE)
DDEFS += -DUSE_ADC3_VBATT_HACK
endif
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DSHORT_BOARD_NAME=proteus_f7
DEBUG_LEVEL_OPT = -Os -ggdb -g

12
firmware/hw_layer/adc/adc_inputs.cpp
View File

@ -190,13 +190,6 @@ int getInternalAdcValue(const char *msg, adc_channel_e hwChannel) {
return -1;
}
#if USE_ADC3_VBATT_HACK
if (hwChannel == EFI_ADC_7) {
extern adcsample_t vbattSampleProteus;
return vbattSampleProteus;
}
#endif // USE_ADC3_VBATT_HACK
#if EFI_USE_FAST_ADC
if (adcHwChannelEnabled[hwChannel] == ADC_FAST) {
int internalIndex = fastAdc.internalAdcIndexByHardwareIndex[hwChannel];
@ -376,11 +369,6 @@ public:
return;
}
#ifdef USE_ADC3_VBATT_HACK
void proteusAdcHack();
proteusAdcHack();
#endif
// Ask the port to sample the MCU temperature
mcuTemperature = getMcuTemperature();
}