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

auto-sync

This commit is contained in:
rusEfi 2015-01-21 23:04:03 -06:00
parent 225602b774
commit 17eed468fb
9 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/can_header.h
View File

@ -19,7 +19,7 @@ typedef enum {
CAN_BUS_NBC_VAG = 2,
CAN_BUS_MAZDA_RX8 = 3,
Internal_ForceMyEnumIntSize_can_nbc = ENUM_SIZE_HACK,
Internal_ForceMyEnumIntSize_can_nbc = ENUM_32_BITS,
} can_nbc_e;
#endif /* CAN_HEADER_H_ */

8
firmware/controllers/algo/engine_configuration.h
View File

@ -62,7 +62,7 @@ typedef enum {
*/
AC_TRIGGER = 1, AC_MAP = 2,
Internal_ForceMyEnumIntSize_analog_chart_mode = ENUM_SIZE_HACK,
Internal_ForceMyEnumIntSize_analog_chart_mode = ENUM_16_BITS,
} analog_chart_e;
typedef enum {
@ -76,7 +76,7 @@ typedef enum {
*/
TM_FIXED = 1,
Internal_ForceMyEnumIntSize_timing_mode = ENUM_SIZE_HACK,
Internal_ForceMyEnumIntSize_timing_mode = ENUM_32_BITS,
} timing_mode_e;
typedef enum {
@ -84,7 +84,7 @@ typedef enum {
CD_USE_CAN1 = 1,
CD_USE_CAN2 = 2,
Internal_ForceMyEnumIntSize_can_device_mode = ENUM_SIZE_HACK,
Internal_ForceMyEnumIntSize_can_device_mode = ENUM_32_BITS,
} can_device_mode_e;
typedef struct {
@ -351,7 +351,7 @@ typedef struct {
/**
* offset 334
*/
int16_t analogChartMode;
analog_chart_e analogChartMode;
/**
* todo: finish implementation. These values are used for TPS disconnect detection
* offset 336

2
firmware/controllers/algo/obd_error_codes.h
View File

@ -1665,7 +1665,7 @@ typedef enum {
//P3493 Cyl12 Exhaust Valve Ctrl Circ/Open
// this is needed for proper enum size, this matters for malfunction_central
Internal_ForceMyEnumIntSize_cranking_obd_code = ENUM_SIZE_HACK,
Internal_ForceMyEnumIntSize_cranking_obd_code = ENUM_32_BITS,
} obd_code_e;
#ifdef __cplusplus

48
firmware/controllers/algo/rusefi_enums.h
View File

@ -13,9 +13,11 @@
#include "efifeatures.h"
// for now I want all enums to be 32 bit integers. At some point maybe we will make the one-byte
// for now I want most enums to be 32 bit integers. At some point maybe we will make the one-byte
// this is about offsets and sizes in TunerStudio
#define ENUM_SIZE_HACK 2000000000
#define ENUM_32_BITS 2000000000
#define ENUM_16_BITS 20000
#define DIGIPOT_COUNT 4
@ -103,7 +105,7 @@ typedef enum {
ET_UNUSED = 29,
Force_4b_engine_type = ENUM_SIZE_HACK,
Force_4b_engine_type = ENUM_32_BITS,
} engine_type_e;
#define DEFAULT_ENGINE_TYPE CUSTOM_ENGINE
@ -130,7 +132,7 @@ typedef enum {
TT_DODGE_NEON_2003 = 14,
Force_4b_trigger_type = ENUM_SIZE_HACK,
Force_4b_trigger_type = ENUM_32_BITS,
} trigger_type_e;
typedef enum {
@ -138,7 +140,7 @@ typedef enum {
ADC_SLOW = 1,
ADC_FAST = 2,
Force_4b_adc_channel_mode = ENUM_SIZE_HACK,
Force_4b_adc_channel_mode = ENUM_32_BITS,
} adc_channel_mode_e;
// todo: better names?
@ -187,7 +189,7 @@ typedef enum {
*/
LM_SPEED_DENSITY = 3,
Force_4b_engine_load_mode = ENUM_SIZE_HACK,
Force_4b_engine_load_mode = ENUM_32_BITS,
} engine_load_mode_e;
typedef enum {
@ -195,7 +197,7 @@ typedef enum {
DM_HD44780 = 1,
DM_HD44780_OVER_PCF8574 = 2,
Force_4b_display_mode = ENUM_SIZE_HACK,
Force_4b_display_mode = ENUM_32_BITS,
} display_mode_e;
@ -207,14 +209,14 @@ typedef enum {
*/
LM_MLV = 1,
Force_4b_log_format = ENUM_SIZE_HACK,
Force_4b_log_format = ENUM_32_BITS,
} log_format_e;
typedef enum {
IM_AUTO = 0,
IM_MANUAL = 1,
Force_4b_idle_mode = ENUM_SIZE_HACK,
Force_4b_idle_mode = ENUM_32_BITS,
} idle_mode_e;
typedef enum {
@ -232,12 +234,12 @@ typedef enum {
OM_OPENDRAIN = 2,
OM_OPENDRAIN_INVERTED = 3,
Force_4b_pin_output_mode = ENUM_SIZE_HACK,
Force_4b_pin_output_mode = ENUM_32_BITS,
} pin_output_mode_e;
typedef enum {
Force_4b_gpio_mode = ENUM_SIZE_HACK,
Force_4b_gpio_mode = ENUM_32_BITS,
} gpio_mode_e;
typedef enum {
@ -245,7 +247,7 @@ typedef enum {
PI_PULLUP = 1,
PI_PULLDOWN = 2,
Force_4b_pin_input_mode = ENUM_SIZE_HACK,
Force_4b_pin_input_mode = ENUM_32_BITS,
} pin_input_mode_e;
typedef enum {
@ -260,7 +262,7 @@ typedef enum {
FO_1_8_4_3_6_5_7_2 = 5,
// 5 cylinder
FO_1_2_4_5_3 = 6,
Force_4b_firing_order = ENUM_SIZE_HACK,
Force_4b_firing_order = ENUM_32_BITS,
} firing_order_e;
// todo: better enum name
@ -269,7 +271,7 @@ typedef enum {
FOUR_STROKE_CRANK_SENSOR = 1,
FOUR_STROKE_CAM_SENSOR = 2,
Force_4b_operation_mode_e = ENUM_SIZE_HACK,
Force_4b_operation_mode_e = ENUM_32_BITS,
} operation_mode_e;
/**
@ -286,7 +288,7 @@ typedef enum {
IM_INDIVIDUAL_COILS = 1,
IM_WASTED_SPARK = 2,
Force_4b_ignition_mode = ENUM_SIZE_HACK,
Force_4b_ignition_mode = ENUM_32_BITS,
} ignition_mode_e;
typedef enum {
@ -294,7 +296,7 @@ typedef enum {
IM_SEQUENTIAL = 1,
IM_BATCH = 2,
Force_4b_injection_mode = ENUM_SIZE_HACK,
Force_4b_injection_mode = ENUM_32_BITS,
} injection_mode_e;
/**
@ -304,7 +306,7 @@ typedef enum {
CIM_DEFAULT = 0,
CIM_FIXED_ANGLE = 1,
Force_4b_cranking_ignition_mode = ENUM_SIZE_HACK,
Force_4b_cranking_ignition_mode = ENUM_32_BITS,
} cranking_ignition_mode_e;
typedef enum {
@ -314,14 +316,14 @@ typedef enum {
SPI_DEVICE_3 = 3,
SPI_DEVICE_4 = 4,
Force_4b_spi_device = ENUM_SIZE_HACK,
Force_4b_spi_device = ENUM_32_BITS,
} spi_device_e;
typedef enum {
IE_NO_ERROR = 0,
IE_UNEXPECTED_FIRING_ORDER = 1,
Force_4b_cranking_internal_error = ENUM_SIZE_HACK,
Force_4b_cranking_internal_error = ENUM_32_BITS,
} internal_error_e;
typedef enum {
@ -346,7 +348,7 @@ typedef enum {
EFI_ADC_NONE = 888,
EFI_ADC_ERROR = 999,
Force_4b_cranking_adc_channel = ENUM_SIZE_HACK,
Force_4b_cranking_adc_channel = ENUM_32_BITS,
} adc_channel_e;
@ -355,7 +357,7 @@ typedef enum {
ES_Innovate_MTX_L = 1,
ES_14Point7_Free = 2,
Force_4b_ego_sensor = ENUM_SIZE_HACK,
Force_4b_ego_sensor = ENUM_32_BITS,
} ego_sensor_e;
@ -503,7 +505,7 @@ typedef enum {
GPIO_UNASSIGNED = 80,
GPIO_INVALID = 81,
Force_4b_cranking_brain_pin = ENUM_SIZE_HACK,
Force_4b_cranking_brain_pin = ENUM_32_BITS,
} brain_pin_e;
typedef enum {
@ -513,7 +515,7 @@ typedef enum {
MT_HONDA3BAR = 3,
MT_DODGE_NEON_2003 = 4,
Force_4b_cranking_map_type = ENUM_SIZE_HACK,
Force_4b_cranking_map_type = ENUM_32_BITS,
} air_pressure_sensor_type_e;
#endif /* RUSEFI_ENUMS_H_ */

2
firmware/controllers/core/fsio_core.h
View File

@ -44,7 +44,7 @@ typedef enum {
LE_METHOD_AC_TOGGLE = 110,
LE_METHOD_FSIO_SETTING = 111,
Force_4b_le_action = ENUM_SIZE_HACK,
Force_4b_le_action = ENUM_32_BITS,
} le_action_e;

2
firmware/controllers/settings.cpp
View File

@ -325,7 +325,7 @@ static void setMalfunctionIndicatorPinMode(int value) {
}
static void setAnalogChartMode(int value) {
engineConfiguration->analogChartMode = value;
engineConfiguration->analogChartMode = (analog_chart_e)value;
doPrintConfiguration(engine);
}

2
firmware/hw_layer/lcd/lcd_HD44780.cpp
View File

@ -1,5 +1,5 @@
/**
* @file lcd_HD44780.c
* @file lcd_HD44780.cpp
* @brief HD44780 character display driver
*
* see http://en.wikipedia.org/wiki/Hitachi_HD44780_LCD_controller

21
firmware/rusefi_config.ini
View File

@ -55,7 +55,7 @@ end_struct
struct engine_configuration_s
bits engine_type_e S32 [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
engine_type_e engineType;http://rusefi.com/wiki/index.php?title=Manual:Engine_Type
int headerMagicValue;this magic number is used to make sure that what we read from Flash is in fact some configuration
@ -67,21 +67,22 @@ int headerMagicValue;this magic number is used to make sure that what we read fr
#define IGN_LOAD_COUNT 16
#define IGN_RPM_COUNT 16
float[VBAT_INJECTOR_CURVE_SIZE] battInjectorLagCorrBins;
float[VBAT_INJECTOR_CURVE_SIZE] battInjectorLagCorr;
float[VBAT_INJECTOR_CURVE_SIZE] battInjectorLagCorrBins;;"V", 1, 0, 0.0, 20.0, 2
float[VBAT_INJECTOR_CURVE_SIZE] battInjectorLagCorr;;"ms/V", 1, 0, 0.0, 50.0, 2
float[CLT_CURVE_SIZE] cltFuelCorrBins;
float[CLT_CURVE_SIZE] cltFuelCorr;
float[CLT_CURVE_SIZE] cltFuelCorrBins;;"C", 1, 0, -100.0, 250.0, 2
float[CLT_CURVE_SIZE] cltFuelCorr;;"%", 100, 0, 0.0, 500.0, 2
float[IAT_CURVE_SIZE] iatFuelCorrBins;
float[IAT_CURVE_SIZE] iatFuelCorr;
float[IAT_CURVE_SIZE] iatFuelCorrBins;;"C", 1, 0, -100.0, 250.0, 2
float[IAT_CURVE_SIZE] iatFuelCorr;;"%", 100, 0, 0.0, 500.0, 2
int16_t directSelfStimulation;Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)\ntodo: make this a bit on some bit field
int16_t tpsMin;todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have to sensors
int16_t tpsMax;tpsMax value as 10 bit ADC value. Not Voltage!
int16_t tpsMin;todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have to sensors;"ADC", 1, 0, 0, 1023, 0
int16_t tpsMax;tpsMax value as 10 bit ADC value. Not Voltage!;"ADC", 1, 0, 0, 1023, 0
int16_t analogChartMode;
bits analog_chart_e S16 [0:1], "none", "trigger", "MAP", "INVALID"
analog_chart_e analogChartMode;
int16_t tpsErrorLowValue;todo: finish implementation. These values are used for TPS disconnect detection
int16_t tpsErrorHighValue

2
firmware/tunerstudio/rusefi.ini
View File

@ -37,7 +37,7 @@ enable2ndByteCanID = false
; name = bits, type, offset, bits
; name = array, type, offset, shape, units, scale, translate, lo, hi, digits
; name = scalar, type, offset, units, scale, translate, lo, hi, digits
;AUTO_GENERATED_SECTION_START
engineType = bits, U32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
battInjectorLagCorrBins = array, F32, 8, [8], "V", 1, 0, 0.0, 20.0, 2; size 32
battInjectorLagCorr = array, F32, 40, [8], "ms/V", 1, 0, 0.0, 50.0, 2; size 32