pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-02 11:55:56 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ws85 updates : set want_ack, high_priority, add temperature. (#5052)

Browse Source 
* ws85 updates

add temperature
add wantack
add high_priority

set lull to 0 if never set.

add the has_FIELD_NAME lines to ws85

* pbufs sync

* high insteaed of max reliability

* only set want_ack and high reliable if sensor_role set

* protobufs

---------

Co-authored-by: Tom Fifield <tom@tomfifield.net>
This commit is contained in:
Tavis 2024-10-15 10:09:18 +00:00 committed by GitHub
parent af0db8a29f
commit 696bcc60af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit e22381a3c6bbdd428f127ed8c0aa0a37789c3907 Subproject commit 49ebc4783275f108a9f8723ca52a6edf0a954c55

41
src/modules/SerialModule.cpp
View File

@ -252,7 +252,12 @@ void SerialModule::sendTelemetry(meshtastic_Telemetry m)
pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &meshtastic_Telemetry_msg, &m); pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &meshtastic_Telemetry_msg, &m);
p->to = NODENUM_BROADCAST; p->to = NODENUM_BROADCAST;
p->decoded.want_response = false; p->decoded.want_response = false;
if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR) {
p->want_ack = true;
p->priority = meshtastic_MeshPacket_Priority_HIGH;
} else {
p->priority = meshtastic_MeshPacket_Priority_RELIABLE; p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
}
service->sendToMesh(p, RX_SRC_LOCAL, true); service->sendToMesh(p, RX_SRC_LOCAL, true);
} }
@ -424,8 +429,10 @@ void SerialModule::processWXSerial()
static char windGust[5] = "xx.x"; // Assuming windGust is 4 characters long + null terminator static char windGust[5] = "xx.x"; // Assuming windGust is 4 characters long + null terminator
static char batVoltage[5] = "0.0V"; static char batVoltage[5] = "0.0V";
static char capVoltage[5] = "0.0V"; static char capVoltage[5] = "0.0V";
static char temperature[5] = "00.0";
static float batVoltageF = 0; static float batVoltageF = 0;
static float capVoltageF = 0; static float capVoltageF = 0;
static float temperatureF = 0;
bool gotwind = false; bool gotwind = false;
while (Serial2.available()) { while (Serial2.available()) {
@ -499,6 +506,13 @@ void SerialModule::processWXSerial()
strcpy(capVoltage, capVoltagePos + 17); // 18 for ws 80, 17 for ws85 strcpy(capVoltage, capVoltagePos + 17); // 18 for ws 80, 17 for ws85
capVoltageF = strtof(capVoltage, nullptr); capVoltageF = strtof(capVoltage, nullptr);
} }
// GXTS04Temp = 24.4
} else if (strstr(line, "GXTS04Temp") != NULL) { // we have a temperature line
char *tempPos = strstr(line, "GXTS04Temp = ");
if (tempPos != NULL) {
strcpy(temperature, tempPos + 15); // 15 spaces for ws85
temperatureF = strtof(temperature, nullptr);
}
} }
// Update lineStart for the next line // Update lineStart for the next line
@ -514,8 +528,8 @@ void SerialModule::processWXSerial()
} }
if (gotwind) { if (gotwind) {
LOG_INFO("WS85 : %i %.1fg%.1f %.1fv %.1fv", atoi(windDir), strtof(windVel, nullptr), strtof(windGust, nullptr), LOG_INFO("WS85 : %i %.1fg%.1f %.1fv %.1fv %.1fC", atoi(windDir), strtof(windVel, nullptr), strtof(windGust, nullptr),
batVoltageF, capVoltageF); batVoltageF, capVoltageF, temperatureF);
} }
if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) { if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
// calulate averages and send to the mesh // calulate averages and send to the mesh
@ -535,17 +549,32 @@ void SerialModule::processWXSerial()
// make a telemetry packet with the data // make a telemetry packet with the data
meshtastic_Telemetry m = meshtastic_Telemetry_init_zero; meshtastic_Telemetry m = meshtastic_Telemetry_init_zero;
m.which_variant = meshtastic_Telemetry_environment_metrics_tag; m.which_variant = meshtastic_Telemetry_environment_metrics_tag;
m.variant.environment_metrics.wind_speed = velAvg; m.variant.environment_metrics.wind_speed = velAvg;
m.variant.environment_metrics.has_wind_speed = true;
m.variant.environment_metrics.wind_direction = dirAvg; m.variant.environment_metrics.wind_direction = dirAvg;
m.variant.environment_metrics.wind_gust = gust; m.variant.environment_metrics.has_wind_direction = true;
m.variant.environment_metrics.wind_lull = lull;
m.variant.environment_metrics.temperature = temperatureF;
m.variant.environment_metrics.has_temperature = true;
m.variant.environment_metrics.voltage = m.variant.environment_metrics.voltage =
capVoltageF > batVoltageF ? capVoltageF : batVoltageF; // send the larger of the two voltage values. capVoltageF > batVoltageF ? capVoltageF : batVoltageF; // send the larger of the two voltage values.
m.variant.environment_metrics.has_voltage = true;
LOG_INFO("WS85 Transmit speed=%fm/s, direction=%d , lull=%f, gust=%f, voltage=%f", m.variant.environment_metrics.wind_gust = gust;
m.variant.environment_metrics.has_wind_gust = true;
if (lull == -1)
lull = 0;
m.variant.environment_metrics.wind_lull = lull;
m.variant.environment_metrics.has_wind_lull = true;
LOG_INFO("WS85 Transmit speed=%fm/s, direction=%d , lull=%f, gust=%f, voltage=%f temperature=%f",
m.variant.environment_metrics.wind_speed, m.variant.environment_metrics.wind_direction, m.variant.environment_metrics.wind_speed, m.variant.environment_metrics.wind_direction,
m.variant.environment_metrics.wind_lull, m.variant.environment_metrics.wind_gust, m.variant.environment_metrics.wind_lull, m.variant.environment_metrics.wind_gust,
m.variant.environment_metrics.voltage); m.variant.environment_metrics.voltage, m.variant.environment_metrics.temperature);
sendTelemetry(m); sendTelemetry(m);