ua1zbe
/
rdz_ttgo_sonde_dl9rdz
mirror of https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

M10: fix serial number: consistent with M20 (with dashes), consistent with autorx

This commit is contained in:
Hansi, dl9rdz 2021-06-18 00:45:27 +02:00
parent 890fef7f29
commit 68b69a2be9
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RX_FSK/version.h
View File

@ -1,4 +1,4 @@
const char *version_name = "rdzTTGOsonde"; const char *version_name = "rdzTTGOsonde";
const char *version_id = "devel20210614"; const char *version_id = "devel20210618";
const int SPIFFS_MAJOR=2; const int SPIFFS_MAJOR=2;
const int SPIFFS_MINOR=11; const int SPIFFS_MINOR=11;

2
libraries/SondeLib/Display.cpp
View File

@ -188,7 +188,7 @@ DispInfo staticLayouts[5] = {
/////////////// Wrapper code for various display /////////////// Wrapper code for various display
// ALLFONTS requires 30k extra flash memory... for now there is still enough space :) // ALLFONTS requires 30k extra flash memory... for now there is still enough space :)
#define ALLFONTS 1 //#define ALLFONTS 1
static const uint8_t *fl[] = { static const uint8_t *fl[] = {
u8x8_font_chroma48medium8_r, // 0 ** default small u8x8_font_chroma48medium8_r, // 0 ** default small
u8x8_font_7x14_1x2_f, // 1 ** default large u8x8_font_7x14_1x2_f, // 1 ** default large

19
libraries/SondeLib/M10M20.cpp
View File

@ -281,7 +281,7 @@ int M10M20::decodeframeM10(uint8_t *data) {
Serial.println("Decoding..."); Serial.println("Decoding...");
// Its a M10 // Its a M10
// getid... // getid...
char ids[11]; char ids[12];
ids[0] = 'M'; ids[0] = 'M';
ids[1] = 'E'; ids[1] = 'E';
ids[2] = hex(data[95]/16); ids[2] = hex(data[95]/16);
@ -297,14 +297,17 @@ int M10M20::decodeframeM10(uint8_t *data) {
ids[0] = hex(data[95]/16); ids[0] = hex(data[95]/16);
ids[1] = dez((data[95]&0x0f)/10); ids[1] = dez((data[95]&0x0f)/10);
ids[2] = dez((data[95]&0x0f)); ids[2] = dez((data[95]&0x0f));
ids[3] = dez(data[93]); ids[3] = '-';
ids[4] = dez(id>>13); ids[4] = dez(data[93]);
ids[5] = '-';
ids[6] = dez(id>>13);
id &= 0x1fff; id &= 0x1fff;
ids[5] = dez(id/1000); ids[7] = dez(id/1000);
ids[6] = dez((id/100)%10); ids[8] = dez((id/100)%10);
ids[7] = dez((id/10)%10); ids[9] = dez((id/10)%10);
ids[8] = dez(id%10); ids[10] = dez(id%10);
strncpy(sonde.si()->ser, ids, 10); ids[11] = 0;
strncpy(sonde.si()->ser, ids, 12);
sonde.si()->validID = true; sonde.si()->validID = true;
Serial.printf("ID is %s [%02x %02x %d]\n", ids, data[95], data[93], id); Serial.printf("ID is %s [%02x %02x %d]\n", ids, data[95], data[93], id);
// ID printed on sonde is ...-.-abbbb, with a=id>>13, bbbb=id&0x1fff in decimal // ID printed on sonde is ...-.-abbbb, with a=id>>13, bbbb=id&0x1fff in decimal