diff --git a/.github/workflows/gen-docs.yaml b/.github/workflows/gen-docs.yaml index bbe184be1f..8047c7f206 100644 --- a/.github/workflows/gen-docs.yaml +++ b/.github/workflows/gen-docs.yaml @@ -14,11 +14,13 @@ jobs: submodules: recursive fetch-depth: 0 - - name: Install ncftp, kicad, and doxygen + - name: Install ncftp, kicad, doxygen, and yq run: | + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64 + sudo add-apt-repository ppa:rmescandon/yq sudo add-apt-repository ppa:kicad/kicad-5.1-releases sudo apt-get update - sudo apt-get install ncftp kicad doxygen + sudo apt-get install ncftp kicad doxygen yq - name: Set FTP variables env: diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 928b4fcfe0..589ad6ff45 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 01 10:41:00 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 01 17:12:46 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3802,4 +3802,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 01 10:41:00 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 01 17:12:46 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 56f404c64a..1be7768417 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1257,7 +1257,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 2153320530 +#define SIGNATURE_HASH 3916620085 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1591,7 +1591,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.01.hellen_cypress.2153320530" +#define TS_SIGNATURE "rusEFI 2021.02.01.hellen_cypress.3916620085" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/hellen/hellen128/connectors/main.yaml b/firmware/config/boards/hellen/hellen128/connectors/main.yaml index b93139f2c0..d7b821a4e7 100644 --- a/firmware/config/boards/hellen/hellen128/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen128/connectors/main.yaml @@ -258,7 +258,7 @@ pins: type: inj - pin: E4 - function: 230: 1.5A low side VVT solenoid / 430 injector output 4 + function: "230: 1.5A low side VVT solenoid / 430 injector output 4" type: inj - pin: E5 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 1a26334abd..3a08a873fc 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 01 10:40:59 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 01 17:12:44 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3802,4 +3802,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 01 10:40:59 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 01 17:12:44 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 23cd712661..74c4f3655e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1257,7 +1257,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 2153320530 +#define SIGNATURE_HASH 3916620085 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1591,7 +1591,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.01.kin.2153320530" +#define TS_SIGNATURE "rusEFI 2021.02.01.kin.3916620085" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/date_stamp.h b/firmware/controllers/date_stamp.h index 589f07e2cb..71126b44a4 100644 --- a/firmware/controllers/date_stamp.h +++ b/firmware/controllers/date_stamp.h @@ -1,2 +1,2 @@ #pragma once -#define VCS_DATE 20210201 +#define VCS_DATE 20210202 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 46003922f6..6de0435c8d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3802,4 +3802,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 1eb8572bee..86a3bb1e40 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index ef8e5959a6..cee0bb5356 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 1e77886c42..aaefbea648 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index d874b99506..96eddf579c 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 830454ba17..655e6bc4b6 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1254,7 +1254,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3257256834 +#define SIGNATURE_HASH 2869836517 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1588,7 +1588,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.01.all.3257256834" +#define TS_SIGNATURE "rusEFI 2021.02.01.all.2869836517" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 628c442a47..4d682ecbe1 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3257256834 -#define TS_SIGNATURE "rusEFI 2021.02.01.all.3257256834" +#define SIGNATURE_HASH 2869836517 +#define TS_SIGNATURE "rusEFI 2021.02.01.all.2869836517" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b63afb81dd..84e38d9014 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 1180689937 -#define TS_SIGNATURE "rusEFI 2021.02.01.frankenso_na6.1180689937" +#define SIGNATURE_HASH 796137334 +#define TS_SIGNATURE "rusEFI 2021.02.01.frankenso_na6.796137334" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 83c21a2503..fc432f66e9 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3497104186 -#define TS_SIGNATURE "rusEFI 2021.02.01.hellen72.3497104186" +#define SIGNATURE_HASH 3109708381 +#define TS_SIGNATURE "rusEFI 2021.02.01.hellen72.3109708381" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 4cd4b3d769..5d23d3962f 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 2153320530 -#define TS_SIGNATURE "rusEFI 2021.02.01.hellen_cypress.2153320530" +#define SIGNATURE_HASH 3916620085 +#define TS_SIGNATURE "rusEFI 2021.02.01.hellen_cypress.3916620085" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 6c2ca4970e..12d0f7c9e3 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 2153320530 -#define TS_SIGNATURE "rusEFI 2021.02.01.kin.2153320530" +#define SIGNATURE_HASH 3916620085 +#define TS_SIGNATURE "rusEFI 2021.02.01.kin.3916620085" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 0eaaa0a4fd..c9205b8971 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3974347112 -#define TS_SIGNATURE "rusEFI 2021.02.01.mre_f4.3974347112" +#define SIGNATURE_HASH 2244495375 +#define TS_SIGNATURE "rusEFI 2021.02.01.mre_f4.2244495375" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5c51c99d3d..fb4884f5d8 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3974347112 -#define TS_SIGNATURE "rusEFI 2021.02.01.mre_f7.3974347112" +#define SIGNATURE_HASH 2244495375 +#define TS_SIGNATURE "rusEFI 2021.02.01.mre_f7.2244495375" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 40d501f71e..8511e9a0b6 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3501443508 -#define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_405.3501443508" +#define SIGNATURE_HASH 3113760979 +#define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_405.3113760979" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 8dbedde699..31e48efcb0 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 3501443508 -#define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_469.3501443508" +#define SIGNATURE_HASH 3113760979 +#define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_469.3113760979" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5b0261a050..f4b9258a18 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 2769552301 -#define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f4.2769552301" +#define SIGNATURE_HASH 3426742986 +#define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f4.3426742986" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 69ec94bc8b..328ee0535a 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.02.01 -#define SIGNATURE_HASH 2769552301 -#define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f7.2769552301" +#define SIGNATURE_HASH 3426742986 +#define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f7.3426742986" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index c8357d5f36..03c0586de3 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 4ffcb5a151..6ada045ddc 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.all.3257256834" + signature = "rusEFI 2021.02.01.all.2869836517" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.all.3257256834" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.all.2869836517" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 07b5c41514..64169e1a9a 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.frankenso_na6.1180689937" + signature = "rusEFI 2021.02.01.frankenso_na6.796137334" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.frankenso_na6.1180689937" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.frankenso_na6.796137334" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:45 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:29 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index dcd3ff8852..e2b01bc415 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.hellen72.3497104186" + signature = "rusEFI 2021.02.01.hellen72.3109708381" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.hellen72.3497104186" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.hellen72.3109708381" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:41 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:24 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index f9300bd0de..68c4499f19 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.hellen_cypress.2153320530" + signature = "rusEFI 2021.02.01.hellen_cypress.3916620085" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.hellen_cypress.2153320530" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.hellen_cypress.3916620085" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 01 10:41:00 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 01 17:12:46 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d6d38f1406..5863bc3d8b 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.kin.2153320530" + signature = "rusEFI 2021.02.01.kin.3916620085" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.kin.2153320530" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.kin.3916620085" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 01 10:40:59 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 01 17:12:44 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 3094828be0..1299d9bf4e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.mre_f4.3974347112" + signature = "rusEFI 2021.02.01.mre_f4.2244495375" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.mre_f4.3974347112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.mre_f4.2244495375" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:44 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:27 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 3d4bbe164d..b16814ef02 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.mre_f7.3974347112" + signature = "rusEFI 2021.02.01.mre_f7.2244495375" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.mre_f7.3974347112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.mre_f7.2244495375" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:42 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:26 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f1148d0621..e8a77f9412 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.prometheus_405.3501443508" + signature = "rusEFI 2021.02.01.prometheus_405.3113760979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.prometheus_405.3501443508" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.prometheus_405.3113760979" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:48 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:32 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 10f8f9a84b..8a76152bea 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.prometheus_469.3501443508" + signature = "rusEFI 2021.02.01.prometheus_469.3113760979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.prometheus_469.3501443508" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.prometheus_469.3113760979" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:46 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:30 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 04fb1eb923..f816fdd108 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.proteus_f4.2769552301" + signature = "rusEFI 2021.02.01.proteus_f4.3426742986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.proteus_f4.2769552301" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.proteus_f4.3426742986" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:58 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:43 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 2c067978b7..da0d3e937e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.01.proteus_f7.2769552301" + signature = "rusEFI 2021.02.01.proteus_f7.3426742986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.01.proteus_f7.2769552301" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.01.proteus_f7.3426742986" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:56 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:41 UTC 2021 pageSize = 20000 page = 1 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 70301d753e..7b165e24c5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 10:40:39 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 01 17:12:22 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1491,7 +1491,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.02.01.all.3257256834"; + public static final String TS_SIGNATURE = "rusEFI 2021.02.01.all.2869836517"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index b611ce81e4..118dd1097e 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + diff --git a/misc/jenkins/generate_doxygen/gen_upload_docs.sh b/misc/jenkins/generate_doxygen/gen_upload_docs.sh index f2cc17e123..76b321567d 100644 --- a/misc/jenkins/generate_doxygen/gen_upload_docs.sh +++ b/misc/jenkins/generate_doxygen/gen_upload_docs.sh @@ -24,23 +24,20 @@ if [ -n "$RUSEFI_FTP_SERVER" ]; then fi [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } -# I should make this automatic, but that would require reading the image file from the yaml, which I don't feel like doing right now cd .. -mkdir pinouts -mkdir pinouts/proteus -bash misc/pinout-gen/gen.sh firmware/config/boards/proteus/black23.yaml > pinouts/proteus/black23.html -cp firmware/config/boards/proteus/connectors/black23.jpg pinouts/proteus/black23.jpg -bash misc/pinout-gen/gen.sh firmware/config/boards/proteus/black35.yaml > pinouts/proteus/black35.html -cp firmware/config/boards/proteus/connectors/black35.jpg pinouts/proteus/black35.jpg -bash misc/pinout-gen/gen.sh firmware/config/boards/proteus/white35.yaml > pinouts/proteus/white35.html -cp firmware/config/boards/proteus/connectors/black35.jpg pinouts/proteus/white35.jpg -mkdir pinouts/hellen -mkdir pinouts/hellen/hellen72 -bash misc/pinout-gen/gen.sh firmware/config/boards/hellen/hellen72/main.yaml > pinouts/hellen/hellen72/main.html -cp firmware/config/boards/hellen/hellen72/connectors/main.jpg pinouts/hellen/hellen72/main.jpg -mkdir pinouts/hellen/hellen128 -bash misc/pinout-gen/gen.sh firmware/config/boards/hellen/hellen128/main.yaml > pinouts/hellen/hellen128/main.html -cp firmware/config/boards/hellen/hellen128/connectors/main.jpg pinouts/hellen/hellen128/main.jpg + +CONNECTORS=$(find -path "./firmware/config/boards/*/connectors/*.yaml") +for c in $CONNECTORS; do + DIR="pinouts/"$(echo $c | tr '/' '\n' | tail -n +5 | head -n -2 | tr '\n' '/') + NAME=$(basename $c .yaml) + mkdir -p $DIR + bash misc/pinout-gen/gen.sh $c > $DIR/$NAME.html + IMG=$(yq r $c 'info.image.file') + if [ $IMG ]; then + cp $(dirname $c)/$IMG $DIR + fi + cp misc/pinout-gen/yaml.min.js $DIR +done if [ -n "$RUSEFI_FTP_SERVER" ]; then echo "Uploading Pinouts" diff --git a/misc/pinout-gen/script.js b/misc/pinout-gen/script.js index d1c0316097..397da9a232 100644 --- a/misc/pinout-gen/script.js +++ b/misc/pinout-gen/script.js @@ -2,22 +2,51 @@ var connectorYaml = ` ###DATA### `; -function addRow(table, info) { +function addRow(table, pin, pdiv) { var template = document.getElementById("table-template"); var clone = template.content.cloneNode(true); + var row = clone.querySelector(".data"); var pdata = clone.querySelector(".pin-data"); var idata = clone.querySelector(".id-data"); var tdata = clone.querySelector(".type-data"); var fdata = clone.querySelector(".function-data"); var cdata = clone.querySelector(".color-data"); - pdata.textContent = info.pin; - idata.textContent = info.id; - tdata.textContent = info.type - fdata.textContent = info.function; - cdata.textContent = info.color + pdata.textContent = pin.pin; + idata.textContent = pin.id; + tdata.textContent = pin.type + fdata.textContent = pin.function; + cdata.textContent = pin.color + row.addEventListener('click', function(pin, pdiv) { + clickPin(pin, pdiv); + }.bind(null, pin, pdiv)); table.appendChild(clone); } +function clickPin(pin, pdiv) { + var table = document.getElementById("info-table").querySelector("tbody"); + table.innerHTML = ""; + if (Array.isArray(pin.id)) { + var pinIds = pin.id.filter((value, index) => { + return pin.id.indexOf(value) === index; + }); + for (var i = 0; i < pinIds.length; i++) { + addRow(table, {pin: pin.pin, id: pinIds[i], function: pin.function}, pdiv); + } + } else { + addRow(table, pin, pdiv); + } + var pins = document.querySelectorAll(".pin-marker"); + for (var i = 0; i < pins.length; i++) { + if (pins[i].dataset.type == pin.type) { + pins[i].classList.add("highlight"); + } else { + pins[i].classList.remove("highlight"); + } + pins[i].classList.remove("selected"); + } + pdiv.classList.add("selected"); +} + function adjustMarkers() { var cdiv = document.getElementById("connector-div"); cdiv.style.width = document.getElementById("connector-img").clientWidth; @@ -34,60 +63,38 @@ function adjustMarkers() { window.addEventListener('load', function() { var connector = YAML.parse(connectorYaml); document.getElementById("connector-img").addEventListener('load', function() { + for (var i = 0; i < connector.pins.length; i++) { + var pin = connector.pins[i]; + if (!pin.pin) { + continue; + } + var pinfo; + for (var ii = 0; ii < connector.info.pins.length; ii++) { + if (connector.info.pins[ii].pin == pin.pin) { + pinfo = connector.info.pins[ii]; + break; + } + } + var cdiv = document.getElementById("connector-div"); + var template = document.getElementById("pin-template"); + var clone = template.content.cloneNode(true); + var pdiv = clone.querySelector("div"); + var img = document.getElementById("connector-img"); + var imgHeight = img.naturalHeight; + var imgWidth = img.naturalWidth; + pdiv.style.top = ((pinfo.y / imgHeight) * 100) + "%"; + pdiv.style.left = ((pinfo.x / imgWidth) * 100) + "%"; + pdiv.dataset.type = pin.type; + pdiv.addEventListener("click", function(pin, pdiv) { + clickPin(pin, pdiv); + }.bind(null, pin, pdiv)); + cdiv.appendChild(pdiv); + var fullTable = document.getElementById("pinout-table").querySelector("tbody"); + addRow(fullTable, connector.pins[i], pdiv); + } adjustMarkers(); }); document.getElementById("connector-img").src = connector.info.image.file; - - for (var i = 0; i < connector.pins.length; i++) { - var pin = connector.pins[i]; - var pinfo; - for (var ii = 0; ii < connector.info.pins.length; ii++) { - if (connector.info.pins[ii].pin == pin.pin) { - pinfo = connector.info.pins[ii]; - break; - } - } - var cdiv = document.getElementById("connector-div"); - var template = document.getElementById("pin-template"); - var clone = template.content.cloneNode(true); - var pdiv = clone.querySelector("div"); - var img = document.getElementById("connector-img"); - var imgHeight = img.naturalHeight; - var imgWidth = img.naturalWidth; - pdiv.style.top = ((pinfo.y / imgHeight) * 100) + "%"; - pdiv.style.left = ((pinfo.x / imgWidth) * 100) + "%"; - pdiv.dataset.type = pin.type; - pdiv.addEventListener("click", function(pin, div) { - var table = document.getElementById("info-table").querySelector("tbody"); - table.innerHTML = ""; - if (Array.isArray(pin.id)) { - var pinIds = pin.id.filter((value, index) => { - return pin.id.indexOf(value) === index; - }); - for (var i = 0; i < pinIds.length; i++) { - addRow(table, {pin: pin.pin, id: pinIds[i], function: pin.function}); - } - } else { - addRow(table, pin); - } - var pins = document.querySelectorAll(".pin-marker"); - for (var i = 0; i < pins.length; i++) { - if (pins[i].dataset.type == pin.type) { - pins[i].classList.add("highlight"); - } else { - pins[i].classList.remove("highlight"); - } - pins[i].classList.remove("selected"); - } - div.classList.add("selected"); - }.bind(null, pin, pdiv)); - cdiv.appendChild(pdiv); - } - - for (var i = 0; i < connector.pins.length; i++) { - var table = document.getElementById("pinout-table").querySelector("tbody"); - addRow(table, connector.pins[i]); - } }); window.addEventListener('resize', function() { diff --git a/misc/pinout-gen/style.css b/misc/pinout-gen/style.css index 2d78d07317..594b6d8398 100644 --- a/misc/pinout-gen/style.css +++ b/misc/pinout-gen/style.css @@ -4,6 +4,7 @@ border-radius: 50%; background-color: white; border: 2px blue solid; + cursor: pointer; } .pin-marker:hover { @@ -55,6 +56,10 @@ table { } } +table tbody tr { + cursor: pointer; +} + table td, table th { border: 1px solid black; padding: 8px; @@ -94,5 +99,9 @@ table th { background-color: #230c00; color: white; } + + table tr:hover { + background-color: #f15a24; + } }