rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.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 2020-12-16 12:58:42 -05:00
parent f16c77944b dcd44fe1ff
commit cbfc652f67
30 changed files with 270 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -18,3 +18,6 @@
[submodule "firmware/ext/cmsis-svd"]
path = firmware/ext/cmsis-svd
url = https://github.com/posborne/cmsis-svd
[submodule "firmware/controllers/can/wideband_firmware"]
path = firmware/controllers/can/wideband_firmware
url = https://github.com/mck1117/wideband

2
firmware/config/stm32f4ems/efifeatures.h
View File

@ -202,6 +202,8 @@
#define EFI_CAN_SUPPORT TRUE
#endif
#define EFI_WIDEBAND_FIRMWARE_UPDATE TRUE
#ifndef EFI_AUX_SERIAL
#define EFI_AUX_SERIAL TRUE
#endif

16
firmware/controllers/bench_test.cpp
View File

@ -43,6 +43,10 @@
#include "malfunction_central.h"
#include "tunerstudio_outputs.h"
#if EFI_WIDEBAND_FIRMWARE_UPDATE
#include "can.h"
#endif
#if EFI_PROD_CODE
#include "rusefi.h"
#include "mpu_util.h"
@ -86,6 +90,7 @@ static void runBench(brain_pin_e brainPin, OutputPin *output, float delayMs, flo
}
static volatile bool isBenchTestPending = false;
static bool widebandUpdatePending = false;
static float onTime;
static float offTime;
static float delayMs;
@ -231,6 +236,13 @@ private:
isBenchTestPending = false;
runBench(brainPin, pinX, delayMs, onTime, offTime, count);
}
if (widebandUpdatePending) {
#if EFI_WIDEBAND_FIRMWARE_UPDATE
updateWidebandFirmware(logger);
#endif
widebandUpdatePending = false;
}
}
};
@ -312,6 +324,9 @@ static void handleCommandX14(uint16_t index) {
case 0xF:
engine->directSelfStimulation = false;
return;
case 0x12:
widebandUpdatePending = true;
return;
}
}
@ -385,6 +400,7 @@ void initBenchTest(Logging *sharedLogger) {
addConsoleActionS("fuelpumpbench2", fuelPumpBenchExt);
addConsoleAction("fanbench", fanBench);
addConsoleActionS("fanbench2", fanBenchExt);
addConsoleAction("update_wideband", []() { widebandUpdatePending = true; });
addConsoleAction(CMD_STARTER_BENCH, starterRelayBench);
addConsoleAction(CMD_MIL_BENCH, milBench);

5
firmware/controllers/can/can.h
View File

@ -22,6 +22,11 @@ class CanSensorBase;
void processCanRxMessage(const CANRxFrame& msg, Logging* logger, efitick_t nowNt);
void registerCanSensor(CanSensorBase& sensor);
// Indicate that an ack response was received from the wideband bootloader
void handleWidebandBootloaderAck();
// Update the firmware on any connected wideband controller
void updateWidebandFirmware(Logging*);
class CanWrite final : public PeriodicController<512> {
public:
CanWrite();

7
firmware/controllers/can/can_rx.cpp
View File

@ -64,6 +64,13 @@ void processCanRxMessage(const CANRxFrame& frame, Logging* logger, efitick_t now
{
obdOnCanPacketRx(frame);
}
#if EFI_WIDEBAND_FIRMWARE_UPDATE
// Bootloader acks with address 0x727573 aka ascii "rus"
if (frame.EID == 0x727573) {
handleWidebandBootloaderAck();
}
#endif
}
#endif // EFI_CAN_SUPPORT

98
firmware/controllers/can/wideband_bootloader.cpp Normal file
View File

@ -0,0 +1,98 @@
#include "global.h"
#if EFI_WIDEBAND_FIRMWARE_UPDATE
#include "ch.h"
#include "can_msg_tx.h"
// This file contains an array called build_wideband_noboot_bin
// This array contains the firmware image for the wideband contoller
#include "wideband_firmware/for_rusefi/wideband_image.h"
#define EVT_BOOTLOADER_ACK EVENT_MASK(0)
static thread_t* waitingBootloaderThread = nullptr;
void handleWidebandBootloaderAck() {
auto t = waitingBootloaderThread;
if (t) {
chEvtSignal(t, EVT_BOOTLOADER_ACK);
}
}
bool waitAck() {
return chEvtWaitAnyTimeout(EVT_BOOTLOADER_ACK, TIME_MS2I(1000)) != 0;
}
void updateWidebandFirmware(Logging* logging) {
// Clear any pending acks for this thread
chEvtGetAndClearEvents(EVT_BOOTLOADER_ACK);
// Send messages to the current thread when acks come in
waitingBootloaderThread = chThdGetSelfX();
scheduleMsg(logging, "***************************************");
scheduleMsg(logging, " WIDEBAND FIRMWARE UPDATE");
scheduleMsg(logging, "***************************************");
scheduleMsg(logging, "Wideband Update: Rebooting to bootloader...");
// The first request will reboot the chip (if necessary), and the second one will enable bootloader mode
// If the chip was already in bootloader (aka manual mode), then that's ok - the second request will
// just be safely ignored (but acked)
for (int i = 0; i < 2; i++) {
{
// Send bootloader entry command
CanTxMessage m(0xEF0'0000, 0, true);
}
if (!waitAck()) {
scheduleMsg(logging, "Wideband Update ERROR: Expected ACK from entry to bootloader, didn't get one.");
return;
}
// Let the controller reboot (and show blinky lights for a second before the update begins)
chThdSleepMilliseconds(200);
}
scheduleMsg(logging, "Wideband Update: in update mode, erasing flash...");
{
// Erase flash - opcode 1, magic value 0x5A5A
CanTxMessage m(0xEF1'5A5A, 0, true);
}
if (!waitAck()) {
scheduleMsg(logging, "Wideband Update ERROR: Expected ACK from flash erase command, didn't get one.");
return;
}
size_t totalSize = sizeof(build_wideband_image_bin);
scheduleMsg(logging, "Wideband Update: Flash erased! Sending %d bytes...", totalSize);
// Send flash data 8 bytes at a time
for (size_t i = 0; i < totalSize; i += 8) {
{
CanTxMessage m(0xEF2'0000 + i, 8, true);
memcpy(&m[0], build_wideband_image_bin + i, 8);
}
if (!waitAck()) {
scheduleMsg(logging, "Wideband Update ERROR: Expected ACK from data write, didn't get one.");
return;
}
}
scheduleMsg(logging, "Wideband Update: Update complete! Rebooting controller.");
{
// Reboot to firmware!
CanTxMessage m(0xEF3'0000, 0, true);
}
waitAck();
waitingBootloaderThread = nullptr;
}
#endif // EFI_WIDEBAND_FIRMWARE_UPDATE

1
firmware/controllers/can/wideband_firmware Submodule

@ -0,0 +1 @@
Subproject commit 3fe5b76975d5b6a2e093709e50ca938ecd16347f

1
firmware/controllers/controllers.mk
View File

@ -42,6 +42,7 @@ CONTROLLERS_SRC_CPP = \
$(CONTROLLERS_DIR)/can/obd2.cpp \
$(CONTROLLERS_DIR)/can/can_verbose.cpp \
$(CONTROLLERS_DIR)/can/can_rx.cpp \
$(CONTORLLERS_DIR)/can/wideband_bootloader.cpp \
$(CONTROLLERS_DIR)/can/can_tx.cpp \
$(CONTROLLERS_DIR)/can/can_dash.cpp \
$(CONTROLLERS_DIR)/can/can_vss.cpp \

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 1394893573
#define TS_SIGNATURE "rusEFI 2020.12.15.all.1394893573"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 3147380267
#define TS_SIGNATURE "rusEFI 2020.12.16.all.3147380267"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 3310670590
#define TS_SIGNATURE "rusEFI 2020.12.15.frankenso_na6.3310670590"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 770279376
#define TS_SIGNATURE "rusEFI 2020.12.16.frankenso_na6.770279376"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 2597701062
#define TS_SIGNATURE "rusEFI 2020.12.15.hellen_cypress.2597701062"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 1919455464
#define TS_SIGNATURE "rusEFI 2020.12.16.hellen_cypress.1919455464"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 3419012924
#define TS_SIGNATURE "rusEFI 2020.12.15.kin.3419012924"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 594848274
#define TS_SIGNATURE "rusEFI 2020.12.16.kin.594848274"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 1156889980
#define TS_SIGNATURE "rusEFI 2020.12.15.mre_f4.1156889980"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 2890524754
#define TS_SIGNATURE "rusEFI 2020.12.16.mre_f4.2890524754"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 1156889980
#define TS_SIGNATURE "rusEFI 2020.12.15.mre_f7.1156889980"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 2890524754
#define TS_SIGNATURE "rusEFI 2020.12.16.mre_f7.2890524754"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 301753684
#define TS_SIGNATURE "rusEFI 2020.12.15.prometheus_405.301753684"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 4181799034
#define TS_SIGNATURE "rusEFI 2020.12.16.prometheus_405.4181799034"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 301753684
#define TS_SIGNATURE "rusEFI 2020.12.15.prometheus_469.301753684"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 4181799034
#define TS_SIGNATURE "rusEFI 2020.12.16.prometheus_469.4181799034"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 2593008091
#define TS_SIGNATURE "rusEFI 2020.12.15.proteus_f4.2593008091"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 1915976949
#define TS_SIGNATURE "rusEFI 2020.12.16.proteus_f4.1915976949"

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

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.12.15
#define SIGNATURE_HASH 2593008091
#define TS_SIGNATURE "rusEFI 2020.12.15.proteus_f7.2593008091"
#define SIGNATURE_DATE 2020.12.16
#define SIGNATURE_HASH 1915976949
#define TS_SIGNATURE "rusEFI 2020.12.16.proteus_f7.1915976949"

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

Binary file not shown.

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.all.1394893573"
signature = "rusEFI 2020.12.16.all.3147380267"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.all.1394893573" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.all.3147380267" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:26 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:32:48 UTC 2020
pageSize = 20000
page = 1
@ -2906,6 +2906,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)"
@ -3007,9 +3008,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4641,6 +4643,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.frankenso_na6.3310670590"
signature = "rusEFI 2020.12.16.frankenso_na6.770279376"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.frankenso_na6.3310670590" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.frankenso_na6.770279376" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:32 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:32:56 UTC 2020
pageSize = 20000
page = 1
@ -2906,6 +2906,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)"
@ -3007,9 +3008,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4641,6 +4643,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.hellen_cypress.2597701062"
signature = "rusEFI 2020.12.16.hellen_cypress.1919455464"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.hellen_cypress.2597701062" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.hellen_cypress.1919455464" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:42 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 16 13:33:10 UTC 2020
pageSize = 20000
page = 1
@ -2906,6 +2906,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)"
@ -3007,9 +3008,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4641,6 +4643,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.kin.3419012924"
signature = "rusEFI 2020.12.16.kin.594848274"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.kin.3419012924" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.kin.594848274" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:40 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 16 13:33:09 UTC 2020
pageSize = 20000
page = 1
@ -2906,6 +2906,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)"
@ -3007,9 +3008,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4642,6 +4644,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.mre_f4.1156889980"
signature = "rusEFI 2020.12.16.mre_f4.2890524754"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.mre_f4.1156889980" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.mre_f4.2890524754" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:30 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:32:53 UTC 2020
pageSize = 20000
page = 1
@ -2902,6 +2902,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = softwareKnock, "Software Knock"
@ -3003,9 +3004,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4616,6 +4618,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.mre_f7.1156889980"
signature = "rusEFI 2020.12.16.mre_f7.2890524754"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.mre_f7.1156889980" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.mre_f7.2890524754" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:28 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:32:51 UTC 2020
pageSize = 20000
page = 1
@ -2902,6 +2902,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = softwareKnock, "Software Knock"
@ -3003,9 +3004,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4616,6 +4618,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.prometheus_405.301753684"
signature = "rusEFI 2020.12.16.prometheus_405.4181799034"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.prometheus_405.301753684" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.prometheus_405.4181799034" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:35 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:33:03 UTC 2020
pageSize = 20000
page = 1
@ -2906,6 +2906,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = std_separator
@ -3003,9 +3004,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4637,6 +4639,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.prometheus_469.301753684"
signature = "rusEFI 2020.12.16.prometheus_469.4181799034"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.prometheus_469.301753684" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.prometheus_469.4181799034" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:34 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:33:01 UTC 2020
pageSize = 20000
page = 1
@ -2906,6 +2906,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = std_separator
@ -3003,9 +3004,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4637,6 +4639,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.proteus_f4.2593008091"
signature = "rusEFI 2020.12.16.proteus_f4.1915976949"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.proteus_f4.2593008091" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.proteus_f4.1915976949" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:39 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:33:07 UTC 2020
pageSize = 20000
page = 1
@ -2898,6 +2898,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = softwareKnock, "Software Knock"
@ -2999,9 +3000,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4608,6 +4610,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

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

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.12.15.proteus_f7.2593008091"
signature = "rusEFI 2020.12.16.proteus_f7.1915976949"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.12.15.proteus_f7.2593008091" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.12.16.proteus_f7.1915976949" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Tue Dec 15 05:18:37 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 16 13:33:05 UTC 2020
pageSize = 20000
page = 1
@ -2898,6 +2898,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = softwareKnock, "Software Knock"
@ -2999,9 +3000,10 @@ cmd_write_config = "Z\x00\x14\x00\x0A"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_cj125_calibrate = "Z\x00\x18\x00\x00"
cmd_call_from_pit = "Z\x00\x20\x34\x56"
@ -4608,6 +4610,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"

8
firmware/tunerstudio/rusefi.input
View File

@ -1521,6 +1521,7 @@ menuDialog = main
subMenu = parkingLot, "Experimental/Broken"
subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1}
subMenu = mc33Dialog, "GDI Dreams"
subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled }
subMenu = std_separator
subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@if_ts_show_hip9011
@ -1623,9 +1624,10 @@ cmd_write_config = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x0A"
cmd_etb_autotune = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x0C"
cmd_enable_self_stim = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x11"
cmd_disable_self_stim = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x10"
cmb_etb_auto_calibrate_2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x11"
cmd_wideband_firmare_update = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x12"
cmd_cj125_calibrate = "@@TS_IO_TEST_COMMAND_char@@\x00\x18\x00\x00"
cmd_call_from_pit = "@@TS_IO_TEST_COMMAND_char@@\x00\x20\x34\x56"
@ -3248,6 +3250,10 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
panel = testInjectors
panel = testFsio
panel = testMisc
dialog = widebandConfig, "rusEFI Wideband Config"
field = "!Please connect exactly one wideband controller before pressing this button!"
commandButton = "Update Firmware", cmd_wideband_firmare_update
dialog = engineTypeDialog, "Popular vehicles"
field = "!These buttons send a command to rusEFI controller to apply preset values"