kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'PE5PVB:main' into main

Browse Source
This commit is contained in:
Jan Ove Overland
2023-08-10 21:05:53 +02:00
committed by GitHub
parent 069700e2d5 0279672d8e
commit 124fdea9aa
10 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+18 -18
View File
@@ -156,7 +156,6 @@ byte showmodulation;
byte showSWMIBand; byte showSWMIBand;
byte submenu; byte submenu;
byte nowToggleSWMIBand = 1; byte nowToggleSWMIBand = 1;
byte SNRold;
byte stepsize; byte stepsize;
byte StereoLevel; byte StereoLevel;
byte subnetclient; byte subnetclient;
@@ -214,7 +213,7 @@ int rssiold = 200;
int scanner_filter; int scanner_filter;
int SecondaryColor; int SecondaryColor;
int SecondaryColorSmooth; int SecondaryColorSmooth;
int snrupdatetimer; int SNRupdatetimer;
int Sqstatusold; int Sqstatusold;
int Squelch; int Squelch;
int Squelchold; int Squelchold;
@@ -233,6 +232,8 @@ int16_t SAvg2;
int16_t SStatus; int16_t SStatus;
int8_t LevelOffset; int8_t LevelOffset;
int8_t LowLevelSet; int8_t LowLevelSet;
int8_t CN;
int8_t CNold;
int8_t VolSet; int8_t VolSet;
float batteryVold; float batteryVold;
IPAddress remoteip; IPAddress remoteip;
@@ -269,7 +270,6 @@ uint16_t SWMIBandPosold; // Fix Me: Should store this parameter into flash, for
uint16_t USN; uint16_t USN;
uint16_t WAM; uint16_t WAM;
uint8_t buff_pos; uint8_t buff_pos;
uint8_t SNR;
unsigned int change; unsigned int change;
unsigned int ConverterSet; unsigned int ConverterSet;
unsigned int freq_scan; unsigned int freq_scan;
@@ -759,7 +759,7 @@ void loop() {
if (millis() >= lowsignaltimer + 300) { if (millis() >= lowsignaltimer + 300) {
lowsignaltimer = millis(); lowsignaltimer = millis();
if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
if (screenmute == true) readRds(); if (screenmute == true) readRds();
if (menu == false) { if (menu == false) {
doSquelch(); doSquelch();
@@ -768,7 +768,7 @@ void loop() {
} }
} else { } else {
if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
if (menu == false) { if (menu == false) {
doSquelch(); doSquelch();
readRds(); readRds();
@@ -778,7 +778,7 @@ void loop() {
} }
if (menu == true && menuopen == true && menupage == FMSETTINGS && menuoption == ITEM4) { if (menu == true && menuopen == true && menupage == FMSETTINGS && menuoption == ITEM4) {
if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
if (millis() >= lowsignaltimer + 500 || change2 == true) { if (millis() >= lowsignaltimer + 500 || change2 == true) {
lowsignaltimer = millis(); lowsignaltimer = millis();
change2 = false; change2 = false;
@@ -1680,7 +1680,7 @@ void SelectBand() {
CheckBandForbiddenAM(); CheckBandForbiddenAM();
radio.SetFreqAM(frequency_AM); radio.SetFreqAM(frequency_AM);
doBW(); doBW();
radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
if (screenmute == false) radio.clearRDS(fullsearchrds); BuildDisplay(); if (screenmute == false) radio.clearRDS(fullsearchrds); BuildDisplay();
if (region == 0) tftPrint(-1, "PI:", 212, 193, GreyoutColor, BackgroundColor, 16); if (region == 0) tftPrint(-1, "PI:", 212, 193, GreyoutColor, BackgroundColor, 16);
if (region == 1) tftPrint(-1, "ID:", 212, 193, GreyoutColor, BackgroundColor, 16); if (region == 1) tftPrint(-1, "ID:", 212, 193, GreyoutColor, BackgroundColor, 16);
@@ -1704,7 +1704,7 @@ void SelectBand() {
freqold = frequency_AM; freqold = frequency_AM;
CheckBandForbiddenFM(); CheckBandForbiddenFM();
doBW(); doBW();
radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
if (screenmute == false) radio.clearRDS(fullsearchrds); BuildDisplay(); if (screenmute == false) radio.clearRDS(fullsearchrds); BuildDisplay();
} }
} }
@@ -2301,23 +2301,23 @@ void ShowFreq(int mode) {
void ShowSignalLevel() { void ShowSignalLevel() {
if (screenmute == false) { if (screenmute == false) {
if (millis() >= snrupdatetimer + TIMER_SNR_TIMER) { if (millis() >= SNRupdatetimer + TIMER_SNR_TIMER) {
snrupdatetimer = millis(); SNRupdatetimer = millis();
if (!advancedRDS) { if (!advancedRDS) {
if (SNR > (SNRold + 1) || SNR < (SNRold - 1)) { if (CN > (CNold + 1) || CN < (CNold - 1)) {
if (SNRold == 0) tftPrint(1, "--", 295, 163, BackgroundColor, BackgroundColor, 16); else tftPrint(1, String(SNRold), 295, 163, BackgroundColor, BackgroundColor, 16); if (CNold == 0) tftPrint(1, "--", 295, 163, BackgroundColor, BackgroundColor, 16); else tftPrint(1, String(CNold), 295, 163, BackgroundColor, BackgroundColor, 16);
if (tuned == true) { if (tuned == true) {
if (SNR == 0) tftPrint(1, "--", 295, 163, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, String(SNR), 295, 163, PrimaryColor, PrimaryColorSmooth, 16); if (CN == 0) tftPrint(1, "--", 295, 163, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, String(CN), 295, 163, PrimaryColor, PrimaryColorSmooth, 16);
SNRold = SNR; CNold = CN;
} else { } else {
tftPrint(1, "--", 295, 163, PrimaryColor, PrimaryColorSmooth, 16); tftPrint(1, "--", 295, 163, PrimaryColor, PrimaryColorSmooth, 16);
SNRold = 0; CNold = 0;
} }
} }
} }
} }
SAvg = (((SAvg * 9) + 5) / 10) + SStatus; SAvg = (((SAvg * 9) + 5) / 10) + SStatus;
SAvg2 = (((SAvg2 * 9) + 5) / 10) + SNR; SAvg2 = (((SAvg2 * 9) + 5) / 10) + CN;
float sval = 0; float sval = 0;
int16_t smeter = 0; int16_t smeter = 0;
@@ -2334,7 +2334,7 @@ void ShowSignalLevel() {
smeter = int16_t(sval); smeter = int16_t(sval);
SStatus = SAvg / 10; SStatus = SAvg / 10;
SNR = SAvg2 / 10; CN = SAvg2 / 10;
if (menu == false) analogWrite(SMETERPIN, smeter); if (menu == false) analogWrite(SMETERPIN, smeter);
@@ -3177,7 +3177,7 @@ void Seek(bool mode) {
if (XDRGTKUSB == true || XDRGTKTCP == true) { if (XDRGTKUSB == true || XDRGTKTCP == true) {
if (band == BAND_FM) DataPrint("T" + String(frequency * 10) + "\n"); else DataPrint("T" + String(frequency_AM) + "\n"); if (band == BAND_FM) DataPrint("T" + String(frequency * 10) + "\n"); else DataPrint("T" + String(frequency_AM) + "\n");
} }
radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
if ((USN < 200) && (WAM < 230) && (OStatus < 80 && OStatus > -80) && (Squelch < SStatus || Squelch == 920)) { if ((USN < 200) && (WAM < 230) && (OStatus < 80 && OStatus > -80) && (Squelch < SStatus || Squelch == 920)) {
seek = false; seek = false;
src/TEF6686.cpp
+4 -4
View File
@@ -12,7 +12,7 @@ void TEF6686::TestAFEON() {
uint16_t rdsStat; uint16_t rdsStat;
uint16_t dummy1; uint16_t dummy1;
uint16_t dummy2; uint16_t dummy2;
uint8_t dummy3; int8_t dummy3;
int16_t aflevel; int16_t aflevel;
uint16_t afusn; uint16_t afusn;
uint16_t afwam; uint16_t afwam;
@@ -56,7 +56,7 @@ uint16_t TEF6686::TestAF() {
uint16_t rdsStat; uint16_t rdsStat;
uint16_t dummy1; uint16_t dummy1;
uint16_t dummy2; uint16_t dummy2;
uint8_t dummy3; int8_t dummy3;
int16_t aflevel; int16_t aflevel;
uint16_t afusn; uint16_t afusn;
@@ -322,7 +322,7 @@ bool TEF6686::getProcessing(uint16_t &highcut, uint16_t &stereo, uint16_t &sthib
return stband_4; return stband_4;
} }
bool TEF6686::getStatus(int16_t &level, uint16_t &USN, uint16_t &WAM, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, uint8_t &snr) { bool TEF6686::getStatus(int16_t &level, uint16_t &USN, uint16_t &WAM, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, int8_t &snr) {
uint16_t status; uint16_t status;
devTEF_Radio_Get_Quality_Status(&status, &level, &USN, &WAM, &offset, &bandwidth, &modulation, &snr); devTEF_Radio_Get_Quality_Status(&status, &level, &USN, &WAM, &offset, &bandwidth, &modulation, &snr);
return level; return level;
@@ -333,7 +333,7 @@ bool TEF6686::getStatus(int16_t &level, uint16_t &USN, uint16_t &WAM, int16_t &o
return snr; return snr;
} }
bool TEF6686::getStatusAM(int16_t &level, uint16_t &noise, uint16_t &cochannel, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, uint8_t &snr) { bool TEF6686::getStatusAM(int16_t &level, uint16_t &noise, uint16_t &cochannel, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, int8_t &snr) {
devTEF_Radio_Get_Quality_Status_AM(&level, &noise, &cochannel, &offset, &bandwidth, &modulation, &snr); devTEF_Radio_Get_Quality_Status_AM(&level, &noise, &cochannel, &offset, &bandwidth, &modulation, &snr);
return level; return level;
return noise; return noise;
src/TEF6686.h
+2 -2
View File
@@ -207,8 +207,8 @@ class TEF6686 {
void SetFreq(uint16_t frequency); void SetFreq(uint16_t frequency);
void SetFreqAM(uint16_t frequency); void SetFreqAM(uint16_t frequency);
bool getProcessing(uint16_t &highcut, uint16_t &stereo, uint16_t &sthiblend, uint8_t &stband_1, uint8_t &stband_2, uint8_t &stband_3, uint8_t &stband_4); bool getProcessing(uint16_t &highcut, uint16_t &stereo, uint16_t &sthiblend, uint8_t &stband_1, uint8_t &stband_2, uint8_t &stband_3, uint8_t &stband_4);
bool getStatus(int16_t &level, uint16_t &USN, uint16_t &WAM, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, uint8_t &snr); bool getStatus(int16_t &level, uint16_t &USN, uint16_t &WAM, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, int8_t &snr);
bool getStatusAM(int16_t &level, uint16_t &noise, uint16_t &cochannel, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, uint8_t &snr); bool getStatusAM(int16_t &level, uint16_t &noise, uint16_t &cochannel, int16_t &offset, uint16_t &bandwidth, uint16_t &modulation, int8_t &snr);
bool getIdentification(uint16_t &device, uint16_t &hw_version, uint16_t &sw_version); bool getIdentification(uint16_t &device, uint16_t &hw_version, uint16_t &sw_version);
void setSoftmuteFM(uint8_t mode); void setSoftmuteFM(uint8_t mode);
void setSoftmuteAM(uint8_t mode); void setSoftmuteAM(uint8_t mode);
src/Tuner_Drv_Lithio.cpp
+2 -2
View File
@@ -206,7 +206,7 @@ bool devTEF_Radio_Get_Processing_Status (uint16_t *highcut, uint16_t *stereo, ui
return r; return r;
} }
bool devTEF_Radio_Get_Quality_Status (uint16_t *status, int16_t *level, uint16_t *usn, uint16_t *wam, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, uint8_t *snr) { bool devTEF_Radio_Get_Quality_Status (uint16_t *status, int16_t *level, uint16_t *usn, uint16_t *wam, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, int8_t *snr) {
uint8_t buf[14]; uint8_t buf[14];
uint16_t r = devTEF_Get_Cmd(TEF_FM, Cmd_Get_Quality_Data, buf, sizeof(buf)); uint16_t r = devTEF_Get_Cmd(TEF_FM, Cmd_Get_Quality_Data, buf, sizeof(buf));
*status = Convert8bto16b(buf); *status = Convert8bto16b(buf);
@@ -222,7 +222,7 @@ bool devTEF_Radio_Get_Quality_Status (uint16_t *status, int16_t *level, uint16_t
return r; return r;
} }
bool devTEF_Radio_Get_Quality_Status_AM (int16_t *level, uint16_t *noise, uint16_t *cochannel, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, uint8_t *snr) { bool devTEF_Radio_Get_Quality_Status_AM (int16_t *level, uint16_t *noise, uint16_t *cochannel, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, int8_t *snr) {
uint8_t buf[14]; uint8_t buf[14];
uint16_t r = devTEF_Get_Cmd(TEF_AM, Cmd_Get_Quality_Data, buf, sizeof(buf)); uint16_t r = devTEF_Get_Cmd(TEF_AM, Cmd_Get_Quality_Data, buf, sizeof(buf));
src/Tuner_Drv_Lithio.h
+2 -2
View File
@@ -67,9 +67,9 @@ bool devTEF_Set_Cmd(TEF_MODULE module, uint8_t cmd, uint16_t len, ...);
bool devTEF_Radio_Get_Identification (uint16_t *device, uint16_t *hw_version, uint16_t *sw_version); bool devTEF_Radio_Get_Identification (uint16_t *device, uint16_t *hw_version, uint16_t *sw_version);
bool devTEF_Radio_Tune_To (uint16_t frequency ); bool devTEF_Radio_Tune_To (uint16_t frequency );
bool devTEF_Radio_Tune_AM (uint16_t frequency ); bool devTEF_Radio_Tune_AM (uint16_t frequency );
bool devTEF_Radio_Get_Quality_Status (uint16_t *status, int16_t *level, uint16_t *usn, uint16_t *wam, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, uint8_t *snr); bool devTEF_Radio_Get_Quality_Status (uint16_t *status, int16_t *level, uint16_t *usn, uint16_t *wam, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, int8_t *snr);
bool devTEF_Radio_Get_Processing_Status (uint16_t *highcut, uint16_t *stereo, uint16_t *sthiblend, uint8_t *stband_1, uint8_t *stband_2, uint8_t *stband_3, uint8_t *stband_4); bool devTEF_Radio_Get_Processing_Status (uint16_t *highcut, uint16_t *stereo, uint16_t *sthiblend, uint8_t *stband_1, uint8_t *stband_2, uint8_t *stband_3, uint8_t *stband_4);
bool devTEF_Radio_Get_Quality_Status_AM (int16_t *level, uint16_t *noise, uint16_t *cochannel, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, uint8_t *snr); bool devTEF_Radio_Get_Quality_Status_AM (int16_t *level, uint16_t *noise, uint16_t *cochannel, int16_t *offset, uint16_t *bandwidth, uint16_t *mod, int8_t *snr);
bool devTEF_APPL_Get_Operation_Status(uint8_t *bootstatus); bool devTEF_APPL_Get_Operation_Status(uint8_t *bootstatus);
bool devTEF_Audio_Set_Mute(uint8_t mode); bool devTEF_Audio_Set_Mute(uint8_t mode);
bool devTEF_Audio_Set_Volume(int16_t volume); bool devTEF_Audio_Set_Volume(int16_t volume);
src/comms.cpp
+2 -2
View File
@@ -414,7 +414,7 @@ void XDRGTKRoutine() {
radio.SetFreq(freq_scan); radio.SetFreq(freq_scan);
DataPrint(String(freq_scan * 10, DEC)); DataPrint(String(freq_scan * 10, DEC));
DataPrint(" = "); DataPrint(" = ");
if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
DataPrint(String((SStatus / 10) + 10, DEC)); DataPrint(String((SStatus / 10) + 10, DEC));
DataPrint(", "); DataPrint(", ");
} }
@@ -511,7 +511,7 @@ void XDRGTKRoutine() {
DataPrint("Sm"); DataPrint("Sm");
} }
} }
DataPrint(String(((SStatus * 100) + 10875) / 1000) + "." + String(((SStatus * 100) + 10875) / 100 % 10) + ", " + String(WAM / 10) + ", " + String(SNR) + "\n"); DataPrint(String(((SStatus * 100) + 10875) / 1000) + "." + String(((SStatus * 100) + 10875) / 100 % 10) + ", " + String(WAM / 10) + ", " + String(CN) + "\n");
} }
void passwordcrypt() { void passwordcrypt() {
src/comms.h
+1 -1
View File
@@ -73,7 +73,7 @@ extern uint16_t MStatus;
extern uint16_t USN; extern uint16_t USN;
extern uint16_t WAM; extern uint16_t WAM;
extern uint8_t buff_pos; extern uint8_t buff_pos;
extern uint8_t SNR; extern int8_t CN;
extern unsigned int freq_scan; extern unsigned int freq_scan;
extern unsigned int frequency; extern unsigned int frequency;
extern unsigned int frequency_AM; extern unsigned int frequency_AM;
src/gui.cpp
+1 -1
View File
@@ -784,7 +784,7 @@ void BuildDisplay() {
SStatusold = 2000; SStatusold = 2000;
SStatus = 100; SStatus = 100;
rssiold = 2000; rssiold = 2000;
SNRold = 254; CNold = 254;
af_counterold = 254; af_counterold = 254;
batteryold = 6; batteryold = 6;
batteryVold = 0; batteryVold = 0;
src/gui.h
+1 -1
View File
@@ -95,7 +95,7 @@ extern byte screensaverOptions[5];
extern byte screensaverset; extern byte screensaverset;
extern byte showmodulation; extern byte showmodulation;
extern byte showSWMIBand; extern byte showSWMIBand;
extern byte SNRold; extern int8_t CNold;
extern byte StereoLevel; extern byte StereoLevel;
extern byte StereoLevel; extern byte StereoLevel;
extern byte submenu; extern byte submenu;
src/language.h
+11 -11
View File
@@ -188,8 +188,8 @@ static const char* const myLanguage[16][196] = {
"PRESS MODE TO RETURN", // 184 "PRESS MODE TO RETURN", // 184
"AM CoChannelDet", // 185 "AM CoChannelDet", // 185
"CoChannel Det sensitivity", // 186 "CoChannel Det sensitivity", // 186
"AM CoChannelDet threshold", // 187 "CoChannel Det threshold", // 187
"CoChannelDet counet", // 188 "CoChannel Det counter", // 188
"MAIN", // 189 "MAIN", // 189
"AUDIO", // 190 "AUDIO", // 190
"DISPLAY", // 191 "DISPLAY", // 191
@@ -383,18 +383,18 @@ static const char* const myLanguage[16][196] = {
"FM instellingen", // 181 "FM instellingen", // 181
"AM instellingen", // 182 "AM instellingen", // 182
"Connectiviteit", // 183 "Connectiviteit", // 183
"DRUK OP MODE OM TERUG TE GAAN", // 184 "MODE OM TERUG TE GAAN", // 184
"AM CoChannelDet", // 185 "AM CoChannel detectie", // 185
"CoChannelDet sensitivity", // 186 "CoChannel det. gevoeligheid", // 186
"AM CoChannelDet threshold", // 187 "CoChannel det. kantelpunt", // 187
"CoChannelDet counet", // 188 "CoChannel det. teller", // 188
"MAIN", // 189 "ALGEMEEN", // 189
"AUDIO", // 190 "GELUID", // 190
"DISPLAY", // 191 "SCHERM", // 191
"RDS", // 192 "RDS", // 192
"FM", // 193 "FM", // 193
"AM", // 194 "AM", // 194
"CONNECT" // 195 "VERBIND" // 195
}, },
{ "Polski", // Polish { "Polski", // Polish