pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-03 12:20:43 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.7-MiscFixes-Week1

Browse Source
This commit is contained in:
Jason P 2025-06-25 13:56:14 -05:00 committed by GitHub
commit f046c1a68a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit 6791138f0ba2b7c471072bd4bba6cbb8bacffe2d
Subproject commit 386fa53c1596c8dfc547521f08df107f4cb3a275

12
src/RedirectablePrint.cpp
View File

@ -352,8 +352,8 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
for (uint16_t i = 0; i < len; i += 16) {
if (i % 128 == 0)
log(logLevel, " +------------------------------------------------+ +----------------+");
char s[] = "| | | |\n";
uint8_t ix = 1, iy = 52;
char s[] = " | | | |\n";
uint8_t ix = 5, iy = 56;
for (uint8_t j = 0; j < 16; j++) {
if (i + j < len) {
uint8_t c = buf[i + j];
@ -367,10 +367,8 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
}
}
uint8_t index = i / 16;
if (i < 256)
log(logLevel, " ");
log(logLevel, "%02x", index);
log(logLevel, ".");
sprintf(s, "%03x", index);
s[3] = '.';
log(logLevel, s);
}
log(logLevel, " +------------------------------------------------+ +----------------+");
@ -393,4 +391,4 @@ std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
break;
}
return std::string(formatted.get());
}
}

66
src/mesh/generated/meshtastic/telemetry.pb.h
View File

@ -91,7 +91,9 @@ typedef enum _meshtastic_TelemetrySensorType {
/* MAX17261 lipo battery gauge */
meshtastic_TelemetrySensorType_MAX17261 = 38,
/* PCT2075 Temperature Sensor */
meshtastic_TelemetrySensorType_PCT2075 = 39
meshtastic_TelemetrySensorType_PCT2075 = 39,
/* ADS1X15 ADC */
meshtastic_TelemetrySensorType_ADS1X15 = 40
} meshtastic_TelemetrySensorType;
/* Struct definitions */
@ -206,6 +208,36 @@ typedef struct _meshtastic_PowerMetrics {
/* Current (Ch3) */
bool has_ch3_current;
float ch3_current;
/* Voltage (Ch4) */
bool has_ch4_voltage;
float ch4_voltage;
/* Current (Ch4) */
bool has_ch4_current;
float ch4_current;
/* Voltage (Ch5) */
bool has_ch5_voltage;
float ch5_voltage;
/* Current (Ch5) */
bool has_ch5_current;
float ch5_current;
/* Voltage (Ch6) */
bool has_ch6_voltage;
float ch6_voltage;
/* Current (Ch6) */
bool has_ch6_current;
float ch6_current;
/* Voltage (Ch7) */
bool has_ch7_voltage;
float ch7_voltage;
/* Current (Ch7) */
bool has_ch7_current;
float ch7_current;
/* Voltage (Ch8) */
bool has_ch8_voltage;
float ch8_voltage;
/* Current (Ch8) */
bool has_ch8_current;
float ch8_current;
} meshtastic_PowerMetrics;
/* Air quality metrics */
@ -360,8 +392,8 @@ extern "C" {
/* Helper constants for enums */
#define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_PCT2075
#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_PCT2075+1))
#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_ADS1X15
#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_ADS1X15+1))
@ -376,7 +408,7 @@ extern "C" {
/* Initializer values for message structs */
#define meshtastic_DeviceMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_PowerMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_PowerMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_LocalStats_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#define meshtastic_HealthMetrics_init_default {false, 0, false, 0, false, 0}
@ -385,7 +417,7 @@ extern "C" {
#define meshtastic_Nau7802Config_init_default {0, 0}
#define meshtastic_DeviceMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_EnvironmentMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_PowerMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_PowerMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_AirQualityMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
#define meshtastic_LocalStats_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#define meshtastic_HealthMetrics_init_zero {false, 0, false, 0, false, 0}
@ -427,6 +459,16 @@ extern "C" {
#define meshtastic_PowerMetrics_ch2_current_tag 4
#define meshtastic_PowerMetrics_ch3_voltage_tag 5
#define meshtastic_PowerMetrics_ch3_current_tag 6
#define meshtastic_PowerMetrics_ch4_voltage_tag 7
#define meshtastic_PowerMetrics_ch4_current_tag 8
#define meshtastic_PowerMetrics_ch5_voltage_tag 9
#define meshtastic_PowerMetrics_ch5_current_tag 10
#define meshtastic_PowerMetrics_ch6_voltage_tag 11
#define meshtastic_PowerMetrics_ch6_current_tag 12
#define meshtastic_PowerMetrics_ch7_voltage_tag 13
#define meshtastic_PowerMetrics_ch7_current_tag 14
#define meshtastic_PowerMetrics_ch8_voltage_tag 15
#define meshtastic_PowerMetrics_ch8_current_tag 16
#define meshtastic_AirQualityMetrics_pm10_standard_tag 1
#define meshtastic_AirQualityMetrics_pm25_standard_tag 2
#define meshtastic_AirQualityMetrics_pm100_standard_tag 3
@ -518,7 +560,17 @@ X(a, STATIC, OPTIONAL, FLOAT, ch1_current, 2) \
X(a, STATIC, OPTIONAL, FLOAT, ch2_voltage, 3) \
X(a, STATIC, OPTIONAL, FLOAT, ch2_current, 4) \
X(a, STATIC, OPTIONAL, FLOAT, ch3_voltage, 5) \
X(a, STATIC, OPTIONAL, FLOAT, ch3_current, 6)
X(a, STATIC, OPTIONAL, FLOAT, ch3_current, 6) \
X(a, STATIC, OPTIONAL, FLOAT, ch4_voltage, 7) \
X(a, STATIC, OPTIONAL, FLOAT, ch4_current, 8) \
X(a, STATIC, OPTIONAL, FLOAT, ch5_voltage, 9) \
X(a, STATIC, OPTIONAL, FLOAT, ch5_current, 10) \
X(a, STATIC, OPTIONAL, FLOAT, ch6_voltage, 11) \
X(a, STATIC, OPTIONAL, FLOAT, ch6_current, 12) \
X(a, STATIC, OPTIONAL, FLOAT, ch7_voltage, 13) \
X(a, STATIC, OPTIONAL, FLOAT, ch7_current, 14) \
X(a, STATIC, OPTIONAL, FLOAT, ch8_voltage, 15) \
X(a, STATIC, OPTIONAL, FLOAT, ch8_current, 16)
#define meshtastic_PowerMetrics_CALLBACK NULL
#define meshtastic_PowerMetrics_DEFAULT NULL
@ -631,7 +683,7 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
#define meshtastic_HostMetrics_size 264
#define meshtastic_LocalStats_size 72
#define meshtastic_Nau7802Config_size 16
#define meshtastic_PowerMetrics_size 30
#define meshtastic_PowerMetrics_size 81
#define meshtastic_Telemetry_size 272
#ifdef __cplusplus