mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-29 07:59:47 +00:00
Add this back in
This commit is contained in:
parent
25a19b49ad
commit
834c3c5cc2
@ -45,7 +45,7 @@
|
||||
|
||||
|
||||
*/
|
||||
#ifdef HELTEC_MESH_SOLAR
|
||||
#ifdef HELTEC_MESH_SOLAR
|
||||
#include "meshSolarApp.h"
|
||||
#endif
|
||||
|
||||
@ -63,9 +63,8 @@
|
||||
SerialModule *serialModule;
|
||||
SerialModuleRadio *serialModuleRadio;
|
||||
|
||||
|
||||
#if defined(TTGO_T_ECHO) || defined(CANARYONE) || defined(MESHLINK) || defined(ELECROW_ThinkNode_M1) || \
|
||||
defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR)
|
||||
defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE)
|
||||
SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial") {}
|
||||
static Print *serialPrint = &Serial;
|
||||
#elif defined(CONFIG_IDF_TARGET_ESP32C6)
|
||||
@ -83,7 +82,7 @@ bool SerialModule::isValidConfig(const meshtastic_ModuleConfig_SerialConfig &con
|
||||
{
|
||||
if (config.override_console_serial_port && !IS_ONE_OF(config.mode, meshtastic_ModuleConfig_SerialConfig_Serial_Mode_NMEA,
|
||||
meshtastic_ModuleConfig_SerialConfig_Serial_Mode_CALTOPO,
|
||||
meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MS_CONFIG)) {
|
||||
meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MS_CONFIG)) {
|
||||
const char *warning =
|
||||
"Invalid Serial config: override console serial port is only supported in NMEA and CalTopo output-only modes.";
|
||||
LOG_ERROR(warning);
|
||||
@ -249,11 +248,11 @@ int32_t SerialModule::runOnce()
|
||||
}
|
||||
#if defined(HELTEC_MESH_SOLAR)
|
||||
else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MS_CONFIG)) {
|
||||
serialPayloadSize = Serial.readBytes(serialBytes, sizeof(serialBytes)-1);
|
||||
//If the parsing fails, the following parsing will be performed.
|
||||
if((serialPayloadSize > 0) && (meshSolarCmdHandle(serialBytes)!=0)) {
|
||||
return runOncePart(serialBytes,serialPayloadSize);
|
||||
}
|
||||
serialPayloadSize = Serial.readBytes(serialBytes, sizeof(serialBytes) - 1);
|
||||
// If the parsing fails, the following parsing will be performed.
|
||||
if ((serialPayloadSize > 0) && (meshSolarCmdHandle(serialBytes) != 0)) {
|
||||
return runOncePart(serialBytes, serialPayloadSize);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
|
Loading…
Reference in New Issue
Block a user