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

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2021-02-01 22:50:11 -05:00
parent 9a2cc6b3c9 be9ea1a9aa
commit 953dabfb26
41 changed files with 166 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/gen-docs.yaml vendored
View File

@ -14,11 +14,13 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
- name: Install ncftp, kicad, and doxygen - name: Install ncftp, kicad, doxygen, and yq
run: | 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 add-apt-repository ppa:kicad/kicad-5.1-releases
sudo apt-get update sudo apt-get update
sudo apt-get install ncftp kicad doxygen sudo apt-get install ncftp kicad doxygen yq
- name: Set FTP variables - name: Set FTP variables
env: env:

4
firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3802,4 +3802,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // 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

4
firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
View File

@ -1257,7 +1257,7 @@
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 2153320530 #define SIGNATURE_HASH 3916620085
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1591,7 +1591,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator false #define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true #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 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

2
firmware/config/boards/hellen/hellen128/connectors/main.yaml
View File

@ -258,7 +258,7 @@ pins:
type: inj type: inj
- pin: E4 - 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 type: inj
- pin: E5 - pin: E5

4
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3802,4 +3802,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // 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

4
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -1257,7 +1257,7 @@
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 2153320530 #define SIGNATURE_HASH 3916620085
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1591,7 +1591,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator false #define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true #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 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once #pragma once
#define VCS_DATE 20210201 #define VCS_DATE 20210202

4
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -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 // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3802,4 +3802,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // 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

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -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 // by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000, FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -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 // by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE: case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -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 // by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -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 // by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE: case FSIO_SETTING_FANONTEMPERATURE:

4
firmware/controllers/generated/rusefi_generated.h
View File

@ -1254,7 +1254,7 @@
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3257256834 #define SIGNATURE_HASH 2869836517
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1588,7 +1588,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator false #define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true #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 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

4
firmware/controllers/generated/signature_all.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3257256834 #define SIGNATURE_HASH 2869836517
#define TS_SIGNATURE "rusEFI 2021.02.01.all.3257256834" #define TS_SIGNATURE "rusEFI 2021.02.01.all.2869836517"

4
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 1180689937 #define SIGNATURE_HASH 796137334
#define TS_SIGNATURE "rusEFI 2021.02.01.frankenso_na6.1180689937" #define TS_SIGNATURE "rusEFI 2021.02.01.frankenso_na6.796137334"

4
firmware/controllers/generated/signature_hellen72.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD hellen72 #define SIGNATURE_BOARD hellen72
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3497104186 #define SIGNATURE_HASH 3109708381
#define TS_SIGNATURE "rusEFI 2021.02.01.hellen72.3497104186" #define TS_SIGNATURE "rusEFI 2021.02.01.hellen72.3109708381"

4
firmware/controllers/generated/signature_hellen_cypress.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 2153320530 #define SIGNATURE_HASH 3916620085
#define TS_SIGNATURE "rusEFI 2021.02.01.hellen_cypress.2153320530" #define TS_SIGNATURE "rusEFI 2021.02.01.hellen_cypress.3916620085"

4
firmware/controllers/generated/signature_kin.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 2153320530 #define SIGNATURE_HASH 3916620085
#define TS_SIGNATURE "rusEFI 2021.02.01.kin.2153320530" #define TS_SIGNATURE "rusEFI 2021.02.01.kin.3916620085"

4
firmware/controllers/generated/signature_mre_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4 #define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3974347112 #define SIGNATURE_HASH 2244495375
#define TS_SIGNATURE "rusEFI 2021.02.01.mre_f4.3974347112" #define TS_SIGNATURE "rusEFI 2021.02.01.mre_f4.2244495375"

4
firmware/controllers/generated/signature_mre_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7 #define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3974347112 #define SIGNATURE_HASH 2244495375
#define TS_SIGNATURE "rusEFI 2021.02.01.mre_f7.3974347112" #define TS_SIGNATURE "rusEFI 2021.02.01.mre_f7.2244495375"

4
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3501443508 #define SIGNATURE_HASH 3113760979
#define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_405.3501443508" #define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_405.3113760979"

4
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 3501443508 #define SIGNATURE_HASH 3113760979
#define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_469.3501443508" #define TS_SIGNATURE "rusEFI 2021.02.01.prometheus_469.3113760979"

4
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 2769552301 #define SIGNATURE_HASH 3426742986
#define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f4.2769552301" #define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f4.3426742986"

4
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2021.02.01 #define SIGNATURE_DATE 2021.02.01
#define SIGNATURE_HASH 2769552301 #define SIGNATURE_HASH 3426742986
#define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f7.2769552301" #define TS_SIGNATURE "rusEFI 2021.02.01.proteus_f7.3426742986"

BIN
firmware/tunerstudio/generated/cache.zip
View File

Binary file not shown.

6
firmware/tunerstudio/generated/rusefi.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2021.02.01.all.3257256834" signature = "rusEFI 2021.02.01.all.2869836517"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_hellen72.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2021.02.01.hellen72.3497104186" signature = "rusEFI 2021.02.01.hellen72.3109708381"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_kinetis.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2021.02.01.kin.2153320530" signature = "rusEFI 2021.02.01.kin.3916620085"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_mre_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_mre_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_prometheus_405.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_prometheus_469.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_proteus_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

6
firmware/tunerstudio/generated/rusefi_proteus_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; 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] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. 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] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -77,7 +77,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 20000
page = 1 page = 1

4
java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; 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 // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; 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_R_COMMAND = 'r';
public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SD_W_COMMAND = 'w';
public static final char TS_SET_LOGGER_SWITCH = 'l'; 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 char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int TT_TT_1_16 = 50; public static final int TT_TT_1_16 = 50;
public static final int TT_TT_2JZ_1_12 = 29; public static final int TT_TT_2JZ_1_12 = 29;

2
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms> <roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Mon Feb 01 10:40:40 UTC 2021 --> <!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Mon Feb 01 17:12:23 UTC 2021 -->
<rom> <rom>
<romid> <romid>

29
misc/jenkins/generate_doxygen/gen_upload_docs.sh
View File

@ -24,23 +24,20 @@ if [ -n "$RUSEFI_FTP_SERVER" ]; then
fi fi
[ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } [ $? -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 .. cd ..
mkdir pinouts
mkdir pinouts/proteus CONNECTORS=$(find -path "./firmware/config/boards/*/connectors/*.yaml")
bash misc/pinout-gen/gen.sh firmware/config/boards/proteus/black23.yaml > pinouts/proteus/black23.html for c in $CONNECTORS; do
cp firmware/config/boards/proteus/connectors/black23.jpg pinouts/proteus/black23.jpg DIR="pinouts/"$(echo $c | tr '/' '\n' | tail -n +5 | head -n -2 | tr '\n' '/')
bash misc/pinout-gen/gen.sh firmware/config/boards/proteus/black35.yaml > pinouts/proteus/black35.html NAME=$(basename $c .yaml)
cp firmware/config/boards/proteus/connectors/black35.jpg pinouts/proteus/black35.jpg mkdir -p $DIR
bash misc/pinout-gen/gen.sh firmware/config/boards/proteus/white35.yaml > pinouts/proteus/white35.html bash misc/pinout-gen/gen.sh $c > $DIR/$NAME.html
cp firmware/config/boards/proteus/connectors/black35.jpg pinouts/proteus/white35.jpg IMG=$(yq r $c 'info.image.file')
mkdir pinouts/hellen if [ $IMG ]; then
mkdir pinouts/hellen/hellen72 cp $(dirname $c)/$IMG $DIR
bash misc/pinout-gen/gen.sh firmware/config/boards/hellen/hellen72/main.yaml > pinouts/hellen/hellen72/main.html fi
cp firmware/config/boards/hellen/hellen72/connectors/main.jpg pinouts/hellen/hellen72/main.jpg cp misc/pinout-gen/yaml.min.js $DIR
mkdir pinouts/hellen/hellen128 done
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
if [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "Uploading Pinouts" echo "Uploading Pinouts"

121
misc/pinout-gen/script.js
View File

@ -2,22 +2,51 @@ var connectorYaml = `
###DATA### ###DATA###
`; `;
function addRow(table, info) { function addRow(table, pin, pdiv) {
var template = document.getElementById("table-template"); var template = document.getElementById("table-template");
var clone = template.content.cloneNode(true); var clone = template.content.cloneNode(true);
var row = clone.querySelector(".data");
var pdata = clone.querySelector(".pin-data"); var pdata = clone.querySelector(".pin-data");
var idata = clone.querySelector(".id-data"); var idata = clone.querySelector(".id-data");
var tdata = clone.querySelector(".type-data"); var tdata = clone.querySelector(".type-data");
var fdata = clone.querySelector(".function-data"); var fdata = clone.querySelector(".function-data");
var cdata = clone.querySelector(".color-data"); var cdata = clone.querySelector(".color-data");
pdata.textContent = info.pin; pdata.textContent = pin.pin;
idata.textContent = info.id; idata.textContent = pin.id;
tdata.textContent = info.type tdata.textContent = pin.type
fdata.textContent = info.function; fdata.textContent = pin.function;
cdata.textContent = info.color cdata.textContent = pin.color
row.addEventListener('click', function(pin, pdiv) {
clickPin(pin, pdiv);
}.bind(null, pin, pdiv));
table.appendChild(clone); 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() { function adjustMarkers() {
var cdiv = document.getElementById("connector-div"); var cdiv = document.getElementById("connector-div");
cdiv.style.width = document.getElementById("connector-img").clientWidth; cdiv.style.width = document.getElementById("connector-img").clientWidth;
@ -34,60 +63,38 @@ function adjustMarkers() {
window.addEventListener('load', function() { window.addEventListener('load', function() {
var connector = YAML.parse(connectorYaml); var connector = YAML.parse(connectorYaml);
document.getElementById("connector-img").addEventListener('load', function() { 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(); adjustMarkers();
}); });
document.getElementById("connector-img").src = connector.info.image.file; 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() { window.addEventListener('resize', function() {

9
misc/pinout-gen/style.css
View File

@ -4,6 +4,7 @@
border-radius: 50%; border-radius: 50%;
background-color: white; background-color: white;
border: 2px blue solid; border: 2px blue solid;
cursor: pointer;
} }
.pin-marker:hover { .pin-marker:hover {
@ -55,6 +56,10 @@ table {
} }
} }
table tbody tr {
cursor: pointer;
}
table td, table th { table td, table th {
border: 1px solid black; border: 1px solid black;
padding: 8px; padding: 8px;
@ -94,5 +99,9 @@ table th {
background-color: #230c00; background-color: #230c00;
color: white; color: white;
} }
table tr:hover {
background-color: #f15a24;
}
} }