rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extracting hw-specific enums

This commit is contained in:
rusefi 2019-06-04 12:27:34 -04:00
parent 7792618672
commit 60253de5f9
6 changed files with 265 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,53 +560,6 @@ typedef enum __attribute__ ((__packed__)) {
SPI_DEVICE_4 = 4,
} spi_device_e;
/**
* Frankenso analog #1 PC2 ADC12
* Frankenso analog #2 PC1 ADC11
* Frankenso analog #3 PA0 ADC0
* Frankenso analog #4 PC3 ADC13
* Frankenso analog #5 PA2 ADC2
* Frankenso analog #6 PA1 ADC1
* Frankenso analog #7 PA4 ADC4
* Frankenso analog #8 PA3 ADC3
* Frankenso analog #9 PA7 ADC7
* Frankenso analog #10 PA6 ADC6
* Frankenso analog #11 PC5 ADC15
* Frankenso analog #12 PC4 ADC14
*/
typedef enum __attribute__ ((__packed__)) {
EFI_ADC_0 = 0, // PA0
EFI_ADC_1 = 1, // PA1
EFI_ADC_2 = 2, // PA2
EFI_ADC_3 = 3, // PA3
EFI_ADC_4 = 4, // PA4
EFI_ADC_5 = 5, // PA5
EFI_ADC_6 = 6, // PA6
EFI_ADC_7 = 7, // PA7
EFI_ADC_8 = 8, // PB0
EFI_ADC_9 = 9, // PB1
EFI_ADC_10 = 10, // PC0
EFI_ADC_11 = 11, // PC1
EFI_ADC_12 = 12, // PC2
EFI_ADC_13 = 13, // PC3
EFI_ADC_14 = 14, // PC4
EFI_ADC_15 = 15, // PC5
// todo: bad choice of value since now we have ADC_CHANNEL_SENSOR and could end up with 17 and 18 also
EFI_ADC_NONE = 16,
EFI_ADC_ERROR = 17,
#if EFI_UNIT_TEST
TEST_MAF_CHANNEL = 113,
TEST_CLT_CHANNEL = 114,
TEST_IAT_CHANNEL = 115,
#endif
} adc_channel_e;
#define INCOMPATIBLE_CONFIG_CHANGE EFI_ADC_0
typedef enum {
MS_AUTO = 0,
MS_ALWAYS = 1,
@ -639,209 +592,8 @@ typedef enum {
Force_4_bytes_size_ego_sensor = ENUM_32_BITS,
} ego_sensor_e;
/**
* Hardware pin. This enum is platform-specific.
*/
typedef enum __attribute__ ((__packed__)) {
GPIO_UNASSIGNED = 0,
GPIO_INVALID = 1,
GPIOA_0 = 2,
GPIOA_1 = 3,
GPIOA_2 = 4,
GPIOA_3 = 5,
GPIOA_4 = 6,
GPIOA_5 = 7,
GPIOA_6 = 8,
GPIOA_7 = 9,
GPIOA_8 = 10,
GPIOA_9 = 11,
GPIOA_10 = 12,
GPIOA_11 = 13,
GPIOA_12 = 14,
GPIOA_13 = 15,
GPIOA_14 = 16,
GPIOA_15 = 17,
GPIOB_0 = 18,
GPIOB_1 = 19,
GPIOB_2 = 20,
GPIOB_3 = 21,
GPIOB_4 = 22,
GPIOB_5 = 23,
GPIOB_6 = 24,
GPIOB_7 = 25,
GPIOB_8 = 26,
GPIOB_9 = 27,
GPIOB_10 = 28,
GPIOB_11 = 29,
GPIOB_12 = 30,
GPIOB_13 = 31,
GPIOB_14 = 32,
GPIOB_15 = 33,
GPIOC_0 = 34,
GPIOC_1 = 35,
GPIOC_2 = 36,
GPIOC_3 = 37,
GPIOC_4 = 38,
GPIOC_5 = 39,
GPIOC_6 = 40,
GPIOC_7 = 41,
GPIOC_8 = 42,
GPIOC_9 = 43,
GPIOC_10 = 44,
GPIOC_11 = 45,
GPIOC_12 = 46,
GPIOC_13 = 47,
GPIOC_14 = 48,
GPIOC_15 = 49,
GPIOD_0 = 50,
GPIOD_1 = 51,
GPIOD_2 = 52,
GPIOD_3 = 53,
GPIOD_4 = 54,
GPIOD_5 = 55,
GPIOD_6 = 56,
GPIOD_7 = 57,
GPIOD_8 = 58,
GPIOD_9 = 59,
GPIOD_10 = 60,
GPIOD_11 = 61,
GPIOD_12 = 62,
GPIOD_13 = 63,
GPIOD_14 = 64,
GPIOD_15 = 65,
GPIOE_0 = 66,
GPIOE_1 = 67,
GPIOE_2 = 68,
GPIOE_3 = 69,
GPIOE_4 = 70,
GPIOE_5 = 71,
GPIOE_6 = 72,
GPIOE_7 = 73,
GPIOE_8 = 74,
GPIOE_9 = 75,
GPIOE_10 = 76,
GPIOE_11 = 77,
GPIOE_12 = 78,
GPIOE_13 = 79,
GPIOE_14 = 80,
GPIOE_15 = 81,
GPIOF_0 = 82,
GPIOF_1 = 83,
GPIOF_2 = 84,
GPIOF_3 = 85,
GPIOF_4 = 86,
GPIOF_5 = 87,
GPIOF_6 = 88,
GPIOF_7 = 89,
GPIOF_8 = 90,
GPIOF_9 = 91,
GPIOF_10 = 92,
GPIOF_11 = 93,
GPIOF_12 = 94,
GPIOF_13 = 95,
GPIOF_14 = 96,
GPIOF_15 = 97,
GPIOG_0 = 98,
GPIOG_1 = 99,
GPIOG_2 = 100,
GPIOG_3 = 101,
GPIOG_4 = 102,
GPIOG_5 = 103,
GPIOG_6 = 104,
GPIOG_7 = 105,
GPIOG_8 = 106,
GPIOG_9 = 107,
GPIOG_10 = 108,
GPIOG_11 = 109,
GPIOG_12 = 110,
GPIOG_13 = 111,
GPIOG_14 = 112,
GPIOG_15 = 113,
GPIOH_0 = 114,
GPIOH_1 = 115,
GPIOH_2 = 116,
GPIOH_3 = 117,
GPIOH_4 = 118,
GPIOH_5 = 119,
GPIOH_6 = 120,
GPIOH_7 = 121,
GPIOH_8 = 122,
GPIOH_9 = 123,
GPIOH_10 = 124,
GPIOH_11 = 125,
GPIOH_12 = 126,
GPIOH_13 = 127,
GPIOH_14 = 128,
GPIOH_15 = 129,
/* TLE6240 pins go right after on chips */
//#define TLE6240_PIN(n) ((brain_pin_e)((int)BRAIN_PIN_LAST_ONCHIP + 1 + (n)))
TLE6240_PIN_1 = 130,
TLE6240_PIN_2 = 131,
TLE6240_PIN_3 = 132,
TLE6240_PIN_4 = 133,
TLE6240_PIN_5 = 134,
TLE6240_PIN_6 = 135,
TLE6240_PIN_7 = 136,
TLE6240_PIN_8 = 137,
TLE6240_PIN_9 = 138,
TLE6240_PIN_10 = 139,
TLE6240_PIN_11 = 140,
TLE6240_PIN_12 = 141,
TLE6240_PIN_13 = 142,
TLE6240_PIN_14 = 143,
TLE6240_PIN_15 = 144,
TLE6240_PIN_16 = 145,
/* MC33972 pins go right after TLE6240 */
//#define MC33972_PIN(n) ((brain_pin_e)((int)BRAIN_PIN_LAST_ONCHIP + 1 + 16 + (n)))
MC33972_PIN_1 = 146,
MC33972_PIN_21 = 166,
MC33972_PIN_22 = 167,
TLE8888_PIN_1 = 168,
TLE8888_PIN_2 = 169,
TLE8888_PIN_3 = 170,
TLE8888_PIN_4 = 171,
TLE8888_PIN_5 = 172,
TLE8888_PIN_6 = 173,
TLE8888_PIN_7 = 174,
TLE8888_PIN_8 = 175,
TLE8888_PIN_9 = 176,
TLE8888_PIN_10 = 177,
TLE8888_PIN_11 = 178,
TLE8888_PIN_12 = 179,
TLE8888_PIN_13 = 180,
TLE8888_PIN_14 = 181,
TLE8888_PIN_15 = 182,
TLE8888_PIN_16 = 183,
TLE8888_PIN_17 = 184,
TLE8888_PIN_18 = 185,
TLE8888_PIN_19 = 186,
TLE8888_PIN_20 = 187,
TLE8888_PIN_21 = 188,
TLE8888_PIN_22 = 189,
TLE8888_PIN_23 = 190,
TLE8888_PIN_24 = 191,
TLE8888_PIN_25 = 192,
TLE8888_PIN_26 = 193,
TLE8888_PIN_27 = 194,
TLE8888_PIN_28 = 195,
} brain_pin_e;
typedef brain_pin_e output_pin_e;
/* Plase keep updating this define */
#define BRAIN_PIN_LAST_ONCHIP GPIOH_15
/**
* https://rusefi.com//wiki/index.php?title=Manual:Debug_fields
*/

246
firmware/controllers/algo/rusefi_hw_enums.h
View File

@ -18,4 +18,250 @@ typedef enum __attribute__ ((__packed__)) {
PO_PULLDOWN = 64 // PAL_STM32_PUPDR_PULLDOWN
} pin_mode_e;
/**
* Hardware pin. This enum is platform-specific.
*/
typedef enum __attribute__ ((__packed__)) {
GPIO_UNASSIGNED = 0,
GPIO_INVALID = 1,
GPIOA_0 = 2,
GPIOA_1 = 3,
GPIOA_2 = 4,
GPIOA_3 = 5,
GPIOA_4 = 6,
GPIOA_5 = 7,
GPIOA_6 = 8,
GPIOA_7 = 9,
GPIOA_8 = 10,
GPIOA_9 = 11,
GPIOA_10 = 12,
GPIOA_11 = 13,
GPIOA_12 = 14,
GPIOA_13 = 15,
GPIOA_14 = 16,
GPIOA_15 = 17,
GPIOB_0 = 18,
GPIOB_1 = 19,
GPIOB_2 = 20,
GPIOB_3 = 21,
GPIOB_4 = 22,
GPIOB_5 = 23,
GPIOB_6 = 24,
GPIOB_7 = 25,
GPIOB_8 = 26,
GPIOB_9 = 27,
GPIOB_10 = 28,
GPIOB_11 = 29,
GPIOB_12 = 30,
GPIOB_13 = 31,
GPIOB_14 = 32,
GPIOB_15 = 33,
GPIOC_0 = 34,
GPIOC_1 = 35,
GPIOC_2 = 36,
GPIOC_3 = 37,
GPIOC_4 = 38,
GPIOC_5 = 39,
GPIOC_6 = 40,
GPIOC_7 = 41,
GPIOC_8 = 42,
GPIOC_9 = 43,
GPIOC_10 = 44,
GPIOC_11 = 45,
GPIOC_12 = 46,
GPIOC_13 = 47,
GPIOC_14 = 48,
GPIOC_15 = 49,
GPIOD_0 = 50,
GPIOD_1 = 51,
GPIOD_2 = 52,
GPIOD_3 = 53,
GPIOD_4 = 54,
GPIOD_5 = 55,
GPIOD_6 = 56,
GPIOD_7 = 57,
GPIOD_8 = 58,
GPIOD_9 = 59,
GPIOD_10 = 60,
GPIOD_11 = 61,
GPIOD_12 = 62,
GPIOD_13 = 63,
GPIOD_14 = 64,
GPIOD_15 = 65,
GPIOE_0 = 66,
GPIOE_1 = 67,
GPIOE_2 = 68,
GPIOE_3 = 69,
GPIOE_4 = 70,
GPIOE_5 = 71,
GPIOE_6 = 72,
GPIOE_7 = 73,
GPIOE_8 = 74,
GPIOE_9 = 75,
GPIOE_10 = 76,
GPIOE_11 = 77,
GPIOE_12 = 78,
GPIOE_13 = 79,
GPIOE_14 = 80,
GPIOE_15 = 81,
GPIOF_0 = 82,
GPIOF_1 = 83,
GPIOF_2 = 84,
GPIOF_3 = 85,
GPIOF_4 = 86,
GPIOF_5 = 87,
GPIOF_6 = 88,
GPIOF_7 = 89,
GPIOF_8 = 90,
GPIOF_9 = 91,
GPIOF_10 = 92,
GPIOF_11 = 93,
GPIOF_12 = 94,
GPIOF_13 = 95,
GPIOF_14 = 96,
GPIOF_15 = 97,
GPIOG_0 = 98,
GPIOG_1 = 99,
GPIOG_2 = 100,
GPIOG_3 = 101,
GPIOG_4 = 102,
GPIOG_5 = 103,
GPIOG_6 = 104,
GPIOG_7 = 105,
GPIOG_8 = 106,
GPIOG_9 = 107,
GPIOG_10 = 108,
GPIOG_11 = 109,
GPIOG_12 = 110,
GPIOG_13 = 111,
GPIOG_14 = 112,
GPIOG_15 = 113,
GPIOH_0 = 114,
GPIOH_1 = 115,
GPIOH_2 = 116,
GPIOH_3 = 117,
GPIOH_4 = 118,
GPIOH_5 = 119,
GPIOH_6 = 120,
GPIOH_7 = 121,
GPIOH_8 = 122,
GPIOH_9 = 123,
GPIOH_10 = 124,
GPIOH_11 = 125,
GPIOH_12 = 126,
GPIOH_13 = 127,
GPIOH_14 = 128,
GPIOH_15 = 129,
/* TLE6240 pins go right after on chips */
//#define TLE6240_PIN(n) ((brain_pin_e)((int)BRAIN_PIN_LAST_ONCHIP + 1 + (n)))
TLE6240_PIN_1 = 130,
TLE6240_PIN_2 = 131,
TLE6240_PIN_3 = 132,
TLE6240_PIN_4 = 133,
TLE6240_PIN_5 = 134,
TLE6240_PIN_6 = 135,
TLE6240_PIN_7 = 136,
TLE6240_PIN_8 = 137,
TLE6240_PIN_9 = 138,
TLE6240_PIN_10 = 139,
TLE6240_PIN_11 = 140,
TLE6240_PIN_12 = 141,
TLE6240_PIN_13 = 142,
TLE6240_PIN_14 = 143,
TLE6240_PIN_15 = 144,
TLE6240_PIN_16 = 145,
/* MC33972 pins go right after TLE6240 */
//#define MC33972_PIN(n) ((brain_pin_e)((int)BRAIN_PIN_LAST_ONCHIP + 1 + 16 + (n)))
MC33972_PIN_1 = 146,
MC33972_PIN_21 = 166,
MC33972_PIN_22 = 167,
TLE8888_PIN_1 = 168,
TLE8888_PIN_2 = 169,
TLE8888_PIN_3 = 170,
TLE8888_PIN_4 = 171,
TLE8888_PIN_5 = 172,
TLE8888_PIN_6 = 173,
TLE8888_PIN_7 = 174,
TLE8888_PIN_8 = 175,
TLE8888_PIN_9 = 176,
TLE8888_PIN_10 = 177,
TLE8888_PIN_11 = 178,
TLE8888_PIN_12 = 179,
TLE8888_PIN_13 = 180,
TLE8888_PIN_14 = 181,
TLE8888_PIN_15 = 182,
TLE8888_PIN_16 = 183,
TLE8888_PIN_17 = 184,
TLE8888_PIN_18 = 185,
TLE8888_PIN_19 = 186,
TLE8888_PIN_20 = 187,
TLE8888_PIN_21 = 188,
TLE8888_PIN_22 = 189,
TLE8888_PIN_23 = 190,
TLE8888_PIN_24 = 191,
TLE8888_PIN_25 = 192,
TLE8888_PIN_26 = 193,
TLE8888_PIN_27 = 194,
TLE8888_PIN_28 = 195,
} brain_pin_e;
/* Plase keep updating this define */
#define BRAIN_PIN_LAST_ONCHIP GPIOH_15
/**
* Frankenso analog #1 PC2 ADC12
* Frankenso analog #2 PC1 ADC11
* Frankenso analog #3 PA0 ADC0
* Frankenso analog #4 PC3 ADC13
* Frankenso analog #5 PA2 ADC2
* Frankenso analog #6 PA1 ADC1
* Frankenso analog #7 PA4 ADC4
* Frankenso analog #8 PA3 ADC3
* Frankenso analog #9 PA7 ADC7
* Frankenso analog #10 PA6 ADC6
* Frankenso analog #11 PC5 ADC15
* Frankenso analog #12 PC4 ADC14
*/
typedef enum __attribute__ ((__packed__)) {
EFI_ADC_0 = 0, // PA0
EFI_ADC_1 = 1, // PA1
EFI_ADC_2 = 2, // PA2
EFI_ADC_3 = 3, // PA3
EFI_ADC_4 = 4, // PA4
EFI_ADC_5 = 5, // PA5
EFI_ADC_6 = 6, // PA6
EFI_ADC_7 = 7, // PA7
EFI_ADC_8 = 8, // PB0
EFI_ADC_9 = 9, // PB1
EFI_ADC_10 = 10, // PC0
EFI_ADC_11 = 11, // PC1
EFI_ADC_12 = 12, // PC2
EFI_ADC_13 = 13, // PC3
EFI_ADC_14 = 14, // PC4
EFI_ADC_15 = 15, // PC5
// todo: bad choice of value since now we have ADC_CHANNEL_SENSOR and could end up with 17 and 18 also
EFI_ADC_NONE = 16,
EFI_ADC_ERROR = 17,
#if EFI_UNIT_TEST
TEST_MAF_CHANNEL = 113,
TEST_CLT_CHANNEL = 114,
TEST_IAT_CHANNEL = 115,
#endif
} adc_channel_e;
#define INCOMPATIBLE_CONFIG_CHANGE EFI_ADC_0
#endif /* RUSEFI_HW_ENUMS_H_ */

10
firmware/gen_config_board.bat
View File

@ -16,7 +16,15 @@ echo BOARDNAME=%BOARDNAME%
rem lazy is broken - TS input is not considered a change
rm build/config.gen
java -cp ../java_tools/ConfigDefinition.jar;../java_tools/configuration_definition/lib/snakeyaml.jar com.rusefi.board_generator.BoardReader -board %BOARDNAME% -firmware_path . -out tunerstudio
java -cp ../java_tools/ConfigDefinition.jar;../java_tools/configuration_definition/lib/snakeyaml.jar ^
com.rusefi.board_generator.BoardReader ^
-board %BOARDNAME% ^
-firmware_path . ^
-out tunerstudio ^
-enumInputFile controllers/algo/rusefi_enums.h ^
-enumInputFile controllers/algo/rusefi_hw_enums.h
java -jar ../java_tools/ConfigDefinition.jar ^
-definition integration\rusefi_config.txt ^
-ts_destination tunerstudio ^

7
firmware/gen_enum_to_string.bat
View File

@ -1,3 +1,8 @@
rem This batch files reads rusefi_enums.h and produses auto_generated_enums.* files
java -jar ../java_tools/enum2string.jar -inputPath . -outputPath controllers/algo -enumInputFile controllers/algo/rusefi_enums.h -enumInputFile controllers/algo/rusefi_hw_enums.h
java -jar ../java_tools/enum2string.jar ^
-inputPath . ^
-outputPath controllers/algo ^
-enumInputFile controllers/algo/rusefi_enums.h ^
-enumInputFile controllers/algo/rusefi_hw_enums.h ^

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

5
java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
View File

@ -15,6 +15,7 @@ public class BoardReader {
private static final String KEY_OUTFOLDER = "-out";
private static final String KEY_FIRMWARE_PATH = "-firmware_path";
private static final String INVALID = "INVALID";
private final static String KEY_ENUM_INPUT_FILE = "-enumInputFile";
public static void main(String[] args) throws IOException {
if (args.length < 2) {
@ -34,6 +35,9 @@ public class BoardReader {
boardName = args[i + 1];
} else if (key.equals(KEY_FIRMWARE_PATH)) {
firmwarePath = args[i + 1];
} else if (key.equals(KEY_ENUM_INPUT_FILE)) {
String inputFile = args[i + 1];
EnumsReader.process(new FileReader(firmwarePath + File.separator + inputFile));
} else if (key.equals(KEY_OUTFOLDER)) {
outputPath = args[i + 1];
}
@ -43,7 +47,6 @@ public class BoardReader {
Map<String, Object> data = yaml.load(new FileReader(firmwarePath + "/config/boards/" + boardName + "/mapping.yaml"));
System.out.println(data);
EnumsReader.process(new FileReader(firmwarePath + File.separator + EnumToString.COMMON_HEADER_RELATIVE_NAME));
BufferedWriter bw = new BufferedWriter(new FileWriter(outputPath + File.separator + boardName + "_prefix.txt"));