mirror
/
rdz_ttgo_sonde
kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

v0.5: merging modifications from devel branch 

- DL2MF's commits
 - WiFi connection in background

Squashed commit of the following:

commit 5c37b3f0fa
Author: Hans P. Reiser <hr@sec.uni-passau.de>
Date:   Sun Apr 28 14:17:52 2019 +0200

    version from config.h also for html page; minor polishing

commit 9fea636d20
Author: Hans P. Reiser <hr@sec.uni-passau.de>
Date:   Sun Apr 28 14:17:37 2019 +0200

    version from config.h also for html page; minor polishing

commit 75eb15cc24
Author: Hans P. Reiser <hr@sec.uni-passau.de>
Date:   Sun Apr 28 13:29:58 2019 +0200

    version info in version.h, some code formatting (arduino style)

commit 8da577a313
Author: Hans P. Reiser <hr@sec.uni-passau.de>
Date:   Sun Apr 28 13:29:53 2019 +0200

    version info in version.h, some code formatting (arduino style)

commit b68ffee8b0
Author: Mike <mail@dl2mf.de>
Date:   Sat Apr 27 20:54:20 2019 +0200

    merging DL2MF's 71cc86cff0

commit c67a4fc734
Author: DL2MF <meinhard.guenther@gmail.com>
Date:   Sat Apr 27 00:10:11 2019 +0200

    merging DL2MF's e2161c57d1

commit 6e665cb6ab
Author: DL2MF <meinhard.guenther@gmail.com>
Date:   Fri Apr 26 19:21:11 2019 +0200

    merging DL2MF's 25b438db84 to current devel branch

commit b467f25c05
Author: Hans P. Reiser <hr@sec.uni-passau.de>
Date:   Fri Apr 26 23:54:36 2019 +0200

    working new Wifi support

commit 2959dfad4f
Author: Hans P. Reiser <hr@sec.uni-passau.de>
Date:   Fri Apr 26 23:09:09 2019 +0200

    background wifi scan/connected/reconnect. partial code, incomplete, for testing station mode only (wifi=1)
pull/22/head
Hans P. Reiser 2019-04-28 14:33:53 +02:00
rodzic 0518f070a2
commit ca3fa52a3b
7 zmienionych plików z 625 dodań i 368 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

956
RX_FSK/RX_FSK.ino
Wyświetl plik

Plik diff jest za duży Load Diff

4
RX_FSK/data/config.txt
Wyświetl plik

@ -3,7 +3,7 @@
#-------------------------------#
button_pin=0
# LED port
led_pin=25
led_pout=9
# OLED Setup is depending on hardware of LoRa board
# TTGO v1: SDA=4 SCL=15, RST=16
# TTGO v2: SDA=21 SCL=22, RST=16
@ -15,7 +15,7 @@ oled_rst=16
#-------------------------------#
maxsonde=20
debug=0
wifi=0
wifi=1
wifiap=1
#-------------------------------#
# Spectrum display settings

13
RX_FSK/data/index.html
Wyświetl plik

@ -18,7 +18,7 @@
<button class="tablinks" onclick="selTab(event,'QRG')" id="defaultTab">QRG</button>
<button class="tablinks" onclick="selTab(event,'WLAN')">WLAN</button>
<button class="tablinks" onclick="selTab(event,'Data')">Data</button>
<button class="tablinks" onclick="selTab(event,'WebWX')">Webwx</button>
<button class="tablinks" onclick="selTab(event,'SondeMap')">SondeMap</button>
<button class="tablinks" onclick="selTab(event,'Config')">Config</button>
<button class="tablinks" onclick="selTab(event,'About')">About</button>
</div>
@ -38,9 +38,8 @@
<iframe src="status.html" style="border:none;" width="100%%" height="100%%"></iframe>
</div>
<div id="Data" class="tabcontent">
<h3>wetterson.de</h3>
<iframe src="https://wetterson.de/karte/" style="border:none;" width="100%%" height="100%%"></iframe>
<div id="SondeMap" class="tabcontent">
<iframe src="https://wx.dl2mf.de/#?" style="border:none;" width="98%%" height="98%%"></iframe>
</div>
<div id="Config" class="tabcontent">
@ -50,10 +49,10 @@
<div id="About" class="tabcontent">
<h3>About</h3>
RDZSonde<br>
%VERSION_NAME%<br>
Copyright &copy; 2019 by Hansi Reiser, DL9RDZ<br>
(master-version v0.4)<br>
with mods by Meinhard Guenther, DL2MF<br>
(version %VERSION_ID%)<br>
with mods by <a href="https://www.dl2mf.de/" target="_blank">Meinhard Guenther, DL2MF</a><br>
<br>
This program is free software; you can redistribute it and/or<br>
modify it under the terms of the GNU General Public License as<br>

2
RX_FSK/version.h 100644
Wyświetl plik

@ -0,0 +1,2 @@
const char *version_name = "RDZ_TTGO_SONDE";
const char *version_id = "master v0.5";

4
libraries/SondeLib/Scanner.cpp
Wyświetl plik

@ -51,6 +51,10 @@ void Scanner::plotResult()
if( ((i+j)%TICK2)==0) { row[j] |= 0x01; }
}
for(int y=0; y<8; y++) {
if(sonde.config.marker && y==1) {
// don't overwrite MHz marker text
if(i<3*8 || (i>=7*8&&i<10*8) || i>=13*8) continue;
}
u8x8->drawTile(i/8, y, 1, row+8*y);
}
}

9
libraries/SondeLib/Sonde.cpp
Wyświetl plik

@ -49,6 +49,7 @@ static uint8_t ap_tile[8]={0x00,0x04,0x22,0x92, 0x92, 0x22, 0x04, 0x00};
Sonde::Sonde() {
config.button_pin = 0;
config.led_pout = 9;
config.oled_sda = 4;
config.oled_scl = 15;
config.oled_rst = 16;
@ -98,8 +99,8 @@ void Sonde::setConfig(const char *cfg) {
strncpy(config.passcode, val, 9);
} else if(strcmp(cfg,"button_pin")==0) {
config.button_pin = atoi(val);
} else if(strcmp(cfg,"led_pin")==0) {
config.led_pin = atoi(val);
} else if(strcmp(cfg,"led_pout")==0) {
config.led_pout = atoi(val);
} else if(strcmp(cfg,"oled_sda")==0) {
config.oled_sda = atoi(val);
} else if(strcmp(cfg,"oled_scl")==0) {
@ -153,6 +154,10 @@ void Sonde::setConfig(const char *cfg) {
}
}
void Sonde::clearIP() {
memset(myIP_tiles, 0, 11*8);
}
void Sonde::setIP(const char *ip, bool AP) {
memset(myIP_tiles, 0, 11*8);
int len = strlen(ip);

5
libraries/SondeLib/Sonde.h
Wyświetl plik

@ -13,8 +13,8 @@ enum SondeType { STYPE_DFM06, STYPE_DFM09, STYPE_RS41 };
extern const char *sondeTypeStr[5];
typedef struct st_rdzconfig {
int button_pin; // pin number of second button (for some boards)
int led_pin; // pin number of LED
int button_pin; // PIN port number menu button (for some boards)
int led_pout; // POUT port number of LED (used as serial monitor)
int oled_sda; // OLED data pin
int oled_scl; // OLED clock pin
int oled_rst; // OLED reset pin
@ -92,6 +92,7 @@ public:
void updateDisplayScanner();
void clearDisplay();
void setIP(const char *ip, bool isAP);
void clearIP();
};
extern Sonde sonde;