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

generate java enums from can_common.h

This commit is contained in:
andreika-git 2023-09-27 18:34:32 +03:00 committed by rusefillc
parent dfd3a11b40
commit 39282ae1e4
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/controllers/can/can_bench_test.cpp
View File

@ -35,7 +35,7 @@ static void setPin(const CANRxFrame& frame, int value) {
void sendEventCounters() { void sendEventCounters() {
#if EFI_SHAFT_POSITION_INPUT #if EFI_SHAFT_POSITION_INPUT
CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_EVENT_COUNTERS, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, bench_test_packet_ids_e::EVENT_COUNTERS, 8, /*bus*/0, /*isExtended*/true);
int primaryFall = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_FALLING); int primaryFall = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_FALLING);
int primaryRise = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_RISING); int primaryRise = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_RISING);
@ -61,7 +61,7 @@ void sendEventCounters() {
} }
void sendButtonCounters() { void sendButtonCounters() {
CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_BUTTON_COUNTERS, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, bench_test_packet_ids_e::BUTTON_COUNTERS, 8, /*bus*/0, /*isExtended*/true);
msg[0] = TRUNCATE_TO_BYTE(engine->brakePedalSwitchedState.getCounter()); msg[0] = TRUNCATE_TO_BYTE(engine->brakePedalSwitchedState.getCounter());
msg[1] = TRUNCATE_TO_BYTE(engine->clutchUpSwitchedState.getCounter()); msg[1] = TRUNCATE_TO_BYTE(engine->clutchUpSwitchedState.getCounter());
msg[2] = TRUNCATE_TO_BYTE(engine->acButtonSwitchedState.getCounter()); msg[2] = TRUNCATE_TO_BYTE(engine->acButtonSwitchedState.getCounter());
@ -96,13 +96,13 @@ void sendRawAnalogValues() {
// send the first packet // send the first packet
{ {
CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_RAW_ANALOG_1, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, bench_test_packet_ids_e::RAW_ANALOG_1, 8, /*bus*/0, /*isExtended*/true);
for (int valueIdx = 0; valueIdx < efi::size(values_1); valueIdx++) { for (int valueIdx = 0; valueIdx < efi::size(values_1); valueIdx++) {
msg[valueIdx] = RAW_TO_BYTE(values_1[valueIdx]); msg[valueIdx] = RAW_TO_BYTE(values_1[valueIdx]);
} }
} }
{ {
CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_RAW_ANALOG_2, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, bench_test_packet_ids_e::RAW_ANALOG_2, 8, /*bus*/0, /*isExtended*/true);
for (int valueIdx = 0; valueIdx < efi::size(values_2); valueIdx++) { for (int valueIdx = 0; valueIdx < efi::size(values_2); valueIdx++) {
msg[valueIdx] = RAW_TO_BYTE(values_2[valueIdx]); msg[valueIdx] = RAW_TO_BYTE(values_2[valueIdx]);
} }
@ -111,7 +111,7 @@ void sendRawAnalogValues() {
static void sendOutBoardMeta() { static void sendOutBoardMeta() {
#if EFI_PROD_CODE #if EFI_PROD_CODE
CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_IO_META_INFO, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, bench_test_packet_ids_e::IO_META_INFO, 8, /*bus*/0, /*isExtended*/true);
msg[0] = CAN_BENCH_HEADER; msg[0] = CAN_BENCH_HEADER;
msg[1] = 0; msg[1] = 0;
msg[2] = getBoardMetaOutputsCount(); msg[2] = getBoardMetaOutputsCount();
@ -121,7 +121,7 @@ static void sendOutBoardMeta() {
void sendBoardStatus() { void sendBoardStatus() {
#if EFI_PROD_CODE #if EFI_PROD_CODE
CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_BOARD_STATUS, 8, /*bus*/0, /*isExtended*/true); CanTxMessage msg(CanCategory::BENCH_TEST, bench_test_packet_ids_e::BOARD_STATUS, 8, /*bus*/0, /*isExtended*/true);
int boardId = getBoardId(); int boardId = getBoardId();
msg[0] = TRUNCATE_TO_BYTE(boardId >> 8); msg[0] = TRUNCATE_TO_BYTE(boardId >> 8);
@ -140,7 +140,7 @@ void sendBoardStatus() {
} }
void processCanBenchTest(const CANRxFrame& frame) { void processCanBenchTest(const CANRxFrame& frame) {
if (CAN_EID(frame) != BENCH_TEST_IO_CONTROL) { if (CAN_EID(frame) != bench_test_packet_ids_e::IO_CONTROL) {
return; return;
} }
if (frame.data8[0] != CAN_BENCH_HEADER) { if (frame.data8[0] != CAN_BENCH_HEADER) {

8
firmware/gen_enum_to_string.sh
View File

@ -20,6 +20,14 @@ java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -
java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h -outputPath ../java_console/models/src/main/java/com/rusefi/enums -definition integration/rusefi_config.txt java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h -outputPath ../java_console/models/src/main/java/com/rusefi/enums -definition integration/rusefi_config.txt
[ $? -eq 0 ] || { echo "ERROR generating types"; exit 1; } [ $? -eq 0 ] || { echo "ERROR generating types"; exit 1; }
java -DSystemOut.name=logs/gen_java_enum \
-Denum_with_values=true \
-cp ${ENUM_JAR} com.rusefi.ToJavaEnum \
-enumInputFile libfirmware/can/can_common.h \
-outputPath ../java_console/models/src/main/java/com/rusefi/enums \
-definition libfirmware/can/can_common.h
[ $? -eq 0 ] || { echo "ERROR generating types"; exit 1; }
java -DSystemOut.name=logs/gen_enum_to_string \ java -DSystemOut.name=logs/gen_enum_to_string \
-jar ${ENUM_JAR} \ -jar ${ENUM_JAR} \
-outputPath controllers/algo \ -outputPath controllers/algo \

2
firmware/libfirmware

@ -1 +1 @@
Subproject commit 698a3901968cd54790a70a469a897da56caecf08 Subproject commit 3e43e0a50927f1fc2e48c3e9dd8ce9695861ee40