From 0f5cb33426adb73b3afaa8615451b6434e18e2de Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 10 Mar 2022 13:35:24 -0500 Subject: [PATCH] Firmware support or user instructions for jdy-33 #3944 --- .../boards/hellen/alphax-2chan/board_configuration.cpp | 9 --------- .../boards/hellen/alphax-4chan/board_configuration.cpp | 9 --------- firmware/config/boards/hellen/cypress/board.h | 10 +++++----- firmware/config/boards/kinetis/board.h | 10 +++++----- .../config/boards/skeleton/board_configuration.cpp | 6 +++--- firmware/console/binary/bluetooth.cpp | 4 ++-- firmware/console/binary/bluetooth.h | 2 +- firmware/console/binary/tunerstudio.cpp | 8 ++++---- 8 files changed, 20 insertions(+), 38 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index 377649edab..3fa63f4625 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -121,15 +121,6 @@ void setBoardConfigOverrides() { engineConfiguration->canRxPin = GPIOD_0; } -void setSerialConfigurationOverrides() { - engineConfiguration->useSerialPort = false; - - - - -} - - /** * @brief Board-specific configuration defaults. * diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index 377649edab..3fa63f4625 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -121,15 +121,6 @@ void setBoardConfigOverrides() { engineConfiguration->canRxPin = GPIOD_0; } -void setSerialConfigurationOverrides() { - engineConfiguration->useSerialPort = false; - - - - -} - - /** * @brief Board-specific configuration defaults. * diff --git a/firmware/config/boards/hellen/cypress/board.h b/firmware/config/boards/hellen/cypress/board.h index d39a8decee..42d04db235 100644 --- a/firmware/config/boards/hellen/cypress/board.h +++ b/firmware/config/boards/hellen/cypress/board.h @@ -23,11 +23,11 @@ #ifdef __cplusplus extern "C" { #endif - void boardInit(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); + void boardInit(); + void setPinConfigurationOverrides(); + void setSerialConfigurationOverrides(); + void setSdCardConfigurationOverrides(); + void setAdcChannelOverrides(); /** * @brief Initialize board specific settings. diff --git a/firmware/config/boards/kinetis/board.h b/firmware/config/boards/kinetis/board.h index 5f6596f042..80887a4bca 100644 --- a/firmware/config/boards/kinetis/board.h +++ b/firmware/config/boards/kinetis/board.h @@ -16,11 +16,11 @@ #ifdef __cplusplus extern "C" { #endif - void boardInit(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); + void boardInit(); + void setPinConfigurationOverrides(); + void setSerialConfigurationOverrides(); + void setSdCardConfigurationOverrides(); + void setAdcChannelOverrides(); /** * @brief Initialize board specific settings. diff --git a/firmware/config/boards/skeleton/board_configuration.cpp b/firmware/config/boards/skeleton/board_configuration.cpp index 94abb5f6a6..ce1122c14a 100644 --- a/firmware/config/boards/skeleton/board_configuration.cpp +++ b/firmware/config/boards/skeleton/board_configuration.cpp @@ -20,9 +20,9 @@ * * These initialization functions are called from * firmware/controllers/algo/engine_configuration.cpp - * void setBoardDefaultConfiguration(void); - * void setPinConfigurationOverrides(void); - * void setSerialConfigurationOverrides(void); + * void setBoardDefaultConfiguration(); + * void setPinConfigurationOverrides(); + * void setSerialConfigurationOverrides(); * * Future: Clean up the distinction between these functions. */ diff --git a/firmware/console/binary/bluetooth.cpp b/firmware/console/binary/bluetooth.cpp index dc3779aadb..7f517a69a4 100644 --- a/firmware/console/binary/bluetooth.cpp +++ b/firmware/console/binary/bluetooth.cpp @@ -158,10 +158,10 @@ static THD_FUNCTION(btThreadEntryPoint, arg) { chThdExit(MSG_OK); } -void bluetoothStart(SerialTsChannelBase *btChan, bluetooth_module_e moduleType, const char *baudRate, const char *name, const char *pinCode) { +void bluetoothStart(bluetooth_module_e moduleType, const char *baudRate, const char *name, const char *pinCode) { static const char *usage = "Usage: bluetooth_hc06 "; - tsChannel = btChan; + tsChannel = getBluetoothChannel(); // if a binary protocol uses USB, we cannot init the bluetooth module! if (!engineConfiguration->useSerialPort) { diff --git a/firmware/console/binary/bluetooth.h b/firmware/console/binary/bluetooth.h index 18eabb308d..dff613c510 100644 --- a/firmware/console/binary/bluetooth.h +++ b/firmware/console/binary/bluetooth.h @@ -35,7 +35,7 @@ typedef enum { * - send AT-commands to the module; * - restore connection to PC. */ -void bluetoothStart(SerialTsChannelBase *btChannel, bluetooth_module_e moduleType, const char *baudRate, const char *name, const char *pinCode); +void bluetoothStart(bluetooth_module_e moduleType, const char *baudRate, const char *name, const char *pinCode); /** * Cancel Bluetooth procedure diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index c031790438..a75911d1b8 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -829,16 +829,16 @@ void startTunerStudioConnectivity(void) { // Example: "bluetooth_hc06 38400 rusefi 1234" // bluetooth_jdy 115200 alphax 1234 addConsoleActionSSS("bluetooth_hc05", [](const char *baudRate, const char *name, const char *pinCode) { - bluetoothStart(getBluetoothChannel(), BLUETOOTH_HC_05, baudRate, name, pinCode); + bluetoothStart(BLUETOOTH_HC_05, baudRate, name, pinCode); }); addConsoleActionSSS("bluetooth_hc06", [](const char *baudRate, const char *name, const char *pinCode) { - bluetoothStart(getBluetoothChannel(), BLUETOOTH_HC_06, baudRate, name, pinCode); + bluetoothStart(BLUETOOTH_HC_06, baudRate, name, pinCode); }); addConsoleActionSSS("bluetooth_bk", [](const char *baudRate, const char *name, const char *pinCode) { - bluetoothStart(getBluetoothChannel(), BLUETOOTH_BK3231, baudRate, name, pinCode); + bluetoothStart(BLUETOOTH_BK3231, baudRate, name, pinCode); }); addConsoleActionSSS("bluetooth_jdy", [](const char *baudRate, const char *name, const char *pinCode) { - bluetoothStart(getBluetoothChannel(), BLUETOOTH_JDY_3x, baudRate, name, pinCode); + bluetoothStart(BLUETOOTH_JDY_3x, baudRate, name, pinCode); }); addConsoleAction("bluetooth_cancel", bluetoothCancel); #endif /* EFI_BLUETOOTH_SETUP */