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

Upstream protos for resolving conflicts

Browse Source
This commit is contained in:
Ben Meadors 2022-11-13 14:45:26 -06:00
parent 9b5f358823
commit c3c899bc85
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit 3a7a4fa3cbd678b814964c0b4fc3af87ade7ec2e Subproject commit da9bba9c5dd43a98d431cb7a95159b145f0483c4

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

@ -33,7 +33,9 @@ typedef enum _TelemetrySensorType {
/* 3-Axis magnetic sensor */ /* 3-Axis magnetic sensor */
TelemetrySensorType_QMC6310 = 9, TelemetrySensorType_QMC6310 = 9,
/* 6-Axis inertial measurement sensor */ /* 6-Axis inertial measurement sensor */
TelemetrySensorType_QMI8658 = 10 TelemetrySensorType_QMI8658 = 10,
/* 3-Axis magnetic sensor */
TelemetrySensorType_QMC5883L = 11
} TelemetrySensorType; } TelemetrySensorType;
/* Struct definitions */ /* Struct definitions */
@ -85,8 +87,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_QMI8658 #define _TelemetrySensorType_MAX TelemetrySensorType_QMC5883L
#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_QMI8658+1)) #define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_QMC5883L+1))
#ifdef __cplusplus #ifdef __cplusplus