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

Windows GitGui did not update the RX_FSK.ino 

Some of the latest changes to the .ino were not uploaded correctly.
This commit is contained in:
Mike 2019-04-27 20:54:20 +02:00 committed by GitHub
parent e2161c57d1
commit 71cc86cff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
RX_FSK/RX_FSK.ino
View File

@ -688,6 +688,41 @@ void loopSpectrum() {
scanner.plotResult(); scanner.plotResult();
} }
void startSpectrumDisplay() {
int marker=0;
char buf[5];
sonde.clearDisplay();
u8x8->setFont(u8x8_font_chroma48medium8_r);
u8x8->drawString(0, 0, "Spectrum Scan...");
delay(500);
enterMode(ST_SPECTRUM);
for (int i = 0; i < sonde.config.spectrum; i++) {
scanner.scan();
scanner.plotResult();
if (sonde.config.marker != 0) {
itoa((sonde.config.startfreq), buf, 10);
u8x8->drawString(0, 1, buf);
u8x8->drawString(7, 1, "MHz");
itoa((sonde.config.startfreq + 6), buf, 10);
u8x8->drawString(13, 1, buf);
}
if (sonde.config.timer != 0) {
itoa((sonde.config.spectrum - i), buf, 10);
if (sonde.config.marker != 0) {
marker = 1;
}
u8x8->drawString(0, 1+marker, buf);
u8x8->drawString(2, 1+marker, "Sec.");
}
}
delay(1000);
}
String translateEncryptionType(wifi_auth_mode_t encryptionType) { String translateEncryptionType(wifi_auth_mode_t encryptionType) {
switch (encryptionType) { switch (encryptionType) {
case (WIFI_AUTH_OPEN): case (WIFI_AUTH_OPEN):
@ -736,8 +771,6 @@ void loopWifiScan() {
int line=0; int line=0;
int cnt=0; int cnt=0;
int marker=0;
char buf[5];
WiFi.disconnect(true); WiFi.disconnect(true);
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
@ -806,36 +839,7 @@ void loopWifiScan() {
} }
if (sonde.config.spectrum != 0) { // enable Spectrum in config.txt: spectrum=number_of_seconds if (sonde.config.spectrum != 0) { // enable Spectrum in config.txt: spectrum=number_of_seconds
sonde.clearDisplay(); startSpectrumDisplay();
u8x8->setFont(u8x8_font_chroma48medium8_r);
u8x8->drawString(0, 0, "Spectrum Scan...");
delay(500);
enterMode(ST_SPECTRUM);
for (int i = 0; i < sonde.config.spectrum; i++) {
scanner.scan();
scanner.plotResult();
if (sonde.config.marker != 0) {
itoa((sonde.config.startfreq), buf, 10);
u8x8->drawString(0, 1, buf);
u8x8->drawString(7, 1, "MHz");
itoa((sonde.config.startfreq + 6), buf, 10);
u8x8->drawString(13, 1, buf);
}
if (sonde.config.timer != 0) {
itoa((sonde.config.spectrum - i), buf, 10);
if (sonde.config.marker != 0) {
marker = 1;
}
u8x8->drawString(0, 1+marker, buf);
u8x8->drawString(2, 1+marker, "Sec.");
}
}
delay(1000);
} }
enterMode(ST_SCANNER); enterMode(ST_SCANNER);
@ -853,7 +857,9 @@ void loopWifiScan() {
SetupAsyncServer(); SetupAsyncServer();
delay(2000); delay(2000);
// enterMode(ST_DECODER); ### 2019-04-20 - changed DL2MF if (sonde.config.spectrum != 0) { // enable Spectrum in config.txt: spectrum=number_of_seconds
startSpectrumDisplay();
}
enterMode(ST_SCANNER); enterMode(ST_SCANNER);
} }