Skip to content

Commit

Permalink
F7 nucleo does not work?
Browse files Browse the repository at this point in the history
funny, it was about some very unused feature
  • Loading branch information
rusefillc committed Aug 2, 2019
1 parent 9a9afc2 commit 91f9a50
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 336 deletions.
1 change: 0 additions & 1 deletion firmware/config/boards/me7_pnp/board_configuration.cpp
Expand Up @@ -62,7 +62,6 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED;
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->boardTestModeJumperPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE;
engineConfiguration->warningLedPin = GPIO_UNASSIGNED;
Expand Down
2 changes: 1 addition & 1 deletion firmware/config/boards/nucleo_f767/board_configuration.cpp
Expand Up @@ -70,7 +70,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->boardTestModeJumperPin = GPIO_UNASSIGNED;

boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE;
Expand Down
2 changes: 1 addition & 1 deletion firmware/config/boards/prometheus/board_configuration.cpp
Expand Up @@ -216,7 +216,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->boardTestModeJumperPin = GPIO_UNASSIGNED;

boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE;
Expand Down
Expand Up @@ -178,7 +178,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->digitalPotentiometerChipSelect[2] = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->boardTestModeJumperPin = GPIO_UNASSIGNED;

boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE;
Expand Down
1 change: 0 additions & 1 deletion firmware/config/stm32f4ems/efifeatures.h
Expand Up @@ -398,7 +398,6 @@
*/
#define INTERMEDIATE_LOGGING_BUFFER_SIZE 2000

#define EFI_BOARD_TEST TRUE
#define EFI_JOYSTICK TRUE

#endif /* EFIFEATURES_STM32F4_H_ */
1 change: 0 additions & 1 deletion firmware/controllers/algo/engine_configuration.cpp
Expand Up @@ -983,7 +983,6 @@ static void setDefaultFrankensoConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE)

//boardConfiguration->logicAnalyzerPins[1] = GPIOE_5; // GPIOE_5 is a popular option (if available)

boardConfiguration->boardTestModeJumperPin = GPIOB_0;

// set this to SPI_DEVICE_3 to enable stimulation
//boardConfiguration->digitalPotentiometerSpiDevice = SPI_DEVICE_3;
Expand Down
2 changes: 1 addition & 1 deletion firmware/controllers/engine_controller.cpp
Expand Up @@ -812,6 +812,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20190728;
return 20190802;
}
#endif /* EFI_UNIT_TEST */
@@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jul 22 17:38:10 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Aug 02 01:26:57 EDT 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
Expand Down Expand Up @@ -580,7 +580,7 @@ struct board_configuration_s {
/**
* offset 76
*/
brain_pin_e boardTestModeJumperPin;
brain_pin_e unused1133;
/**
* Digital Potentiometer is used by stock ECU stimulation code
* offset 77
Expand Down Expand Up @@ -2814,4 +2814,4 @@ typedef struct persistent_config_s persistent_config_s;

#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jul 22 17:38:10 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Aug 02 01:26:57 EDT 2019
4 changes: 2 additions & 2 deletions firmware/controllers/generated/rusefi_generated.h
Expand Up @@ -255,8 +255,6 @@
#define biQuad_offset 2332
#define biQuad_offset_hex 91c
#define BLOCKING_FACTOR 400
#define boardTestModeJumperPin_offset 676
#define boardTestModeJumperPin_offset_hex 2a4
#define boostCutPressure_offset 2132
#define boostCutPressure_offset_hex 854
#define brain_input_pin_e_enum "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID"
Expand Down Expand Up @@ -1814,6 +1812,8 @@
#define uartConsoleSerialSpeed_offset_hex 81c
#define unrealisticRpmThreashold_offset 760
#define unrealisticRpmThreashold_offset_hex 2f8
#define unused1133_offset 676
#define unused1133_offset_hex 2a4
#define unused1234234_offset 2042
#define unused1234234_offset_hex 7fa
#define unused_1484_bit_20_offset 1476
Expand Down
3 changes: 1 addition & 2 deletions firmware/controllers/settings.cpp
Expand Up @@ -282,8 +282,7 @@ void printConfiguration(const engine_configuration_s *engineConfiguration) {
scheduleMsg(&logger, "clutchDown@%s: %s", hwPortname(boardConfiguration->clutchDownPin),
boolToString(engine->clutchDownState));

scheduleMsg(&logger, "boardTestModeJumperPin: %s/nesting=%d",
hwPortname(boardConfiguration->boardTestModeJumperPin), maxNesting);
scheduleMsg(&logger, "nesting=%d", maxNesting);

scheduleMsg(&logger, "digitalPotentiometerSpiDevice %d", boardConfiguration->digitalPotentiometerSpiDevice);

Expand Down
5 changes: 2 additions & 3 deletions firmware/hw_layer/adc_inputs.cpp
Expand Up @@ -32,7 +32,6 @@

#include "pin_repository.h"
#include "engine_math.h"
#include "board_test.h"
#include "engine_controller.h"
#include "maf.h"
//#include "biquad.h"
Expand Down Expand Up @@ -533,7 +532,7 @@ static void configureInputs(void) {
setAdcChannelOverrides();
}

void initAdcInputs(bool boardTestMode) {
void initAdcInputs() {
printMsg(&logger, "initAdcInputs()");
if (ADC_BUF_DEPTH_FAST > MAX_ADC_GRP_BUF_DEPTH)
firmwareError(CUSTOM_ERR_ADC_DEPTH_FAST, "ADC_BUF_DEPTH_FAST too high");
Expand All @@ -559,7 +558,7 @@ void initAdcInputs(bool boardTestMode) {
/**
* in board test mode all currently enabled ADC channels are running in slow mode
*/
if (mode == ADC_SLOW || (boardTestMode && mode == ADC_FAST)) {
if (mode == ADC_SLOW) {
slowAdc.enableChannelAndPin((adc_channel_e) (ADC_CHANNEL_IN0 + adc));
} else if (mode == ADC_FAST) {
fastAdc.enableChannelAndPin((adc_channel_e) (ADC_CHANNEL_IN0 + adc));
Expand Down
2 changes: 1 addition & 1 deletion firmware/hw_layer/adc_inputs.h
Expand Up @@ -15,7 +15,7 @@
#if HAL_USE_ADC

const char * getAdcMode(adc_channel_e hwChannel);
void initAdcInputs(bool boardTestMode);
void initAdcInputs();

// deprecated - migrate to 'getAdcChannelBrainPin'
int getAdcChannelPin(adc_channel_e hwChannel);
Expand Down
234 changes: 0 additions & 234 deletions firmware/hw_layer/board_test.cpp

This file was deleted.

0 comments on commit 91f9a50

Please sign in to comment.