From 1f1243ba95ff9db6d451173c3122b443efd18225 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 2 Aug 2020 15:33:08 -0700 Subject: [PATCH 01/14] real names & sensible limits --- firmware/integration/rusefi_config.txt | 18 +++++++-------- firmware/tunerstudio/rusefi.input | 32 +++++++++++++++----------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 61779ff8c0..c8ce138c6a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1309,15 +1309,15 @@ uint8_t[4] unusedsw;;"units", 1, 0, -20, 100, 0 gppwm_channel[GPPWM_CHANNELS iterate] gppwm; - uint16_t mc33_i_boost;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_i_peak;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_i_hold;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_t_max_boost;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_t_peak_off;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_t_peak_tot;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_t_bypass;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_t_hold_off;;"X", 1, 0.0, 0, 64000, 0 - uint16_t mc33_t_hold_tot;;"X", 1, 0.0, 0, 64000, 0 + uint16_t mc33_i_boost;;"mA", 1, 0.0, 1000, 25000, 0 + uint16_t mc33_i_peak;;"mA", 1, 0.0, 1000, 20000, 0 + uint16_t mc33_i_hold;;"mA", 1, 0.0, 1000, 20000, 0 + uint16_t mc33_t_max_boost;;"us", 1, 0.0, 0, 10000, 0 + uint16_t mc33_t_peak_off;;"us", 1, 0.0, 0, 10000, 0 + uint16_t mc33_t_peak_tot;;"us", 1, 0.0, 0, 10000, 0 + uint16_t mc33_t_bypass;;"us", 1, 0.0, 0, 10000, 0 + uint16_t mc33_t_hold_off;;"us", 1, 0.0, 0, 10000, 0 + uint16_t mc33_t_hold_tot;;"us", 1, 0.0, 0, 10000, 0 ! just a reminder that 'int' and 'float' are 4 bytes each int[371] mainUnusedEnd;;"units", 1, 0, -20, 100, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3d2730bedc..25a753656d 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1795,20 +1795,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + field = "Hold current target", mc33_i_hold + field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Maximum injection duration", mc33_t_hold_tot ; Sensor Inputs From 539ac80a535cf7ade1bdc5c0cea023a39a87dffa Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 2 Aug 2020 16:21:45 -0700 Subject: [PATCH 02/14] hvolt limits --- firmware/integration/rusefi_config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c8ce138c6a..c4f70887eb 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -741,7 +741,7 @@ pin_output_mode_e hip9011IntHoldPinMode; ! 536870911 = 2^29-1, the maximum valid extended ID uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0 - uint8_t mc33_hvolt;;"v", 1, 0, 0, 100, 0 + uint8_t mc33_hvolt;;"v", 1, 0, 40, 70, 0 uint8_t fsio_visible acIdleExtraMin;+Additional idle PID minValue while A/C is active;"Percent", 1, 0, 0, 255, 0 uint8_t[2] unusedHere;;"units", 1, 0, -20, 100, 0 From 519427cce2b4ec1327a8ac16a506c79ed143255d Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 2 Aug 2020 16:21:53 -0700 Subject: [PATCH 03/14] defaults --- firmware/config/engines/custom_engine.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 8898c53ad1..cd9e189de1 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -630,7 +630,17 @@ void setTest33816EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { CONFIG(isSdCardEnabled) = false; - CONFIG(mc33_hvolt) = 63; - CONFIG(mc33816spiDevice) = SPI_DEVICE_3; + + // This is the configuration for bosch HDEV 5 injectors + CONFIG(mc33_hvolt) = 65; + CONFIG(mc33_i_boost) = 13000; + CONFIG(mc33_i_peak) = 9400; + CONFIG(mc33_i_hold) = 3700; + CONFIG(mc33_t_max_boost) = 470; + CONFIG(mc33_t_peak_off) = 10; + CONFIG(mc33_t_peak_tot) = 700; + CONFIG(mc33_t_bypass) = 15; + CONFIG(mc33_t_hold_off) = 60; + CONFIG(mc33_t_hold_tot) = 10000; } From da4082d22d09d2953c97d7fa99256c228fd361cd Mon Sep 17 00:00:00 2001 From: GitHub set-date Action Date: Mon, 3 Aug 2020 00:34:41 +0000 Subject: [PATCH 04/14] Update date --- firmware/controllers/date_stamp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/controllers/date_stamp.h b/firmware/controllers/date_stamp.h index e317540f62..39f98bbc3e 100644 --- a/firmware/controllers/date_stamp.h +++ b/firmware/controllers/date_stamp.h @@ -1,2 +1,2 @@ #pragma once -#define VCS_DATE 20200802 +#define VCS_DATE 20200803 From 9a33e922af7f5026fc9078434885cfb03016fe39 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 20:46:40 -0400 Subject: [PATCH 05/14] The Big Refactoring of 2019: folder structure #723 --- firmware/Makefile | 4 +-- .../hw_layer/{ => adc}/AdcConfiguration.h | 0 firmware/hw_layer/{ => adc}/adc_external.h | 0 firmware/hw_layer/{ => adc}/adc_inputs.cpp | 0 firmware/hw_layer/{ => adc}/adc_inputs.h | 0 .../hw_layer/{ => adc}/adc_subscription.cpp | 0 .../hw_layer/{ => adc}/adc_subscription.h | 0 firmware/hw_layer/{ => adc}/mcp3208.c | 0 firmware/hw_layer/{ => adc}/mcp3208.h | 0 .../{ => digital_input}/digital_input.cpp | 0 .../{ => digital_input}/digital_input.h | 0 .../digital_input_exti.cpp | 0 .../{ => digital_input}/digital_input_exti.h | 0 .../{ => digital_input}/digital_input_icu.cpp | 0 .../{ => digital_input}/digital_input_icu.h | 0 .../trigger}/trigger_input.cpp | 0 .../trigger}/trigger_input.h | 0 .../trigger}/trigger_input_comp.cpp | 0 .../trigger}/trigger_input_exti.cpp | 0 .../trigger}/trigger_input_icu.cpp | 0 firmware/hw_layer/hw_layer.mk | 30 +++++++++++-------- firmware/hw_layer/{ => sensors}/hip9011.cpp | 0 firmware/hw_layer/{ => sensors}/hip9011.h | 0 .../hw_layer/{ => sensors}/hip9011_logic.cpp | 0 .../hw_layer/{ => sensors}/hip9011_logic.h | 0 simulator/Makefile | 2 +- unit_tests/Makefile | 3 +- 27 files changed, 21 insertions(+), 18 deletions(-) rename firmware/hw_layer/{ => adc}/AdcConfiguration.h (100%) rename firmware/hw_layer/{ => adc}/adc_external.h (100%) rename firmware/hw_layer/{ => adc}/adc_inputs.cpp (100%) rename firmware/hw_layer/{ => adc}/adc_inputs.h (100%) rename firmware/hw_layer/{ => adc}/adc_subscription.cpp (100%) rename firmware/hw_layer/{ => adc}/adc_subscription.h (100%) rename firmware/hw_layer/{ => adc}/mcp3208.c (100%) rename firmware/hw_layer/{ => adc}/mcp3208.h (100%) rename firmware/hw_layer/{ => digital_input}/digital_input.cpp (100%) rename firmware/hw_layer/{ => digital_input}/digital_input.h (100%) rename firmware/hw_layer/{ => digital_input}/digital_input_exti.cpp (100%) rename firmware/hw_layer/{ => digital_input}/digital_input_exti.h (100%) rename firmware/hw_layer/{ => digital_input}/digital_input_icu.cpp (100%) rename firmware/hw_layer/{ => digital_input}/digital_input_icu.h (100%) rename firmware/hw_layer/{ => digital_input/trigger}/trigger_input.cpp (100%) rename firmware/hw_layer/{ => digital_input/trigger}/trigger_input.h (100%) rename firmware/hw_layer/{ => digital_input/trigger}/trigger_input_comp.cpp (100%) rename firmware/hw_layer/{ => digital_input/trigger}/trigger_input_exti.cpp (100%) rename firmware/hw_layer/{ => digital_input/trigger}/trigger_input_icu.cpp (100%) rename firmware/hw_layer/{ => sensors}/hip9011.cpp (100%) rename firmware/hw_layer/{ => sensors}/hip9011.h (100%) rename firmware/hw_layer/{ => sensors}/hip9011_logic.cpp (100%) rename firmware/hw_layer/{ => sensors}/hip9011_logic.h (100%) diff --git a/firmware/Makefile b/firmware/Makefile index f0d7e97c6a..0ccdc594e2 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -296,8 +296,8 @@ INCDIR = $(CHIBIOS)/os/license \ ext_algo \ console_util \ $(CONSOLE_INC) \ - $(PROJECT_DIR)/hw_layer \ - $(PROJECT_DIR)/mass_storage \ + $(HW_LAYER_INC) \ + $(PROJECT_DIR)/hw_layer/mass_storage \ $(PROJECT_DIR)/hw_layer/serial_over_usb \ $(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/lcd \ diff --git a/firmware/hw_layer/AdcConfiguration.h b/firmware/hw_layer/adc/AdcConfiguration.h similarity index 100% rename from firmware/hw_layer/AdcConfiguration.h rename to firmware/hw_layer/adc/AdcConfiguration.h diff --git a/firmware/hw_layer/adc_external.h b/firmware/hw_layer/adc/adc_external.h similarity index 100% rename from firmware/hw_layer/adc_external.h rename to firmware/hw_layer/adc/adc_external.h diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp similarity index 100% rename from firmware/hw_layer/adc_inputs.cpp rename to firmware/hw_layer/adc/adc_inputs.cpp diff --git a/firmware/hw_layer/adc_inputs.h b/firmware/hw_layer/adc/adc_inputs.h similarity index 100% rename from firmware/hw_layer/adc_inputs.h rename to firmware/hw_layer/adc/adc_inputs.h diff --git a/firmware/hw_layer/adc_subscription.cpp b/firmware/hw_layer/adc/adc_subscription.cpp similarity index 100% rename from firmware/hw_layer/adc_subscription.cpp rename to firmware/hw_layer/adc/adc_subscription.cpp diff --git a/firmware/hw_layer/adc_subscription.h b/firmware/hw_layer/adc/adc_subscription.h similarity index 100% rename from firmware/hw_layer/adc_subscription.h rename to firmware/hw_layer/adc/adc_subscription.h diff --git a/firmware/hw_layer/mcp3208.c b/firmware/hw_layer/adc/mcp3208.c similarity index 100% rename from firmware/hw_layer/mcp3208.c rename to firmware/hw_layer/adc/mcp3208.c diff --git a/firmware/hw_layer/mcp3208.h b/firmware/hw_layer/adc/mcp3208.h similarity index 100% rename from firmware/hw_layer/mcp3208.h rename to firmware/hw_layer/adc/mcp3208.h diff --git a/firmware/hw_layer/digital_input.cpp b/firmware/hw_layer/digital_input/digital_input.cpp similarity index 100% rename from firmware/hw_layer/digital_input.cpp rename to firmware/hw_layer/digital_input/digital_input.cpp diff --git a/firmware/hw_layer/digital_input.h b/firmware/hw_layer/digital_input/digital_input.h similarity index 100% rename from firmware/hw_layer/digital_input.h rename to firmware/hw_layer/digital_input/digital_input.h diff --git a/firmware/hw_layer/digital_input_exti.cpp b/firmware/hw_layer/digital_input/digital_input_exti.cpp similarity index 100% rename from firmware/hw_layer/digital_input_exti.cpp rename to firmware/hw_layer/digital_input/digital_input_exti.cpp diff --git a/firmware/hw_layer/digital_input_exti.h b/firmware/hw_layer/digital_input/digital_input_exti.h similarity index 100% rename from firmware/hw_layer/digital_input_exti.h rename to firmware/hw_layer/digital_input/digital_input_exti.h diff --git a/firmware/hw_layer/digital_input_icu.cpp b/firmware/hw_layer/digital_input/digital_input_icu.cpp similarity index 100% rename from firmware/hw_layer/digital_input_icu.cpp rename to firmware/hw_layer/digital_input/digital_input_icu.cpp diff --git a/firmware/hw_layer/digital_input_icu.h b/firmware/hw_layer/digital_input/digital_input_icu.h similarity index 100% rename from firmware/hw_layer/digital_input_icu.h rename to firmware/hw_layer/digital_input/digital_input_icu.h diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input.cpp similarity index 100% rename from firmware/hw_layer/trigger_input.cpp rename to firmware/hw_layer/digital_input/trigger/trigger_input.cpp diff --git a/firmware/hw_layer/trigger_input.h b/firmware/hw_layer/digital_input/trigger/trigger_input.h similarity index 100% rename from firmware/hw_layer/trigger_input.h rename to firmware/hw_layer/digital_input/trigger/trigger_input.h diff --git a/firmware/hw_layer/trigger_input_comp.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_comp.cpp similarity index 100% rename from firmware/hw_layer/trigger_input_comp.cpp rename to firmware/hw_layer/digital_input/trigger/trigger_input_comp.cpp diff --git a/firmware/hw_layer/trigger_input_exti.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_exti.cpp similarity index 100% rename from firmware/hw_layer/trigger_input_exti.cpp rename to firmware/hw_layer/digital_input/trigger/trigger_input_exti.cpp diff --git a/firmware/hw_layer/trigger_input_icu.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_icu.cpp similarity index 100% rename from firmware/hw_layer/trigger_input_icu.cpp rename to firmware/hw_layer/digital_input/trigger/trigger_input_icu.cpp diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk index ada8b876c0..ff6317c0aa 100644 --- a/firmware/hw_layer/hw_layer.mk +++ b/firmware/hw_layer/hw_layer.mk @@ -1,6 +1,10 @@ HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/serial_over_usb/usbcfg.c \ $(PROJECT_DIR)/hw_layer/serial_over_usb/usbconsole.c +HW_LAYER_INC= $(PROJECT_DIR)/hw_layer $(PROJECT_DIR)/hw_layer/adc \ + $(PROJECT_DIR)/hw_layer/digital_input \ + $(PROJECT_DIR)/hw_layer/digital_input/trigger + HW_INC = hw_layer/$(CPU_HWLAYER) \ $(PROJECT_DIR)/hw_layer/ports @@ -8,28 +12,28 @@ HW_LAYER_EGT_CPP = \ $(PROJECT_DIR)/hw_layer/max31855.cpp HW_LAYER_EMS = $(HW_LAYER_EGT) \ - $(PROJECT_DIR)/hw_layer/mcp3208.c \ - $(PROJECT_DIR)/hw_layer/mc33816_data.c \ + $(PROJECT_DIR)/hw_layer/adc/mcp3208.c \ + $(PROJECT_DIR)/hw_layer/mc33816_data.c HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \ $(PROJECT_DIR)/hw_layer/pin_repository.cpp \ $(PROJECT_DIR)/hw_layer/microsecond_timer.cpp \ - $(PROJECT_DIR)/hw_layer/digital_input.cpp \ - $(PROJECT_DIR)/hw_layer/digital_input_icu.cpp \ - $(PROJECT_DIR)/hw_layer/digital_input_exti.cpp \ + $(PROJECT_DIR)/hw_layer/digital_input/digital_input.cpp \ + $(PROJECT_DIR)/hw_layer/digital_input/digital_input_icu.cpp \ + $(PROJECT_DIR)/hw_layer/digital_input/digital_input_exti.cpp \ + $(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input.cpp \ + $(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_icu.cpp \ + $(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_exti.cpp \ $(PROJECT_DIR)/hw_layer/hardware.cpp \ $(PROJECT_DIR)/hw_layer/smart_gpio.cpp \ $(PROJECT_DIR)/hw_layer/neo6m.cpp \ $(PROJECT_DIR)/hw_layer/mmc_card.cpp \ $(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.cpp \ - $(PROJECT_DIR)/hw_layer/adc_inputs.cpp \ - $(PROJECT_DIR)/hw_layer/adc_subscription.cpp \ - $(PROJECT_DIR)/hw_layer/trigger_input.cpp \ - $(PROJECT_DIR)/hw_layer/trigger_input_icu.cpp \ - $(PROJECT_DIR)/hw_layer/trigger_input_exti.cpp \ - $(PROJECT_DIR)/hw_layer/hip9011.cpp \ + $(PROJECT_DIR)/hw_layer/adc/adc_inputs.cpp \ + $(PROJECT_DIR)/hw_layer/adc/adc_subscription.cpp \ + $(PROJECT_DIR)/hw_layer/sensors/hip9011.cpp \ + $(PROJECT_DIR)/hw_layer/sensors/hip9011_logic.cpp \ $(PROJECT_DIR)/hw_layer/mc33816.cpp \ - $(PROJECT_DIR)/hw_layer/hip9011_logic.cpp \ $(PROJECT_DIR)/hw_layer/vehicle_speed.cpp \ $(PROJECT_DIR)/hw_layer/stepper.cpp \ $(PROJECT_DIR)/hw_layer/stepper_dual_hbridge.cpp \ @@ -37,7 +41,7 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \ $(PROJECT_DIR)/hw_layer/io_pins.cpp \ $(PROJECT_DIR)/hw_layer/rtc_helper.cpp \ $(PROJECT_DIR)/hw_layer/cdm_ion_sense.cpp \ - $(PROJECT_DIR)/hw_layer/backup_ram.cpp \ + $(PROJECT_DIR)/hw_layer/backup_ram.cpp # # '-include' is a magic kind of 'include' which would survive if file to be included is not found diff --git a/firmware/hw_layer/hip9011.cpp b/firmware/hw_layer/sensors/hip9011.cpp similarity index 100% rename from firmware/hw_layer/hip9011.cpp rename to firmware/hw_layer/sensors/hip9011.cpp diff --git a/firmware/hw_layer/hip9011.h b/firmware/hw_layer/sensors/hip9011.h similarity index 100% rename from firmware/hw_layer/hip9011.h rename to firmware/hw_layer/sensors/hip9011.h diff --git a/firmware/hw_layer/hip9011_logic.cpp b/firmware/hw_layer/sensors/hip9011_logic.cpp similarity index 100% rename from firmware/hw_layer/hip9011_logic.cpp rename to firmware/hw_layer/sensors/hip9011_logic.cpp diff --git a/firmware/hw_layer/hip9011_logic.h b/firmware/hw_layer/sensors/hip9011_logic.h similarity index 100% rename from firmware/hw_layer/hip9011_logic.h rename to firmware/hw_layer/sensors/hip9011_logic.h diff --git a/simulator/Makefile b/simulator/Makefile index 71eea1e812..6a289cc2e5 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -196,7 +196,7 @@ INCDIR = . \ $(PROJECT_DIR)/config/engines \ $(PROJECT_DIR)/ext_algo \ $(HW_LAYER_DRIVERS_INC) \ - $(PROJECT_DIR)/hw_layer \ + $(HW_LAYER_INC) $(HW_SENSORS_INC) \ $(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/drivers/can \ $(HW_SENSORS_INC) \ diff --git a/unit_tests/Makefile b/unit_tests/Makefile index c1f3596319..58f500a30f 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -179,9 +179,8 @@ INCDIR = . \ $(CONSOLE_INC) \ $(DEVELOPMENT_DIR) \ $(PROJECT_DIR)/ext_algo \ - $(PROJECT_DIR)/hw_layer \ + $(HW_LAYER_INC) \ $(PROJECT_DIR)/hw_layer/algo \ - $(PROJECT_DIR)/hw_layer/sensors/ \ $(PROJECT_DIR)/init/ \ $(HW_LAYER_DRIVERS_INC) \ test_data_structures \ From 85758dea6e955cf0535dd20f886fbe21460163d2 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 20:52:31 -0400 Subject: [PATCH 06/14] The Big Refactoring of 2019: folder structure #723 --- unit_tests/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/unit_tests/Makefile b/unit_tests/Makefile index 58f500a30f..fd0ae33993 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -178,10 +178,9 @@ INCDIR = . \ $(CONTROLLERS_INC) \ $(CONSOLE_INC) \ $(DEVELOPMENT_DIR) \ - $(PROJECT_DIR)/ext_algo \ - $(HW_LAYER_INC) \ $(PROJECT_DIR)/hw_layer/algo \ - $(PROJECT_DIR)/init/ \ + $(HW_LAYER_INC) \ + $(HW_SENSORS_INC) \ $(HW_LAYER_DRIVERS_INC) \ test_data_structures \ googletest/googlemock/include \ From 81a6a30ed5d2cb33eb591c7de6155ce7ff964025 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 20:55:27 -0400 Subject: [PATCH 07/14] The Big Refactoring of 2019: folder structure #723 --- unit_tests/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unit_tests/Makefile b/unit_tests/Makefile index fd0ae33993..5be8744c26 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -178,6 +178,8 @@ INCDIR = . \ $(CONTROLLERS_INC) \ $(CONSOLE_INC) \ $(DEVELOPMENT_DIR) \ + $(PROJECT_DIR)/ext_algo \ + $(PROJECT_DIR)/init/ \ $(PROJECT_DIR)/hw_layer/algo \ $(HW_LAYER_INC) \ $(HW_SENSORS_INC) \ From 3105eb9192e3aae10062ed416f0652a12b95b907 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 21:04:50 -0400 Subject: [PATCH 08/14] The Big Refactoring of 2019: folder structure #723 --- firmware/bootloader/src/Makefile | 3 ++- java_tools/ts_plugin_launcher/.idea/misc.xml | 26 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile index 6e5a232229..110a5e05fa 100644 --- a/firmware/bootloader/src/Makefile +++ b/firmware/bootloader/src/Makefile @@ -247,7 +247,8 @@ INCDIR = .. $(CHIBIOS)/os/license \ $(PROJECT_DIR)/console/binary_log \ $(PROJECT_DIR)/console/fl_binary \ $(PROJECT_DIR)/hw_layer \ - $(PROJECT_DIR)/mass_storage \ + $(PROJECT_DIR)/hw_layer/adc \ + $(PROJECT_DIR)/hw_layer/mass_storage \ $(PROJECT_DIR)/hw_layer/serial_over_usb \ $(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/lcd \ diff --git a/java_tools/ts_plugin_launcher/.idea/misc.xml b/java_tools/ts_plugin_launcher/.idea/misc.xml index 05483570e0..3c61ee806f 100644 --- a/java_tools/ts_plugin_launcher/.idea/misc.xml +++ b/java_tools/ts_plugin_launcher/.idea/misc.xml @@ -1,5 +1,31 @@ + + From 53ed429aed0d16c07ca758c9f46a5a1128a98420 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 3 Aug 2020 01:23:02 +0000 Subject: [PATCH 09/14] Auto-generated configs and docs --- firmware/controllers/generated/fsio_enums_generated.def | 2 +- firmware/controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- firmware/controllers/generated/fsio_strings.def | 2 +- firmware/controllers/generated/signature_all.h | 6 +++--- firmware/controllers/generated/signature_frankenso_na6.h | 6 +++--- firmware/controllers/generated/signature_kin.h | 6 +++--- firmware/controllers/generated/signature_mre_f4.h | 6 +++--- firmware/controllers/generated/signature_mre_f7.h | 6 +++--- firmware/controllers/generated/signature_prometheus_405.h | 6 +++--- firmware/controllers/generated/signature_prometheus_469.h | 6 +++--- firmware/controllers/generated/signature_proteus_f4.h | 6 +++--- firmware/controllers/generated/signature_proteus_f7.h | 6 +++--- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 9eebce4569..cdfd4f7cc4 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 Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // 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 27d156831c..21a69cdd4b 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 Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // 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 52d1ba5493..3b22c1ddd7 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 Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // 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 af38e8ebb3..8b7aac827a 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 Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index c39c8a97f2..33041e0d08 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 785059244 -#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 2578556707 +#define TS_SIGNATURE "rusEFI 2020.08.03.all.2578556707" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d425b08874..8ac7a77e2b 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 4031537487 -#define TS_SIGNATURE "rusEFI 2020.08.02.frankenso_na6.4031537487" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1194773440 +#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.1194773440" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d283db199d..9bbc51ac86 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3824537910 -#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1418689465 +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.1418689465" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1e79edf76f..725e438f83 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 1731582754 -#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f4.1731582754" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 3494867373 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.3494867373" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index b07775a7af..04f9ee8ff3 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 1731582754 -#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f7.1731582754" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 3494867373 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.3494867373" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index eb802ffe22..3e2dba5ca6 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3688355112 -#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_405.3688355112" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1823309735 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.1823309735" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6b020d27c6..ceeeea7091 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3688355112 -#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_469.3688355112" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1823309735 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.1823309735" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 71417f2a68..69604db7b9 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 2740616291 -#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f4.2740616291" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 337696492 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.337696492" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0898b058a4..aaa4ef6390 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 2740616291 -#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f7.2740616291" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 337696492 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.337696492" From e634564a8a41c3452102bd0cd4120655d67606a4 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 21:38:32 -0400 Subject: [PATCH 10/14] TS SD integration #1653 --- firmware/console/binary/tunerstudio.cpp | 2 ++ firmware/integration/rusefi_config.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 03841e0c8a..05f23131ee 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -482,6 +482,8 @@ static bool isKnownCommand(char command) { || command == TS_GET_FIRMWARE_VERSION || command == TS_PERF_TRACE_BEGIN || command == TS_PERF_TRACE_GET_BUFFER + || command == TS_SD_R_COMMAND + || command == TS_SD_W_COMMAND || command == TS_GET_CONFIG_ERROR; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 61779ff8c0..7a453ced0a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1621,7 +1621,7 @@ end_struct #define TS_COMPOSITE_DISABLE 2 // Performance tracing -#define TS_PERF_TRACE_BEGIN 'r' +#define TS_PERF_TRACE_BEGIN '_' #define TS_PERF_TRACE_GET_BUFFER 'b' // 0x50 From 633c745fedc2de35b33a4744e9a5a3568d78c1ff Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 3 Aug 2020 01:40:36 +0000 Subject: [PATCH 11/14] Auto-generated configs and docs --- firmware/controllers/generated/fsio_enums_generated.def | 2 +- firmware/controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- firmware/controllers/generated/fsio_strings.def | 2 +- firmware/controllers/generated/signature_all.h | 4 ++-- firmware/controllers/generated/signature_frankenso_na6.h | 4 ++-- firmware/controllers/generated/signature_kin.h | 4 ++-- firmware/controllers/generated/signature_mre_f4.h | 4 ++-- firmware/controllers/generated/signature_mre_f7.h | 4 ++-- firmware/controllers/generated/signature_prometheus_405.h | 4 ++-- firmware/controllers/generated/signature_prometheus_469.h | 4 ++-- firmware/controllers/generated/signature_proteus_f4.h | 4 ++-- firmware/controllers/generated/signature_proteus_f7.h | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index cdfd4f7cc4..80a0a382f5 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 Aug 03 01:22:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:40:07 UTC 2020 // 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 21a69cdd4b..40d7024db1 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 Aug 03 01:22:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:40:07 UTC 2020 // 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 3b22c1ddd7..136171af87 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 Aug 03 01:22:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:40:07 UTC 2020 // 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 8b7aac827a..4392c36bf2 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 Aug 03 01:22:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:40:07 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 33041e0d08..dbab629b17 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 2020.08.03 -#define SIGNATURE_HASH 2578556707 -#define TS_SIGNATURE "rusEFI 2020.08.03.all.2578556707" +#define SIGNATURE_HASH 568350084 +#define TS_SIGNATURE "rusEFI 2020.08.03.all.568350084" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 8ac7a77e2b..6f148cc983 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 2020.08.03 -#define SIGNATURE_HASH 1194773440 -#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.1194773440" +#define SIGNATURE_HASH 4284954983 +#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.4284954983" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 9bbc51ac86..bff3455af4 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 2020.08.03 -#define SIGNATURE_HASH 1418689465 -#define TS_SIGNATURE "rusEFI 2020.08.03.kin.1418689465" +#define SIGNATURE_HASH 3974007070 +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.3974007070" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 725e438f83..099741e644 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 2020.08.03 -#define SIGNATURE_HASH 3494867373 -#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.3494867373" +#define SIGNATURE_HASH 1746830090 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.1746830090" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 04f9ee8ff3..962e978283 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 2020.08.03 -#define SIGNATURE_HASH 3494867373 -#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.3494867373" +#define SIGNATURE_HASH 1746830090 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.1746830090" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3e2dba5ca6..e7b2666c11 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 2020.08.03 -#define SIGNATURE_HASH 1823309735 -#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.1823309735" +#define SIGNATURE_HASH 3573320960 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.3573320960" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index ceeeea7091..fe55d0f440 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 2020.08.03 -#define SIGNATURE_HASH 1823309735 -#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.1823309735" +#define SIGNATURE_HASH 3573320960 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.3573320960" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 69604db7b9..a1a4711e38 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 2020.08.03 -#define SIGNATURE_HASH 337696492 -#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.337696492" +#define SIGNATURE_HASH 2893096011 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.2893096011" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index aaa4ef6390..d4499aa624 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 2020.08.03 -#define SIGNATURE_HASH 337696492 -#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.337696492" +#define SIGNATURE_HASH 2893096011 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.2893096011" From 64d18d3b11980a3439225376b77fa65b4c8ccd9d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 22:04:58 -0400 Subject: [PATCH 12/14] TS SD integration #1653 --- firmware/integration/rusefi_config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 709efdee6d..f276a4d3cb 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1641,7 +1641,7 @@ end_struct // 0x42 burnCommand #define TS_BURN_COMMAND 'B' // 0x77 -#define TS_IO_TEST_COMMAND 'w' +#define TS_IO_TEST_COMMAND 'Z' #define TS_RESPONSE_OK 0 #define TS_RESPONSE_BURN_OK 4 From 51e1d78d08f9b58dcc3f04f6aaebd77aff74a6bb Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 3 Aug 2020 02:06:55 +0000 Subject: [PATCH 13/14] Auto-generated configs and docs --- firmware/controllers/generated/fsio_enums_generated.def | 2 +- firmware/controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- firmware/controllers/generated/fsio_strings.def | 2 +- firmware/controllers/generated/signature_all.h | 4 ++-- firmware/controllers/generated/signature_frankenso_na6.h | 4 ++-- firmware/controllers/generated/signature_kin.h | 4 ++-- firmware/controllers/generated/signature_mre_f4.h | 4 ++-- firmware/controllers/generated/signature_mre_f7.h | 4 ++-- firmware/controllers/generated/signature_prometheus_405.h | 4 ++-- firmware/controllers/generated/signature_prometheus_469.h | 4 ++-- firmware/controllers/generated/signature_proteus_f4.h | 4 ++-- firmware/controllers/generated/signature_proteus_f7.h | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 80a0a382f5..80ebaaaa37 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 Aug 03 01:40:07 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 // 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 40d7024db1..37df69d54c 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 Aug 03 01:40:07 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 // 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 136171af87..1b1721f89d 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 Aug 03 01:40:07 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 // 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 4392c36bf2..5a8744bc94 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 Aug 03 01:40:07 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index dbab629b17..47c5b61bf1 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 2020.08.03 -#define SIGNATURE_HASH 568350084 -#define TS_SIGNATURE "rusEFI 2020.08.03.all.568350084" +#define SIGNATURE_HASH 3223547782 +#define TS_SIGNATURE "rusEFI 2020.08.03.all.3223547782" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6f148cc983..60f2fc7266 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 2020.08.03 -#define SIGNATURE_HASH 4284954983 -#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.4284954983" +#define SIGNATURE_HASH 514065253 +#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.514065253" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index bff3455af4..11751cc76e 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 2020.08.03 -#define SIGNATURE_HASH 3974007070 -#define TS_SIGNATURE "rusEFI 2020.08.03.kin.3974007070" +#define SIGNATURE_HASH 220050204 +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.220050204" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 099741e644..f00175ef3e 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 2020.08.03 -#define SIGNATURE_HASH 1746830090 -#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.1746830090" +#define SIGNATURE_HASH 2313009416 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.2313009416" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 962e978283..5561b94ba6 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 2020.08.03 -#define SIGNATURE_HASH 1746830090 -#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.1746830090" +#define SIGNATURE_HASH 2313009416 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.2313009416" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e7b2666c11..0db80fd046 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 2020.08.03 -#define SIGNATURE_HASH 3573320960 -#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.3573320960" +#define SIGNATURE_HASH 893368066 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.893368066" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index fe55d0f440..f65f05cbe1 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 2020.08.03 -#define SIGNATURE_HASH 3573320960 -#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.3573320960" +#define SIGNATURE_HASH 893368066 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.893368066" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index a1a4711e38..9bdc45dec8 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 2020.08.03 -#define SIGNATURE_HASH 2893096011 -#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.2893096011" +#define SIGNATURE_HASH 1303518793 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.1303518793" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d4499aa624..2ca822fdfe 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 2020.08.03 -#define SIGNATURE_HASH 2893096011 -#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.2893096011" +#define SIGNATURE_HASH 1303518793 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.1303518793" From e4a4377780a54c4e92bd18c0fa8c44b5f6b0e3a8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 22:31:11 -0400 Subject: [PATCH 14/14] TS SD integration #1653 --- firmware/console/binary/tunerstudio.cpp | 8 +++++++ firmware/hw_layer/hw_layer.mk | 1 + firmware/hw_layer/mmc_card.h | 11 ++-------- firmware/hw_layer/mmc_card_access.cpp | 29 +++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 firmware/hw_layer/mmc_card_access.cpp diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 05f23131ee..216b39516a 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -777,6 +777,14 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin case TS_GET_FIRMWARE_VERSION: handleGetVersion(tsChannel, TS_CRC); break; +#if EFI_FILE_LOGGING + case TS_SD_R_COMMAND: + handleTsR(data); + break; + case TS_SD_W_COMMAND: + handleTsW(data); + break; +#endif //EFI_FILE_LOGGING case TS_GET_TEXT: handleGetText(tsChannel); break; diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk index ff6317c0aa..c378ebcee1 100644 --- a/firmware/hw_layer/hw_layer.mk +++ b/firmware/hw_layer/hw_layer.mk @@ -28,6 +28,7 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \ $(PROJECT_DIR)/hw_layer/smart_gpio.cpp \ $(PROJECT_DIR)/hw_layer/neo6m.cpp \ $(PROJECT_DIR)/hw_layer/mmc_card.cpp \ + $(PROJECT_DIR)/hw_layer/mmc_card_access.cpp \ $(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.cpp \ $(PROJECT_DIR)/hw_layer/adc/adc_inputs.cpp \ $(PROJECT_DIR)/hw_layer/adc/adc_subscription.cpp \ diff --git a/firmware/hw_layer/mmc_card.h b/firmware/hw_layer/mmc_card.h index d3106b675c..c2aa434db3 100644 --- a/firmware/hw_layer/mmc_card.h +++ b/firmware/hw_layer/mmc_card.h @@ -9,18 +9,11 @@ #pragma once -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - void initMmcCard(void); bool isSdCardAlive(void); void appendToLog(const char *line, size_t length); void readLogFileContent(char *buffer, short fileId, short offset, short length); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +void handleTsR(char *input); +void handleTsW(char *input); diff --git a/firmware/hw_layer/mmc_card_access.cpp b/firmware/hw_layer/mmc_card_access.cpp new file mode 100644 index 0000000000..d78a1a2c9b --- /dev/null +++ b/firmware/hw_layer/mmc_card_access.cpp @@ -0,0 +1,29 @@ +/** + * @file mmc_card_access.cpp + * + */ + +#include "global.h" + +#if EFI_FILE_LOGGING +#include "mmc_card.h" + +extern LoggingWithStorage sharedLogger; + +static char *buffer[2048]; + + +void handleTsR(char *input) { + if (input[1] == 0 && input[2] == 7) { + scheduleMsg(&sharedLogger, "TS_SD: RTC read command"); + memset(buffer, 0, 9); + } + +} + +void handleTsW(char *input) { + +} + + +#endif // EFI_FILE_LOGGING