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

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

This commit is contained in:
Hans P. Reiser 2019-04-28 14:17:37 +02:00
parent 75eb15cc24
commit 9fea636d20
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
RX_FSK/RX_FSK.ino
View File

@ -46,6 +46,12 @@ String processor(const String& var) {
Serial.print(ledState); Serial.print(ledState);
return ledState; return ledState;
} }
if(var == "VERSION_NAME") {
return String(version_name);
}
if(var == "VERSION_ID") {
return String(version_id);
}
return String(); return String();
} }
@ -299,8 +305,8 @@ struct st_configitems {
int type; // 0: numeric; i>0 string of length i; -1: separator; -2: type selector int type; // 0: numeric; i>0 string of length i; -1: separator; -2: type selector
void *data; void *data;
}; };
#define N_CONFIG 20
struct st_configitems config_list[N_CONFIG] = { struct st_configitems config_list[] = {
{"ShowSpectrum (s)", 0, &sonde.config.spectrum}, {"ShowSpectrum (s)", 0, &sonde.config.spectrum},
{"Startfreq (MHz)", 0, &sonde.config.startfreq}, {"Startfreq (MHz)", 0, &sonde.config.startfreq},
{"Bandwidth (kHz)", 0, &sonde.config.channelbw}, {"Bandwidth (kHz)", 0, &sonde.config.channelbw},
@ -322,6 +328,7 @@ struct st_configitems config_list[N_CONFIG] = {
{"---", -1, NULL}, {"---", -1, NULL},
{"Spectrum noise floor", 0, &sonde.config.noisefloor} {"Spectrum noise floor", 0, &sonde.config.noisefloor}
}; };
const static int N_CONFIG=(sizeof(config_list)/sizeof(struct st_configitems));
void addConfigStringEntry(char *ptr, int idx, const char *label, int len, char *field) { void addConfigStringEntry(char *ptr, int idx, const char *label, int len, char *field) {
sprintf(ptr + strlen(ptr), "<tr><td>%s</td><td><input name=\"CFG%d\" type=\"text\" value=\"%s\"/></td></tr>\n", sprintf(ptr + strlen(ptr), "<tr><td>%s</td><td><input name=\"CFG%d\" type=\"text\" value=\"%s\"/></td></tr>\n",
@ -708,11 +715,11 @@ void loopScanner() {
} }
} }
static int specTimer = 0; static unsigned long specTimer;
void loopSpectrum() { void loopSpectrum() {
int marker = 0; int marker = 0;
char buf[5]; char buf[10];
switch (getKeyPress()) { switch (getKeyPress()) {
case KP_SHORT: /* move selection of peak, TODO */ case KP_SHORT: /* move selection of peak, TODO */
@ -736,19 +743,18 @@ void loopSpectrum() {
itoa((sonde.config.startfreq + 6), buf, 10); itoa((sonde.config.startfreq + 6), buf, 10);
u8x8->drawString(13, 1, buf); u8x8->drawString(13, 1, buf);
} }
if (specTimer > 0) { if (sonde.config.timer) {
itoa(specTimer, buf, 10); int remaining = sonde.config.spectrum - (millis() - specTimer)/1000;
itoa(remaining, buf, 10);
if (sonde.config.marker != 0) { if (sonde.config.marker != 0) {
marker = 1; marker = 1;
} }
u8x8->drawString(0, 1 + marker, buf); u8x8->drawString(0, 1 + marker, buf);
u8x8->drawString(2, 1 + marker, "Sec."); u8x8->drawString(2, 1 + marker, "Sec.");
specTimer--; if (remaining <= 0) {
if (specTimer <= 0) {
enterMode(ST_SCANNER); enterMode(ST_SCANNER);
} }
} }
delay(1000);
} }
void startSpectrumDisplay() { void startSpectrumDisplay() {
@ -756,7 +762,7 @@ void startSpectrumDisplay() {
u8x8->setFont(u8x8_font_chroma48medium8_r); u8x8->setFont(u8x8_font_chroma48medium8_r);
u8x8->drawString(0, 0, "Spectrum Scan..."); u8x8->drawString(0, 0, "Spectrum Scan...");
delay(500); delay(500);
specTimer = sonde.config.spectrum; specTimer = millis();
enterMode(ST_SPECTRUM); enterMode(ST_SPECTRUM);
} }
@ -983,7 +989,8 @@ void startAP() {
void initialMode() { void initialMode() {
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
enterMode(ST_SPECTRUM); startSpectrumDisplay();
//done in startSpectrumScan(): enterMode(ST_SPECTRUM);
} else { } else {
enterMode(ST_SCANNER); enterMode(ST_SCANNER);
} }