mirror of https://github.com/FOME-Tech/fome-fw.git
auto-sync
This commit is contained in:
parent
509398df05
commit
d09d526c63
|
@ -52,6 +52,7 @@
|
|||
#include "svnversion.h"
|
||||
#include "engine.h"
|
||||
#include "lcd_controller.h"
|
||||
#include "settings.h"
|
||||
|
||||
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
||||
// todo: move this logic to algo folder!
|
||||
|
|
|
@ -13,5 +13,4 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
|
|||
$(PROJECT_DIR)/controllers/algo/lcd_menu_tree.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/algo.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/signal_executor.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/enum_strings.cpp
|
||||
$(PROJECT_DIR)/controllers/algo/signal_executor.cpp
|
||||
|
|
|
@ -452,7 +452,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
|
|||
boardConfiguration->adcHwChannelEnabled[2] = ADC_SLOW;
|
||||
boardConfiguration->adcHwChannelEnabled[3] = ADC_SLOW;
|
||||
boardConfiguration->adcHwChannelEnabled[4] = ADC_FAST;
|
||||
boardConfiguration->adcHwChannelEnabled[5] = ADC_SLOW;
|
||||
// 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;
|
||||
|
|
|
@ -1,96 +0,0 @@
|
|||
/**
|
||||
* @file enum_strings.cpp
|
||||
*
|
||||
* Maybe we will figure out a way to auto-generate this file?
|
||||
*
|
||||
* @date Sep 4, 2014
|
||||
* @author Andrey Belomutskiy, (c) 2012-2015
|
||||
*/
|
||||
|
||||
#include "main.h"
|
||||
#include "enum_strings.h"
|
||||
#include "error_handling.h"
|
||||
|
||||
/**
|
||||
* These should be not very long because these are displayed on the LCD as is
|
||||
*/
|
||||
const char* getConfigurationName(engine_type_e engineType) {
|
||||
switch (engineType) {
|
||||
case CUSTOM_ENGINE:
|
||||
return "CUSTOM";
|
||||
#if EFI_SUPPORT_DODGE_NEON
|
||||
case DODGE_NEON_1995:
|
||||
return "Neon95";
|
||||
case DODGE_NEON_2003:
|
||||
return "Neon03";
|
||||
#endif /* EFI_SUPPORT_DODGE_NEON */
|
||||
#if EFI_SUPPORT_FORD_ASPIRE
|
||||
case FORD_ASPIRE_1996:
|
||||
return "Aspire";
|
||||
#endif /* EFI_SUPPORT_FORD_ASPIRE */
|
||||
#if EFI_SUPPORT_FORD_FIESTA
|
||||
case FORD_FIESTA:
|
||||
return "Fiesta";
|
||||
#endif /* EFI_SUPPORT_FORD_FIESTA */
|
||||
#if EFI_SUPPORT_NISSAN_PRIMERA
|
||||
case NISSAN_PRIMERA:
|
||||
return "Primera";
|
||||
#endif /* EFI_SUPPORT_NISSAN_PRIMERA */
|
||||
case HONDA_ACCORD_CD:
|
||||
return "Accord3";
|
||||
case HONDA_ACCORD_CD_TWO_WIRES:
|
||||
return "Accord2";
|
||||
case HONDA_ACCORD_CD_DIP:
|
||||
return "HondaD";
|
||||
case FORD_INLINE_6_1995:
|
||||
return "Fordi6";
|
||||
case GY6_139QMB:
|
||||
return "Gy6139";
|
||||
case MAZDA_MIATA_NB:
|
||||
return "MiataNB";
|
||||
case MAZDA_323:
|
||||
return "M323";
|
||||
case SATURN_ION_2004:
|
||||
return "Saturn Ion";
|
||||
case MINI_COOPER_R50:
|
||||
return "CoopR50";
|
||||
case FORD_ESCORT_GT:
|
||||
return "EscrtGT";
|
||||
case CITROEN_TU3JP:
|
||||
return "TU3JP";
|
||||
case ROVER_V8:
|
||||
return "Rvrv8";
|
||||
case MITSU_4G93:
|
||||
return "Mi4G93";
|
||||
case MIATA_1990:
|
||||
return "MX590";
|
||||
case MIATA_1994_DEVIATOR:
|
||||
return "MX594d";
|
||||
case MIATA_1994_SPAGS:
|
||||
return "MX594s";
|
||||
case MIATA_1996:
|
||||
return "MX596";
|
||||
case BMW_E34:
|
||||
return "BMWe34";
|
||||
case TEST_ENGINE:
|
||||
return "Test";
|
||||
default:
|
||||
firmwareError("Unexpected: engineType %d", engineType);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char * pinModeToString(pin_output_mode_e mode) {
|
||||
switch (mode) {
|
||||
case OM_DEFAULT:
|
||||
return "default";
|
||||
case OM_INVERTED:
|
||||
return "inverted";
|
||||
case OM_OPENDRAIN:
|
||||
return "open drain";
|
||||
case OM_OPENDRAIN_INVERTED:
|
||||
return "open drain inverted";
|
||||
default:
|
||||
return "unexpected";
|
||||
}
|
||||
}
|
|
@ -1,16 +0,0 @@
|
|||
/**
|
||||
* @file enum_strings.h
|
||||
*
|
||||
* @date Sep 4, 2014
|
||||
* @author Andrey Belomutskiy, (c) 2012-2015
|
||||
*/
|
||||
|
||||
#ifndef ENUM_STRINGS_H_
|
||||
#define ENUM_STRINGS_H_
|
||||
|
||||
#include "rusefi_enums.h"
|
||||
|
||||
const char* getConfigurationName(engine_type_e engineType);
|
||||
const char * ignitionModeToString(ignition_mode_e mode);
|
||||
|
||||
#endif /* ENUM_STRINGS_H_ */
|
|
@ -93,6 +93,75 @@ static void printOutputs(engine_configuration_s *engineConfiguration) {
|
|||
|
||||
EXTERN_ENGINE;
|
||||
|
||||
/**
|
||||
* These should be not very long because these are displayed on the LCD as is
|
||||
*/
|
||||
const char* getConfigurationName(engine_type_e engineType) {
|
||||
switch (engineType) {
|
||||
case CUSTOM_ENGINE:
|
||||
return "CUSTOM";
|
||||
#if EFI_SUPPORT_DODGE_NEON
|
||||
case DODGE_NEON_1995:
|
||||
return "Neon95";
|
||||
case DODGE_NEON_2003:
|
||||
return "Neon03";
|
||||
#endif /* EFI_SUPPORT_DODGE_NEON */
|
||||
#if EFI_SUPPORT_FORD_ASPIRE
|
||||
case FORD_ASPIRE_1996:
|
||||
return "Aspire";
|
||||
#endif /* EFI_SUPPORT_FORD_ASPIRE */
|
||||
#if EFI_SUPPORT_FORD_FIESTA
|
||||
case FORD_FIESTA:
|
||||
return "Fiesta";
|
||||
#endif /* EFI_SUPPORT_FORD_FIESTA */
|
||||
#if EFI_SUPPORT_NISSAN_PRIMERA
|
||||
case NISSAN_PRIMERA:
|
||||
return "Primera";
|
||||
#endif /* EFI_SUPPORT_NISSAN_PRIMERA */
|
||||
case HONDA_ACCORD_CD:
|
||||
return "Accord3";
|
||||
case HONDA_ACCORD_CD_TWO_WIRES:
|
||||
return "Accord2";
|
||||
case HONDA_ACCORD_CD_DIP:
|
||||
return "HondaD";
|
||||
case FORD_INLINE_6_1995:
|
||||
return "Fordi6";
|
||||
case GY6_139QMB:
|
||||
return "Gy6139";
|
||||
case MAZDA_MIATA_NB:
|
||||
return "MiataNB";
|
||||
case MAZDA_323:
|
||||
return "M323";
|
||||
case SATURN_ION_2004:
|
||||
return "Saturn Ion";
|
||||
case MINI_COOPER_R50:
|
||||
return "CoopR50";
|
||||
case FORD_ESCORT_GT:
|
||||
return "EscrtGT";
|
||||
case CITROEN_TU3JP:
|
||||
return "TU3JP";
|
||||
case ROVER_V8:
|
||||
return "Rvrv8";
|
||||
case MITSU_4G93:
|
||||
return "Mi4G93";
|
||||
case MIATA_1990:
|
||||
return "MX590";
|
||||
case MIATA_1994_DEVIATOR:
|
||||
return "MX594d";
|
||||
case MIATA_1994_SPAGS:
|
||||
return "MX594s";
|
||||
case MIATA_1996:
|
||||
return "MX596";
|
||||
case BMW_E34:
|
||||
return "BMWe34";
|
||||
case TEST_ENGINE:
|
||||
return "Test";
|
||||
default:
|
||||
firmwareError("Unexpected: engineType %d", engineType);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Prints current engine configuration to human-readable console.
|
||||
*/
|
||||
|
|
|
@ -16,5 +16,6 @@ void printSpiState(Logging *logger, board_configuration_s *boardConfiguration);
|
|||
void printConfiguration(engine_configuration_s *engineConfiguration);
|
||||
void stopEngine(void);
|
||||
void setEngineType(int value);
|
||||
const char* getConfigurationName(engine_type_e engineType);
|
||||
|
||||
#endif /* INJECTOR_CONTROL_H_ */
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "histogram.h"
|
||||
#include "pwm_generator_logic.h"
|
||||
#include "efilib2.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include "rpm_calculator.h"
|
||||
#if EFI_PROD_CODE
|
||||
|
|
|
@ -21,11 +21,10 @@
|
|||
#include "io_pins.h"
|
||||
#include "trigger_emulator_algo.h"
|
||||
#include "trigger_central.h"
|
||||
#include "settings.h"
|
||||
|
||||
extern PwmConfig triggerSignal;
|
||||
|
||||
extern OutputPin outputs[IO_PIN_COUNT];
|
||||
|
||||
static OutputPin emulatorOutputs[3];
|
||||
|
||||
void initTriggerEmulator(Engine *engine) {
|
||||
|
|
|
@ -25,7 +25,6 @@ extern "C"
|
|||
#include "efifeatures.h"
|
||||
#include "efitime.h"
|
||||
#include "rusefi_enums.h"
|
||||
#include "enum_strings.h"
|
||||
|
||||
#include "datalogging.h"
|
||||
#include "chprintf.h"
|
||||
|
|
Loading…
Reference in New Issue