Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-09 07:02:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added logging, serial number and battery voltage display to radiosonde RX

Browse source 
Added decimal degrees display to geopos widget
This commit is contained in:
furrtek 2017-10-28 19:16:06 +02:00
parent d47f292d3a
commit 6ff8249a4f
7 changed files with 106 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

34
firmware/common/sonde_packet.cpp
View file

@ -21,8 +21,7 @@
*/
#include "sonde_packet.hpp"
//#include "crc.hpp"
#include "string_format.hpp"
namespace sonde {
@ -42,12 +41,8 @@ Packet::Type Packet::type() const {
return type_;
}
uint32_t Packet::visible_sats() const {
return reader_.read(30 * 8, 8);
}
uint32_t Packet::GPS_altitude() const {
return reader_.read(22 * 8, 32) / 1000;
return (reader_.read(22 * 8, 32) / 1000) - 48;
}
float Packet::GPS_latitude() const {
@ -58,6 +53,10 @@ float Packet::GPS_longitude() const {
return reader_.read(18 * 8, 32) / ((1ULL << 32) / 360.0);
}
uint32_t Packet::battery_voltage() const {
return (reader_.read(69 * 8, 8) + (reader_.read(70 * 8, 8) << 8)) * 1000 / 150;
}
std::string Packet::signature() const {
const auto header = reader_.read(0, 24);
@ -66,18 +65,25 @@ std::string Packet::signature() const {
else if (header == 0x648F20)
return "M2K2";
else
return symbols_formatted().data.substr(0, 6);
return "0x" + symbols_formatted().data.substr(0, 6);
}
SN Packet::serial_number() const {
std::string Packet::serial_number() const {
if (type() == Type::M10) {
// See https://github.com/rs1729/RS/blob/master/m10/m10x.c line 606
return (reader_.read(2 * 8, 8) << 20) |
(reader_.read(0, 4) << 16) |
(reader_.read(4 * 8, 3) << 13) |
(reader_.read(4 * 8 + 3, 5) << 8) |
reader_.read(3 * 8, 8);
// Starting at byte #93: 00000000 11111111 22222222 33333333 44444444
// CCCC AAAABBBB
// 44444444 33333333
// DDDEEEEE EEEEEEEE
return to_string_hex(reader_.read(93 * 8 + 16, 4), 1) +
to_string_dec_uint(reader_.read(93 * 8 + 20, 4), 2, '0') + " " +
to_string_hex(reader_.read(93 * 8 + 4, 4), 1) + " " +
to_string_dec_uint(reader_.read(93 * 8 + 24, 3), 1) +
to_string_dec_uint(reader_.read(93 * 8 + 27, 13), 4, '0');
}
return 0;
}