diff --git a/src/detect/i2cScan.h b/src/detect/i2cScan.h index 77d1fff17..482a24a57 100644 --- a/src/detect/i2cScan.h +++ b/src/detect/i2cScan.h @@ -195,6 +195,10 @@ void scanI2Cdevice() LOG_INFO("SHT31 sensor found\n"); nodeTelemetrySensorsMap[TelemetrySensorType_SHT31] = addr; } + if (addr == SHT31_ADDR) { + DEBUG_MSG("SHT31 sensor found\n"); + nodeTelemetrySensorsMap[TelemetrySensorType_SHT31] = addr; + } if (addr == SHTC3_ADDR) { LOG_INFO("SHTC3 sensor found\n"); nodeTelemetrySensorsMap[TelemetrySensorType_SHTC3] = addr; diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 53ca75a51..cfa30a21b 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -545,6 +545,23 @@ static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const G #endif } +//Draw status when gps is disabled by PMU +static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps) +{ +#ifdef HAS_PMU + String displayLine = "GPS disabled"; + int16_t xPos = display->getStringWidth(displayLine); + + if (!config.position.gps_enabled){ + display->drawString(x + xPos, y, displayLine); +#ifdef GPS_POWER_TOGGLE + display->drawString(x + xPos, y - 2 + FONT_HEIGHT_SMALL, " by button"); +#endif + //display->drawString(x + xPos, y + 2, displayLine); + } +#endif +} + static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps) { String displayLine = ""; diff --git a/src/mesh/generated/module_config.pb.h b/src/mesh/generated/module_config.pb.h index da13ac706..52b551590 100644 --- a/src/mesh/generated/module_config.pb.h +++ b/src/mesh/generated/module_config.pb.h @@ -301,7 +301,6 @@ extern "C" { - #define ModuleConfig_AudioConfig_bitrate_ENUMTYPE ModuleConfig_AudioConfig_Audio_Baud #define ModuleConfig_SerialConfig_baud_ENUMTYPE ModuleConfig_SerialConfig_Serial_Baud