pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-29 19:03:52 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into ESPIDF-Rollup

Browse Source
This commit is contained in:
Sacha Weatherstone 2022-09-11 10:45:27 +10:00 committed by GitHub
commit c446a0f222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit f3c4aff7a9f164b10680b8504f0036b4ed84404e Subproject commit 3d4c8278311045f4781af7063e9159b3724761d3

2
src/main.cpp
View File

@ -87,7 +87,7 @@ uint32_t serialSinceMsec;
bool pmu_found; bool pmu_found;
// Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan // Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
uint8_t nodeTelemetrySensorsMap[7] = { 0, 0, 0, 0, 0, 0, 0 }; uint8_t nodeTelemetrySensorsMap[TelemetrySensorType_LPS22+1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
Router *router = NULL; // Users of router don't care what sort of subclass implements that API Router *router = NULL; // Users of router don't care what sort of subclass implements that API

2
src/main.h
View File

@ -19,7 +19,7 @@ extern bool pmu_found;
extern bool isCharging; extern bool isCharging;
extern bool isUSBPowered; extern bool isUSBPowered;
extern uint8_t nodeTelemetrySensorsMap[7]; extern uint8_t nodeTelemetrySensorsMap[TelemetrySensorType_LPS22+1];
// Global Screen singleton. // Global Screen singleton.
extern graphics::Screen *screen; extern graphics::Screen *screen;

10
src/mesh/generated/telemetry.pb.h
View File

@ -25,7 +25,11 @@ typedef enum _TelemetrySensorType {
/* Moderate accuracy current and voltage */ /* Moderate accuracy current and voltage */
TelemetrySensorType_INA219 = 5, TelemetrySensorType_INA219 = 5,
/* High accuracy temperature and pressure */ /* High accuracy temperature and pressure */
TelemetrySensorType_BMP280 = 6 TelemetrySensorType_BMP280 = 6,
/* High accuracy temperature and humidity */
TelemetrySensorType_SHTC3 = 7,
/* High accuracy pressure */
TelemetrySensorType_LPS22 = 8
} TelemetrySensorType; } TelemetrySensorType;
/* Struct definitions */ /* Struct definitions */
@ -77,8 +81,8 @@ typedef struct _Telemetry {
/* Helper constants for enums */ /* Helper constants for enums */
#define _TelemetrySensorType_MIN TelemetrySensorType_SENSOR_UNSET #define _TelemetrySensorType_MIN TelemetrySensorType_SENSOR_UNSET
#define _TelemetrySensorType_MAX TelemetrySensorType_BMP280 #define _TelemetrySensorType_MAX TelemetrySensorType_LPS22
#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_BMP280+1)) #define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_LPS22+1))
#ifdef __cplusplus #ifdef __cplusplus