rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Configs cleanups (#164) 

* f1_dual, f1_rev3: use Serial for TS not for debug

* f1_dual: config cleanup

* EGT_CHANNELS is better option for optional compilation of max driver

* max31855: supress warning
This commit is contained in:
Andrey G 2022-10-06 21:24:11 +03:00 committed by GitHub
parent 516747b629
commit d69505171a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/boards/f1_dual/wideband_board_config.h
View File

@ -7,9 +7,6 @@
#define AFR_CHANNELS 2 #define AFR_CHANNELS 2
#define EGT_CHANNELS 2 #define EGT_CHANNELS 2
// UART used for debug
#define UART_DEBUG
// Fundamental board constants // Fundamental board constants
#define VCC_VOLTS (3.3f) #define VCC_VOLTS (3.3f)
#define HALF_VCC (VCC_VOLTS / 2) #define HALF_VCC (VCC_VOLTS / 2)
@ -61,8 +58,6 @@
// ******************************* // *******************************
// TunerStudio Primary Port // TunerStudio Primary Port
// ******************************* // *******************************
//#define TS_PRIMARY_UART_PORT UARTD1
//#define TS_PRIMARY_BAUDRATE 38400
#define TS_PRIMARY_SERIAL_PORT SD1 #define TS_PRIMARY_SERIAL_PORT SD1
#define TS_PRIMARY_BAUDRATE 115200 #define TS_PRIMARY_BAUDRATE 115200

7
firmware/boards/f1_rev3/wideband_board_config.h
View File

@ -48,8 +48,5 @@
// ******************************* // *******************************
// TunerStudio Primary Port // TunerStudio Primary Port
// ******************************* // *******************************
//#define TS_PRIMARY_SERIAL_PORT SD1 #define TS_PRIMARY_SERIAL_PORT SD1
//#define TS_PRIMARY_BAUDRATE 115200 #define TS_PRIMARY_BAUDRATE 115200
// UART used for debug
#define UART_DEBUG

6
firmware/max31855.cpp
View File

@ -7,7 +7,7 @@
#include "max31855.h" #include "max31855.h"
#if HAL_USE_SPI #if (EGT_CHANNELS > 0)
static SPIConfig spi_config[2] = static SPIConfig spi_config[2] =
{ {
@ -153,9 +153,9 @@ const struct livedata_egt_s * getEgtLiveDataStructAddr(const int ch)
#else #else
const struct livedata_egt_s * getEgtLiveDataStructAddr(const int ch) const struct livedata_egt_s * getEgtLiveDataStructAddr(const int)
{ {
return NULL; return NULL;
} }
#endif /* HAL_USE_SPI */ #endif /* EGT_CHANNELS > 0 */

4
firmware/max31855.h
View File

@ -28,7 +28,7 @@ struct livedata_egt_s {
// for all board. in case of no EGT - returns NULL // for all board. in case of no EGT - returns NULL
const struct livedata_egt_s * getEgtLiveDataStructAddr(const int ch); const struct livedata_egt_s * getEgtLiveDataStructAddr(const int ch);
#if HAL_USE_SPI #if (EGT_CHANNELS > 0)
#define MAX31855_THREAD_STACK (512) #define MAX31855_THREAD_STACK (512)
#define MAX31855_THREAD_PRIO (NORMALPRIO + 1) #define MAX31855_THREAD_PRIO (NORMALPRIO + 1)
@ -64,4 +64,4 @@ private:
void StartEgt(); void StartEgt();
Max31855* getEgtDrivers(); Max31855* getEgtDrivers();
#endif // HAL_USE_SPI #endif // (EGT_CHANNELS > 0)

4
firmware/uart.cpp
View File

@ -57,7 +57,7 @@ static void UartThread(void*)
chnWrite(&SD1, (const uint8_t *)printBuffer, writeCount); chnWrite(&SD1, (const uint8_t *)printBuffer, writeCount);
} }
#if HAL_USE_SPI #if (EGT_CHANNELS > 0)
for (ch = 0; ch < EGT_CHANNELS; ch++) { for (ch = 0; ch < EGT_CHANNELS; ch++) {
size_t writeCount = chsnprintf(printBuffer, 200, size_t writeCount = chsnprintf(printBuffer, 200,
"EGT[%d]: %d C (int %d C)\r\n", "EGT[%d]: %d C (int %d C)\r\n",
@ -65,7 +65,7 @@ static void UartThread(void*)
(int)getEgtDrivers()[ch].coldJunctionTemperature); (int)getEgtDrivers()[ch].coldJunctionTemperature);
chnWrite(&SD1, (const uint8_t *)printBuffer, writeCount); chnWrite(&SD1, (const uint8_t *)printBuffer, writeCount);
} }
#endif /* HAL_USE_SPI */ #endif /* EGT_CHANNELS > 0 */
chThdSleepMilliseconds(100); chThdSleepMilliseconds(100);
} }