fixing stuff?

This commit is contained in:
rusefi 2020-06-14 18:06:33 -04:00
parent a7aea821b7
commit 308f82c4b3
6 changed files with 12 additions and 13 deletions

View File

@ -8,7 +8,7 @@ cd ../../../..
pwd
java ^
-DSystemOut.name=gen_config ^
-DSystemOut.name=gen_config_kinetis_board ^
-cp ../java_tools/ConfigDefinition.jar;../java_tools/configuration_definition/lib/snakeyaml.jar ^
com.rusefi.board_generator.BoardReader ^
-board kinetis ^
@ -17,10 +17,8 @@ java ^
-enumInputFile controllers/algo/rusefi_enums.h ^
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h
mkdir build_kinetis
java ^
-DSystemOut.name=gen_config ^
-DSystemOut.name=gen_config_kinetis ^
-Drusefi.generator.lazyfile.enabled=true ^
-jar ../java_tools/ConfigDefinition.jar ^
-definition integration/rusefi_config.txt ^

View File

@ -952,6 +952,13 @@ typedef enum __attribute__ ((__packed__)) {
GPPWM_Iat = 3,
} gppwm_channel_e;
typedef enum __attribute__ ((__packed__)) {
B100KBPS = 0, // 100kbps
B250KBPS = 1, // 250kbps
B500KBPS = 2, // 500kbps
B1MBPS = 3, // 1Mbps
} can_baudrate_e;
typedef enum __attribute__ ((__packed__)) {
GPPWM_GreaterThan = 0,
GPPWM_LessThan = 1,

View File

@ -268,12 +268,5 @@ typedef enum __attribute__ ((__packed__)) {
EFI_ADC_ERROR = 17,
} adc_channel_e;
typedef enum __attribute__ ((__packed__)) {
B100KBPS = 0, // 100kbps
B250KBPS = 1, // 250kbps
B500KBPS = 2, // 500kbps
B1MBPS = 3, // 1Mbps
} can_baudrate_e;
#define INCOMPATIBLE_CONFIG_CHANGE EFI_ADC_0

View File

@ -716,6 +716,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20200613;
return 20200614;
}
#endif /* EFI_UNIT_TEST */

View File

@ -9,4 +9,5 @@ rusefi.ini
openocd
DfuSe
rusefi_*.*
triggers
triggers
unit_test*.xml

Binary file not shown.