Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-01-03 12:34:01 +01:00
2 changed files with 21 additions and 21 deletions

View File

@@ -61,15 +61,15 @@ function Decoder(fPort, bytes, variables) {
Dir_lo10 = precisionRound(bitShift(8)*1, 1);
decoded = {
"Type": Type,
"Battery": Battery,
"Wind_ave10": Wind_ave10,
"Wind_max10": Wind_max10,
"Wind_min10": Wind_min10,
"Dir_ave10": Dir_ave10,
"Dir_max10": Dir_max10,
"Dir_hi10": Dir_hi10,
"Dir_lo10": Dir_lo10,
"1_Type": Type,
"2_Battery": Battery,
"3_Wind_ave10": Wind_ave10,
"4_Wind_max10": Wind_max10,
"5_Wind_min10": Wind_min10,
"6_Dir_ave10": Dir_ave10,
"7_Dir_max10": Dir_max10,
"8_Dir_hi10": Dir_hi10,
"9_Dir_lo10": Dir_lo10,
};
return decoded;

View File

@@ -64,18 +64,18 @@ function Decoder(fPort, bytes, variables) {
Alarm_sent = precisionRound(bitShift(1)*1, 1);
decoded = {
"Index": Index,
"Battery": Battery,
"Wind_ave": Wind_ave,
"Wind_3sgust": Wind_3sgust,
"Wind_3smin": Wind_3smin,
"Wind_stdev": Wind_stdev,
"Dir_ave": Dir_ave,
"Dir_3sgust": Dir_3sgust,
"Dir_stdev": Dir_stdev,
"Gust_time": Gust_time,
"Vector_scalar": Vector_scalar,
"Alarm_sent": Alarm_sent,
"1_Index": Index,
"2_Battery": Battery,
"3_Wind_ave": Wind_ave,
"4_Wind_3sgust": Wind_3sgust,
"5_Wind_3smin": Wind_3smin,
"6_Wind_stdev": Wind_stdev,
"7_Dir_ave": Dir_ave,
"8_Dir_3sgust": Dir_3sgust,
"9_Dir_stdev": Dir_stdev,
"10_Gust_time": Gust_time,
"11_Vector_scalar": Vector_scalar,
"12_Alarm_sent": Alarm_sent,
};
return decoded;