mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2026-09-11 17:19:29 +00:00
Sonde + map (#2879)
* Update geomap view position on GPS data reception * Refactor timestamp and temperature/humidity display formatting in SondeView * Implement battery voltage reading for Meteomodem M20 * Enhance GPS data validation and update OSM zoom handling - Introduced a new method to validate GPS data in the Packet structure. - Updated the SondeView to use the new GPS validation method. - Modified GeoMap to improve handling of OSM zoom levels and ensure consistent usage of real zoom values. - Adjusted battery voltage calculation for Meteomodem M20 to ensure correct scaling. * Add serial number extraction for Meteomodem M20 support * Add support for Meteomodem M20 temperature and humidity readings * Update log file naming to include timestamp in SondeView * Add pressure reading support for Meteomodem M20 and update UI * Update SondeView UI layout and enhance Meteomodem M20 packet handling * Add vertical speed calculation and display to SondeView * Fix set_fsk function parameter type for samplesPerSymbol
This commit is contained in:
@@ -36,6 +36,16 @@ struct GPS_data {
|
||||
uint32_t alt{0};
|
||||
float lat{0};
|
||||
float lon{0};
|
||||
|
||||
bool is_valid() const {
|
||||
if (lat >= -0.01 && lat <= 0.01 && lon >= -0.01 && lon <= 0.01)
|
||||
return false;
|
||||
if (lat < -90.0 || lat > 90.0)
|
||||
return false;
|
||||
if (lon < -180.0 || lon > 180.0)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
struct temp_humid {
|
||||
@@ -68,21 +78,79 @@ class Packet {
|
||||
GPS_data get_GPS_data() const;
|
||||
uint32_t frame() const;
|
||||
temp_humid get_temp_humid() const;
|
||||
float get_pressure() const;
|
||||
|
||||
FormattedSymbols symbols_formatted() const;
|
||||
|
||||
bool crc_ok() const;
|
||||
|
||||
private:
|
||||
uint8_t getFwVerM20() const;
|
||||
static constexpr uint8_t vaisala_mask[64] = {
|
||||
0x96, 0x83, 0x3E, 0x51, 0xB1, 0x49, 0x08, 0x98,
|
||||
0x32, 0x05, 0x59, 0x0E, 0xF9, 0x44, 0xC6, 0x26,
|
||||
0x21, 0x60, 0xC2, 0xEA, 0x79, 0x5D, 0x6D, 0xA1,
|
||||
0x54, 0x69, 0x47, 0x0C, 0xDC, 0xE8, 0x5C, 0xF1,
|
||||
0xF7, 0x76, 0x82, 0x7F, 0x07, 0x99, 0xA2, 0x2C,
|
||||
0x93, 0x7C, 0x30, 0x63, 0xF5, 0x10, 0x2E, 0x61,
|
||||
0xD0, 0xBC, 0xB4, 0xB6, 0x06, 0xAA, 0xF4, 0x23,
|
||||
0x78, 0x6E, 0x3B, 0xAE, 0xBF, 0x7B, 0x4C, 0xC1};
|
||||
0x96,
|
||||
0x83,
|
||||
0x3E,
|
||||
0x51,
|
||||
0xB1,
|
||||
0x49,
|
||||
0x08,
|
||||
0x98,
|
||||
0x32,
|
||||
0x05,
|
||||
0x59,
|
||||
0x0E,
|
||||
0xF9,
|
||||
0x44,
|
||||
0xC6,
|
||||
0x26,
|
||||
0x21,
|
||||
0x60,
|
||||
0xC2,
|
||||
0xEA,
|
||||
0x79,
|
||||
0x5D,
|
||||
0x6D,
|
||||
0xA1,
|
||||
0x54,
|
||||
0x69,
|
||||
0x47,
|
||||
0x0C,
|
||||
0xDC,
|
||||
0xE8,
|
||||
0x5C,
|
||||
0xF1,
|
||||
0xF7,
|
||||
0x76,
|
||||
0x82,
|
||||
0x7F,
|
||||
0x07,
|
||||
0x99,
|
||||
0xA2,
|
||||
0x2C,
|
||||
0x93,
|
||||
0x7C,
|
||||
0x30,
|
||||
0x63,
|
||||
0xF5,
|
||||
0x10,
|
||||
0x2E,
|
||||
0x61,
|
||||
0xD0,
|
||||
0xBC,
|
||||
0xB4,
|
||||
0xB6,
|
||||
0x06,
|
||||
0xAA,
|
||||
0xF4,
|
||||
0x23,
|
||||
0x78,
|
||||
0x6E,
|
||||
0x3B,
|
||||
0xAE,
|
||||
0xBF,
|
||||
0x7B,
|
||||
0x4C,
|
||||
0xC1};
|
||||
|
||||
GPS_data ecef_to_gps() const;
|
||||
|
||||
@@ -97,6 +165,7 @@ class Packet {
|
||||
|
||||
bool crc_ok_M10() const;
|
||||
bool crc_ok_RS41() const;
|
||||
bool check_ok_M20() const;
|
||||
bool crc16rs41(uint32_t field_start) const;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user