Firmware support or user instructions for jdy-33 #3944

This commit is contained in:
rusefillc 2022-03-10 13:35:24 -05:00
parent efb64ffee8
commit 0f5cb33426
8 changed files with 20 additions and 38 deletions

View File

@ -121,15 +121,6 @@ void setBoardConfigOverrides() {
engineConfiguration->canRxPin = GPIOD_0; engineConfiguration->canRxPin = GPIOD_0;
} }
void setSerialConfigurationOverrides() {
engineConfiguration->useSerialPort = false;
}
/** /**
* @brief Board-specific configuration defaults. * @brief Board-specific configuration defaults.
* *

View File

@ -121,15 +121,6 @@ void setBoardConfigOverrides() {
engineConfiguration->canRxPin = GPIOD_0; engineConfiguration->canRxPin = GPIOD_0;
} }
void setSerialConfigurationOverrides() {
engineConfiguration->useSerialPort = false;
}
/** /**
* @brief Board-specific configuration defaults. * @brief Board-specific configuration defaults.
* *

View File

@ -23,11 +23,11 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void boardInit(void); void boardInit();
void setPinConfigurationOverrides(void); void setPinConfigurationOverrides();
void setSerialConfigurationOverrides(void); void setSerialConfigurationOverrides();
void setSdCardConfigurationOverrides(void); void setSdCardConfigurationOverrides();
void setAdcChannelOverrides(void); void setAdcChannelOverrides();
/** /**
* @brief Initialize board specific settings. * @brief Initialize board specific settings.

View File

@ -16,11 +16,11 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void boardInit(void); void boardInit();
void setPinConfigurationOverrides(void); void setPinConfigurationOverrides();
void setSerialConfigurationOverrides(void); void setSerialConfigurationOverrides();
void setSdCardConfigurationOverrides(void); void setSdCardConfigurationOverrides();
void setAdcChannelOverrides(void); void setAdcChannelOverrides();
/** /**
* @brief Initialize board specific settings. * @brief Initialize board specific settings.

View File

@ -20,9 +20,9 @@
* *
* These initialization functions are called from * These initialization functions are called from
* firmware/controllers/algo/engine_configuration.cpp * firmware/controllers/algo/engine_configuration.cpp
* void setBoardDefaultConfiguration(void); * void setBoardDefaultConfiguration();
* void setPinConfigurationOverrides(void); * void setPinConfigurationOverrides();
* void setSerialConfigurationOverrides(void); * void setSerialConfigurationOverrides();
* *
* Future: Clean up the distinction between these functions. * Future: Clean up the distinction between these functions.
*/ */

View File

@ -158,10 +158,10 @@ static THD_FUNCTION(btThreadEntryPoint, arg) {
chThdExit(MSG_OK); 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 <baud> <name> <pincode>"; static const char *usage = "Usage: bluetooth_hc06 <baud> <name> <pincode>";
tsChannel = btChan; tsChannel = getBluetoothChannel();
// if a binary protocol uses USB, we cannot init the bluetooth module! // if a binary protocol uses USB, we cannot init the bluetooth module!
if (!engineConfiguration->useSerialPort) { if (!engineConfiguration->useSerialPort) {

View File

@ -35,7 +35,7 @@ typedef enum {
* - send AT-commands to the module; * - send AT-commands to the module;
* - restore connection to PC. * - 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 * Cancel Bluetooth procedure

View File

@ -829,16 +829,16 @@ void startTunerStudioConnectivity(void) {
// Example: "bluetooth_hc06 38400 rusefi 1234" // Example: "bluetooth_hc06 38400 rusefi 1234"
// bluetooth_jdy 115200 alphax 1234 // bluetooth_jdy 115200 alphax 1234
addConsoleActionSSS("bluetooth_hc05", [](const char *baudRate, const char *name, const char *pinCode) { 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) { 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) { 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) { 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); addConsoleAction("bluetooth_cancel", bluetoothCancel);
#endif /* EFI_BLUETOOTH_SETUP */ #endif /* EFI_BLUETOOTH_SETUP */