From c35f4aa2e301b5d42d99a87438aa5d7860beb228 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 25 Feb 2020 22:38:08 -0500 Subject: [PATCH] more mc33816 --- .../microrusefi/board_configuration.cpp | 2 +- .../boards/prometheus/board_configuration.cpp | 2 +- .../boards/skeleton/board_configuration.cpp | 2 +- firmware/config/engines/custom_engine.cpp | 21 +++++++++++++++++++ firmware/controllers/engine_controller.cpp | 2 +- firmware/hw_layer/mc33816.cpp | 4 ++++ hardware/Common_Rail_MC33816/known_issues.txt | 2 +- 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index 300a911dfd..620d3ceddd 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -78,7 +78,7 @@ static void setupVbatt() { static void setupTle8888() { // Enable spi3 - engineConfiguration->is_enabled_spi_3 = true; + CONFIG(is_enabled_spi_3) = true; // Wire up spi3 engineConfiguration->spi3mosiPin = GPIOB_5; diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 97d8fdb404..46a7522095 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -224,7 +224,7 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->is_enabled_spi_1 = true; engineConfiguration->is_enabled_spi_2 = false; - engineConfiguration->is_enabled_spi_3 = true; + CONFIG(is_enabled_spi_3) = true; engineConfiguration->spi1mosiPin = GPIOB_5; engineConfiguration->spi1MosiMode = PO_DEFAULT; // PAL_STM32_OTYPE_PUSHPULL diff --git a/firmware/config/boards/skeleton/board_configuration.cpp b/firmware/config/boards/skeleton/board_configuration.cpp index 641145b987..ebc6aae926 100644 --- a/firmware/config/boards/skeleton/board_configuration.cpp +++ b/firmware/config/boards/skeleton/board_configuration.cpp @@ -42,7 +42,7 @@ EXTERN_ENGINE; // This shows a SPI connected TLE8888. static void setupTle8888() { // Enable the SPI channel and set up the SPI pins - engineConfiguration->is_enabled_spi_3 = true; + CONFIG(is_enabled_spi_3) = true; engineConfiguration->spi3mosiPin = GPIOB_5; engineConfiguration->spi3misoPin = GPIOB_4; engineConfiguration->spi3sckPin = GPIOB_3; diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 66a5898906..346da06eea 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -515,12 +515,33 @@ void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { #endif /* BOARD_TLE8888_COUNT */ } +/** + * set engine_type 103 + */ void setTest33816EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + // grey + // default spi3mosiPin PB5 + // white + // default spi3misoPin PB4 + // violet + // default spi3sckPin PB3 + + + // blue CONFIG(mc33816_cs) = GPIOD_7; + // green CONFIG(mc33816_rstb) = GPIOD_5; + // yellow CONFIG(mc33816_driven) = GPIOD_6; + // enable_spi 3 + CONFIG(is_enabled_spi_3) = true; + // Wire up spi3 + engineConfiguration->spi3mosiPin = GPIOB_5; + engineConfiguration->spi3misoPin = GPIOB_4; + engineConfiguration->spi3sckPin = GPIOB_3; + CONFIG(isSdCardEnabled) = false; CONFIG(mc33816spiDevice) = SPI_DEVICE_3; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 9becb4ec95..b67742df20 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -843,6 +843,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 201200222; + return 201200225; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/hw_layer/mc33816.cpp b/firmware/hw_layer/mc33816.cpp index f3034604d5..ba55c7c788 100644 --- a/firmware/hw_layer/mc33816.cpp +++ b/firmware/hw_layer/mc33816.cpp @@ -265,6 +265,10 @@ static void download_register(int r_target) { void initMc33816(Logging *sharedLogger) { logger = sharedLogger; + + // + // see setTest33816EngineConfiguration + // // default spi3mosiPin PB5 // default spi3misoPin PB4 // default spi3sckPin PB3 diff --git a/hardware/Common_Rail_MC33816/known_issues.txt b/hardware/Common_Rail_MC33816/known_issues.txt index 681eb9a89d..fa1ace0b5d 100644 --- a/hardware/Common_Rail_MC33816/known_issues.txt +++ b/hardware/Common_Rail_MC33816/known_issues.txt @@ -7,5 +7,5 @@ 7) RESOLVED IN R0.3 Moved several 0805 components to the back side of the PCB for lower cost assembly. 8) J15 needs silk and larger hole. J20 needs silk and should use same larger terminal as J8-J9-J10 9) J15 & J20 silk ^^^ should be on both top and bottom sides of the board -10) +10) power LED. back side is pretty much free pre-assembled, front side is manual assembly. maybe one LED on each side? 11) \ No newline at end of file