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

updates, and on dp666 the date should be wrong on startup

Browse Source
This commit is contained in:
kuba
2026-01-23 19:17:20 +01:00
parent bb0675b8a3
commit 2d03316910
24 changed files with 411 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TEF6686.cpp
+88 -90
View File
@@ -24,13 +24,13 @@ void TEF6686::TestAFEON() {
setMute();
for (int x = 0; x < af_counter; x++) {
timing = 0;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 3, af[x].frequency);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 3, af[x].frequency);
while (timing == 0 && !bitRead(timing, 15)) {
devTEF_Radio_Get_Quality_Status(&status, &aflevel, &afusn, &afwam, &afoffset, NULL, NULL, NULL);
timing = lowByte(status);
}
if (afoffset > -125 || afoffset < 125) {
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 4, af[x].frequency);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 4, af[x].frequency);
delay(187);
devTEF_Radio_Get_RDS_Status(&rds.rdsStat, &rds.rdsA, &rds.rdsB, &rds.rdsC, &rds.rdsD, &rds.rdsErr);
@@ -46,7 +46,7 @@ void TEF6686::TestAFEON() {
}
}
}
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 4, currentfreq);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 4, currentfreq);
setUnMute();
}
@@ -61,7 +61,7 @@ uint16_t TEF6686::TestAF() {
for (int x = 0; x < af_counter; x++) {
timing = 0;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 3, af[x].frequency);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 3, af[x].frequency);
while (timing == 0 && !bitRead(timing, 15)) {
devTEF_Radio_Get_Quality_Status(&status, &aflevel, &afusn, &afwam, &afoffset, NULL, NULL, NULL);
timing = lowByte(status);
@@ -81,7 +81,7 @@ uint16_t TEF6686::TestAF() {
}
if (af_counter != 0 && af[highestIndex].afvalid && af[highestIndex].score > (currentlevel - currentusn - currentwam) && (af[highestIndex].score - (currentlevel - currentusn - currentwam)) >= 70) {
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 4, af[highestIndex].frequency);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 4, af[highestIndex].frequency);
delay(187);
devTEF_Radio_Get_RDS_Status(&rds.rdsStat, &rds.rdsA, &rds.rdsB, &rds.rdsC, &rds.rdsD, &rds.rdsErr);
if (bitRead(rds.rdsStat, 9)) {
@@ -96,9 +96,9 @@ uint16_t TEF6686::TestAF() {
af_counter = 0;
} else {
af[highestIndex].afvalid = false;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 4, currentfreq);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 4, currentfreq);
}
} else devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 4, currentfreq);
} else devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 4, currentfreq);
}
}
return currentfreq;
@@ -109,7 +109,7 @@ void TEF6686::init(byte TEF) {
Wire.setClock(400000);
Tuner_Reset();
while(devTEF_APPL_Get_Operation_Status() != 0) delay(2);
while(devTEF_APPL_Get_Operation_Status() != 0) delay(1);
uint32_t clock = 12000000;
@@ -128,108 +128,107 @@ void TEF6686::init(byte TEF) {
// Start the firmware
devTEF_Set_Cmd(TEF_INIT, 0, 0);
while(devTEF_APPL_Get_Operation_Status() != 1) delay(2); // Wait for it to load
while(devTEF_APPL_Get_Operation_Status() != 1) delay(1); // Wait for it to load
if(clock != 9216000) devTEF_Set_Cmd(TEF_APPL, Cmd_Set_ReferenceClock, 6, (clock >> 16) & 0xffff, clock & 0xffff, (clock == 55466670) ? 1 : 0);
devTEF_Set_Cmd(TEF_APPL, Cmd_Set_Activate, 2, 1); // Setup done, start radio
if(clock != 9216000) devTEF_Set_Cmd(TEF_APPL, Cmd_Set_ReferenceClock, 3, (clock >> 16) & 0xffff, clock & 0xffff, (clock == 55466670) ? 1 : 0);
devTEF_Set_Cmd(TEF_APPL, Cmd_Set_Activate, 1, 1); // Setup done, start radio
while(devTEF_APPL_Get_Operation_Status() != 2) delay(2); // Wait for it to start
while(devTEF_APPL_Get_Operation_Status() != 2) delay(1); // Wait for it to start
Wire.setClock(old_clock);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Mph, 6, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Max, 4, 0, 4000);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_LowCut_Max, 4, 0, 100);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Time, 8, 60, 120, 100, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Time, 8, 500, 2000, 200, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Level, 6, 0, 600, 240);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Noise, 6, 0, 160, 140);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Mph, 6, 0, 160, 140);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Max, 4, 0, 4000);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Ana_Out, 4, 128, 1);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Output_Source, 4, 128, 224);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Mph, 3, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Max, 2, 0, 4000);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_LowCut_Max, 2, 0, 100);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Time, 4, 60, 120, 100, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Time, 4, 500, 2000, 200, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Level, 3, 0, 600, 240);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Noise, 3, 0, 160, 140);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Mph, 3, 0, 160, 140);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Max, 2, 0, 4000);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Ana_Out, 2, 128, 1);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Output_Source, 2, 128, 224);
uint16_t device;
getIdentification(&device, NULL, NULL);
uint16_t device = getIdentification(NULL, NULL);
if(device == 1 || device == 3) fullsearchrds = true;
}
void TEF6686::getIdentification(uint16_t *device, uint16_t *hw_version, uint16_t *sw_version) {
uint16_t TEF6686::getIdentification(uint16_t *hw_version, uint16_t *sw_version) {
uint8_t buf[6];
devTEF_Get_Cmd(TEF_APPL, Cmd_Get_Identification, buf, sizeof(buf));
if(device != NULL) *device = Convert8bto16b(buf);
if(hw_version != NULL) *hw_version = Convert8bto16b(buf + 2);
if(sw_version != NULL) *sw_version = Convert8bto16b(buf + 4);
return Convert8bto16b(buf);
}
void TEF6686::power(bool mode) {
devTEF_Set_Cmd(TEF_APPL, Cmd_Set_OperationMode, 2, mode);
devTEF_Set_Cmd(TEF_APPL, Cmd_Set_OperationMode, 1, mode);
}
void TEF6686::extendBW(bool yesno) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Bandwidth_Options, 2, (yesno ? 400 : 950));
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Bandwidth_Options, 1, (yesno ? 400 : 950));
}
void TEF6686::SetFreq(uint16_t frequency) {
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 4, 1, frequency);
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 2, 1, frequency);
currentfreq = ((frequency + 5) / 10) * 10;
currentfreq2 = frequency;
}
void TEF6686::SetFreqAM(uint16_t frequency) {
devTEF_Set_Cmd(TEF_AM, Cmd_Tune_To, 4, 1, frequency);
devTEF_Set_Cmd(TEF_AM, Cmd_Tune_To, 2, 1, frequency);
}
void TEF6686::setOffset(int8_t offset) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_LevelOffset, 2, (offset * 10) - 70);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_LevelOffset, 1, (offset * 10) - 70);
}
void TEF6686::setAMOffset(int8_t offset) {
devTEF_Set_Cmd(TEF_AM, Cmd_Set_LevelOffset, 2, (offset * 10) - 70);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_LevelOffset, 1, (offset * 10) - 70);
}
void TEF6686::setFMBandw(uint16_t bandwidth) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Bandwidth, 4, 0, bandwidth * 10);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Bandwidth, 2, 0, bandwidth * 10);
}
void TEF6686::setAMBandw(uint16_t bandwidth) {
devTEF_Set_Cmd(TEF_AM, Cmd_Set_Bandwidth, 4, 0, bandwidth * 10);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_Bandwidth, 2, 0, bandwidth * 10);
}
void TEF6686::setAMCoChannel(uint16_t start, uint8_t level) {
uint8_t mode = 1;
if(start == 0) mode = 0;
devTEF_Set_Cmd(TEF_AM, Cmd_Set_CoChannelDet, 8, mode, 2, start * 10, 1000, level);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_CoChannelDet, 4, mode, 2, start * 10, 1000, level);
}
void TEF6686::setSoftmuteAM(uint8_t mode) {
devTEF_Set_Cmd(TEF_AM, Cmd_Set_Softmute_Max, 4, mode, 250);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_Softmute_Max, 2, mode, 250);
}
void TEF6686::setSoftmuteFM(uint8_t mode) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Softmute_Max, 4, mode, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Softmute_Max, 2, mode, 200);
}
void TEF6686::setAMNoiseBlanker(uint16_t start) {
devTEF_Set_Cmd(TEF_AM, Cmd_Set_NoiseBlanker, 4, (start == 0) ? 0 : 1, (start == 0) ? 1000 : start * 10);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_NoiseBlanker_Audio, 4, (start == 0) ? 0 : 1, 1000);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_NoiseBlanker, 2, (start == 0) ? 0 : 1, (start == 0) ? 1000 : start * 10);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_NoiseBlanker_Audio, 2, (start == 0) ? 0 : 1, 1000);
}
void TEF6686::setAMAttenuation(uint16_t start) {
devTEF_Set_Cmd(TEF_AM, Cmd_Set_Antenna, 2, start * 10);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_Antenna, 1, start * 10);
}
void TEF6686::setFMABandw() {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Bandwidth, 4, 1, 3110);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Bandwidth, 2, 1, 3110);
}
void TEF6686::setiMS(bool mph) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_MphSuppression, 2, mph);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_MphSuppression, 1, mph);
}
void TEF6686::setEQ(bool eq) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_ChannelEqualizer, 2, eq);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_ChannelEqualizer, 1, eq);
}
bool TEF6686::getStereoStatus() {
@@ -244,117 +243,117 @@ bool TEF6686::getStereoStatus() {
}
void TEF6686::setMono(bool mono) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Min, 4, mono ? 2 : 0);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Min, 2, mono ? 2 : 0);
}
void TEF6686::setVolume(int8_t volume) {
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Volume, 2, volume * 10);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Volume, 1, volume * 10);
}
void TEF6686::setMute() {
mute = true;
if (mpxmode) devTEF_Set_Cmd(TEF_FM, Cmd_Set_Specials, 2, 0);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 2, 1);
if (mpxmode) devTEF_Set_Cmd(TEF_FM, Cmd_Set_Specials, 1, 0);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 1, 1);
}
void TEF6686::setUnMute() {
mute = false;
if (mpxmode) devTEF_Set_Cmd(TEF_FM, Cmd_Set_Specials, 2, 1);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 2, 0);
if (mpxmode) devTEF_Set_Cmd(TEF_FM, Cmd_Set_Specials, 1, 1);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 1, 0);
}
void TEF6686::setAGC(uint8_t agc) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_RFAGC, 2, agc * 10);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_RFAGC, 1, agc * 10);
}
void TEF6686::setAMAGC(uint8_t agc) {
devTEF_Set_Cmd(TEF_AM, Cmd_Set_RFAGC, 2, agc * 10);
devTEF_Set_Cmd(TEF_AM, Cmd_Set_RFAGC, 1, agc * 10);
}
void TEF6686::setDeemphasis(RADIO_FM_DEEMPHASIS timeconstant) {
switch (timeconstant) {
case DEEMPHASIS_50: devTEF_Set_Cmd(TEF_FM, Cmd_Set_Deemphasis, 2, 500); break;
case DEEMPHASIS_75: devTEF_Set_Cmd(TEF_FM, Cmd_Set_Deemphasis, 2, 750); break;
default: devTEF_Set_Cmd(TEF_FM, Cmd_Set_Deemphasis, 2, 0); break;
case DEEMPHASIS_50: devTEF_Set_Cmd(TEF_FM, Cmd_Set_Deemphasis, 1, 500); break;
case DEEMPHASIS_75: devTEF_Set_Cmd(TEF_FM, Cmd_Set_Deemphasis, 1, 750); break;
default: devTEF_Set_Cmd(TEF_FM, Cmd_Set_Deemphasis, 1, 0); break;
}
}
void TEF6686::setAudio(uint8_t audio) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Specials, 2, audio);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Specials, 1, audio);
mpxmode = (audio != 0);
}
void TEF6686::setFMSI(uint8_t mode) {
if(mode > 2) mode = 2;
if(mode < 1) mode = 1;
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StereoImprovement, 2, mode-1);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StereoImprovement, 1, mode-1);
}
void TEF6686::setFMSI_Time(uint16_t attack, uint16_t decay) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StBandBlend_Time, 4, attack, decay);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StBandBlend_Time, 2, attack, decay);
}
void TEF6686::setFMSI_Gain(uint16_t band1, uint16_t band2, uint16_t band3, uint16_t band4) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StBandBlend_Gain, 8, band1 * 10, band2 * 10, band3 * 10, band4 * 10);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StBandBlend_Gain, 4, band1 * 10, band2 * 10, band3 * 10, band4 * 10);
}
void TEF6686::setFMSI_Bias(int16_t band1, int16_t band2, int16_t band3, int16_t band4) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StBandBlend_Bias, 8, band1 - 250, band2 - 250, band3 - 250, band4 - 250);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StBandBlend_Bias, 4, band1 - 250, band2 - 250, band3 - 250, band4 - 250);
}
void TEF6686::setFMNoiseBlanker(uint16_t start) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_NoiseBlanker, 4, (start == 0) ? 0 : 1, (start == 0) ? 1000 : (start * 10));
devTEF_Set_Cmd(TEF_FM, Cmd_Set_NoiseBlanker, 2, (start == 0) ? 0 : 1, (start == 0) ? 1000 : (start * 10));
}
void TEF6686::setStereoLevel(uint8_t start) {
if (start == 0) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Level, 6, 0, start * 10, 60);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Noise, 6, 0, 240, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Mph, 6, 0, 240, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Level, 3, 0, start * 10, 60);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Noise, 3, 0, 240, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Mph, 3, 0, 240, 200);
} else {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Level, 6, 3, start * 10, 60);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Noise, 6, 3, 240, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Mph, 6, 3, 240, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Level, 3, 3, start * 10, 60);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Noise, 3, 3, 240, 200);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Stereo_Mph, 3, 3, 240, 200);
}
}
void TEF6686::setHighCutOffset(uint8_t start) {
if (start == 0) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Level, 6, 0, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Noise, 6, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Mph, 6, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Level, 3, 0, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Noise, 3, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Mph, 3, 0, 360, 300);
} else {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Level, 6, 3, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Noise, 6, 3, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Mph, 6, 3, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Level, 3, 3, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Noise, 3, 3, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Mph, 3, 3, 360, 300);
}
}
void TEF6686::setHighCutLevel(uint16_t limit) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Max, 4, 1, limit * 100);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_Highcut_Max, 2, 1, limit * 100);
}
void TEF6686::setStHiBlendLevel(uint16_t limit) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Max, 4, 1, limit * 100);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Max, 2, 1, limit * 100);
}
void TEF6686::setStHiBlendOffset(uint8_t start) {
if (start == 0) {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Level, 6, 0, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Noise, 6, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Mph, 6, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Level, 3, 0, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Noise, 3, 0, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Mph, 3, 0, 360, 300);
} else {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Level, 6, 3, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Noise, 6, 3, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Mph, 6, 3, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Level, 3, 3, start * 10, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Noise, 3, 3, 360, 300);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_StHiBlend_Mph, 3, 3, 360, 300);
}
}
void TEF6686::getStatus(int16_t *level, uint16_t *USN, uint16_t *WAM, int16_t *offset, uint16_t *bandwidth, uint16_t *modulation, int8_t *snr) {
devTEF_Radio_Get_Quality_Status(NULL, level, USN, WAM, offset, bandwidth, modulation, snr);
void TEF6686::getStatus(int16_t *level, uint16_t *USN, uint16_t *WAM, int16_t *offset, uint16_t *bandwidth, uint16_t *audiolevel, int8_t *snr) {
devTEF_Radio_Get_Quality_Status(NULL, level, USN, WAM, offset, bandwidth, audiolevel, snr);
}
void TEF6686::getStatusAM(int16_t *level, uint16_t *noise, uint16_t *cochannel, int16_t *offset, uint16_t *bandwidth, uint16_t *modulation, int8_t *snr) {
void TEF6686::getStatusAM(int16_t *level, uint16_t *noise, uint16_t *cochannel, int16_t *offset, uint16_t *bandwidth, uint16_t *audiolevel, int8_t *snr) {
uint8_t buf[14];
devTEF_Get_Cmd(TEF_AM, Cmd_Get_Quality_Data, buf, sizeof(buf));
if(level != NULL) *level = Convert8bto16b(buf + 2);
@@ -362,7 +361,7 @@ void TEF6686::getStatusAM(int16_t *level, uint16_t *noise, uint16_t *cochannel,
if(cochannel != NULL) *cochannel = Convert8bto16b(buf + 6);
if(offset != NULL) *offset = Convert8bto16b(buf + 8);
if(bandwidth != NULL) *bandwidth = Convert8bto16b(buf + 10) / 10;
if(modulation != NULL) *modulation = Convert8bto16b(buf + 12) / 10;
if(audiolevel != NULL) *audiolevel = Convert8bto16b(buf + 12) / 10;
if(level != NULL && *level < -200) *level = -200;
if(level != NULL && *level > 1200) *level = 1200;
if(snr != NULL) *snr = int(0.46222375 * (float)(*level) / 10 - 0.082495118 * (float)(*noise / 50) / 10) + 10;
@@ -449,7 +448,7 @@ void TEF6686::readRDS(byte showrdserrors) {
fs::File file;
if (rds.region == 1 && SPIFFS.begin(true)) {
delay(2);
delay(1);
if (currentfreq2 < 9000) file = SPIFFS.open("/USA_87-90.csv");
else if (currentfreq2 > 9000 && currentfreq2 < 9200) file = SPIFFS.open("/USA_90-92.csv");
else if (currentfreq2 > 9200 && currentfreq2 < 9400) file = SPIFFS.open("/USA_92-94.csv");
@@ -461,7 +460,6 @@ void TEF6686::readRDS(byte showrdserrors) {
else if (currentfreq2 > 10400 && currentfreq2 < 10600) file = SPIFFS.open("/USA_104-106.csv");
else if (currentfreq2 > 10600) file = SPIFFS.open("/USA_106-108.csv");
delay(2);
if (file) {
int i = 0;
while (file.available() && !isprint(file.peek())) {
@@ -1562,7 +1560,7 @@ void TEF6686::readRDS(byte showrdserrors) {
}
void TEF6686::clearRDS() {
devTEF_Set_Cmd(TEF_FM, Cmd_Set_RDS, 6, fullsearchrds ? 3 : 1, 1, 0);
devTEF_Set_Cmd(TEF_FM, Cmd_Set_RDS, 3, fullsearchrds ? 3 : 1, 1, 0);
rds.piBuffer.clear();
rds.stationName = rds.stationText = rds.stationNameLong = "";
rds.PTYN = rds.stationText32 = rds.RTContent1 = rds.RTContent2 = "";;
@@ -1651,11 +1649,11 @@ void TEF6686::clearRDS() {
void TEF6686::tone(uint16_t time, int16_t amplitude, uint16_t frequency) {
auto was_muted = mute;
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 2, 0);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 1, 0);
devTEF_Radio_Set_Wavegen(1, amplitude, frequency);
delay(time);
devTEF_Radio_Set_Wavegen(0, 0, 0);
if(was_muted) devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 2, 1);
if(was_muted) devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Mute, 1, 1);
}
void TEF6686::RDScharConverter(const char* input, wchar_t* output, size_t size, bool underscore) {
src/Tuner_Drv_Lithio.cpp
+15 -18
View File
@@ -2,41 +2,38 @@
#include <stdarg.h>
void devTEF_Set_Cmd(TEF_MODULE module, uint8_t cmd, uint16_t len, ...) {
uint16_t i, temp;
uint8_t buf[20];
if(len > 10) return;
uint8_t buf[22];
va_list vArgs;
va_start(vArgs, len);
buf[0] = module;
buf[1] = cmd;
buf[2] = 1;
for (i = 0; i < len; i++) {
temp = va_arg(vArgs, int);
buf[3 + i++] = High_16bto8b(temp);
buf[3 + i] = Low_16bto8b(temp);
for (uint16_t i = 0; i < len; i++) {
uint16_t temp = va_arg(vArgs, int);
buf[3 + 2*i] = High_16bto8b(temp);
buf[3 + 2*i + 1] = Low_16bto8b(temp);
}
va_end(vArgs);
Tuner_WriteBuffer(buf, len + 3);
Tuner_WriteBuffer(buf, len * 2 + 3);
}
bool devTEF_Get_Cmd(TEF_MODULE module, uint8_t cmd, uint8_t *receive, uint16_t len) {
uint8_t buf[3];
buf[0] = module;
buf[1] = cmd;
buf[2] = 1;
uint8_t buf[3] = {module, cmd, 1};
Tuner_WriteBuffer(buf, 3);
Tuner_WriteBuffer(buf, sizeof(buf));
return Tuner_ReadBuffer(receive, len);
}
uint8_t devTEF_APPL_Get_Operation_Status() {
uint8_t buf[2];
while(!devTEF_Get_Cmd(TEF_APPL, Cmd_Get_Operation_Status, buf, sizeof(buf))) delay(3);
while(!devTEF_Get_Cmd(TEF_APPL, Cmd_Get_Operation_Status, buf, sizeof(buf))) delay(1);
return Convert8bto16b(buf);
}
void 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) {
void 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 *audiolevel, int8_t *snr) {
uint8_t buf[14];
devTEF_Get_Cmd(TEF_FM, Cmd_Get_Quality_Data, buf, sizeof(buf));
if(status != NULL) *status = Convert8bto16b(buf);
@@ -45,7 +42,7 @@ void devTEF_Radio_Get_Quality_Status(uint16_t *status, int16_t *level, uint16_t
if(wam != NULL) *wam = Convert8bto16b(buf + 6);
if(offset != NULL) *offset = Convert8bto16b(buf + 8);
if(bandwidth != NULL) *bandwidth = Convert8bto16b(buf + 10) / 10;
if(mod != NULL) *mod = Convert8bto16b(buf + 12) / 10;
if(audiolevel != NULL) *audiolevel = Convert8bto16b(buf + 12) / 10;
if (*level < -200) *level = -200;
if (*level > 1200) *level = 1200;
if(snr != NULL) *snr = int(0.46222375 * (float)(*level) / 10 - 0.082495118 * (float)(*usn) / 10) + 10;
@@ -74,7 +71,7 @@ void devTEF_Radio_Get_RDS_Data(uint16_t *status, uint16_t *A_block, uint16_t *B_
}
void devTEF_Radio_Set_Wavegen(bool mode, int16_t amplitude, uint16_t freq) {
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Input, 2, mode ? 240 : 0);
if (mode) devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_WaveGen, 12, 5, 0, amplitude * 10, freq, amplitude * 10, freq);
else devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_WaveGen, 12, 0);
devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_Input, 1, mode ? 240 : 0);
if (mode) devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_WaveGen, 6, 5, 0, amplitude * 10, freq, amplitude * 10, freq);
else devTEF_Set_Cmd(TEF_AUDIO, Cmd_Set_WaveGen, 6, 0);
}
src/Tuner_Interface.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ bool Tuner_WriteBuffer(unsigned char *buf, uint16_t len) {
bool Tuner_ReadBuffer(unsigned char *buf, uint16_t len) {
Wire.requestFrom(TEF668X_ADDRESS, len);
if (Wire.available() == len) {
if (Wire.available() >= len) {
for (uint16_t i = 0; i < len; i++) buf[i] = Wire.read();
return true;
}
src/comms.cpp
+17 -35
View File
@@ -411,7 +411,7 @@ void XDRGTKRoutine() {
}
}
if (XDRGTKdata) {
if(XDRGTKdata) {
switch (buff[0])
{
case 'A': {
@@ -423,8 +423,8 @@ void XDRGTKRoutine() {
radio.setAGC(92);
fmagc = 92;
} else {
radio.setAMAGC(102);
amagc = 102;
radio.setAMAGC(100);
amagc = 100;
}
break;
case 1:
@@ -508,35 +508,18 @@ void XDRGTKRoutine() {
} case 'F': {
XDRBWset = atoi(buff + 1);
DataPrint("F" + String(XDRBWset) + "\n");
if (XDRBWset < 0) {
BWset = 0;
} else if (XDRBWset < 16) {
BWset = XDRBWset + 1;
}
if (XDRBWset < 0) BWset = 0;
else if (XDRBWset < 16) BWset = XDRBWset + 1;
doBW();
break;
} case 'G': {
byte offsetg = atoi(buff + 1);
if (offsetg == 0) {
iMSset = 1;
EQset = 1;
DataPrint("G00\n");
}
if (offsetg == 10) {
iMSset = 1;
EQset = 0;
DataPrint("G10\n");
}
if (offsetg == 1) {
iMSset = 0;
EQset = 1;
DataPrint("G01\n");
}
if (offsetg == 11) {
iMSset = 0;
EQset = 0;
DataPrint("G11\n");
}
uint8_t offsetg = strtoul(buff + 1, NULL, 2);
iMSset = (offsetg & 2) == 2;
EQset = (offsetg & 1) == 1;
if (offsetg == 0) DataPrint("G00\n");
else if (offsetg == 2) DataPrint("G10\n");
else if (offsetg == 1) DataPrint("G01\n");
else if (offsetg == 3) DataPrint("G11\n");
updateiMS();
updateEQ();
break;
@@ -747,7 +730,7 @@ void XDRGTKRoutine() {
doBW();
break;
case 'w': {
unsigned int bwtemp = atoi(buff + 2);
uint32_t bwtemp = atoi(buff + 2);
switch (bwtemp) {
case 0: BWset = 0; break;
case 56000: BWset = 1; break;
@@ -770,7 +753,6 @@ void XDRGTKRoutine() {
doBW();
break;
}
case '\0':
radio.setMute();
if (!screenmute) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
@@ -808,7 +790,7 @@ void XDRGTKRoutine() {
}
break;
} case 'W': {
unsigned int bwtemp = atoi(buff + 1);
uint32_t bwtemp = atoi(buff + 1);
switch (bwtemp) {
case 0: BWset = 0; break;
case 56000: BWset = 1; break;
@@ -851,8 +833,8 @@ void XDRGTKRoutine() {
if (BAND_FM) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
else if (BAND_OIRT) DataPrint("T" + String(frequency_OIRT * 10) + "\n");
else DataPrint("T" + String(frequency_AM) + "\n");
if (StereoToggle) DataPrint("B0\n"); else DataPrint("B1\n");
if (XDRGTKMuteScreen) MuteScreen(1);
if(StereoToggle) DataPrint("B0\n"); else DataPrint("B1\n");
if(XDRGTKMuteScreen) MuteScreen(1);
break;
} case 'X': {
XDRGTKTCP = false;
@@ -889,7 +871,7 @@ void XDRGTKRoutine() {
void passwordcrypt() {
int generated = 0;
while (generated < 16) {
while(generated < 16) {
byte randomValue = random(0, 26);
char letter = randomValue + 'a';
if (randomValue > 26) letter = (randomValue - 26);
src/globals.cpp
+4 -4
View File
@@ -15,7 +15,7 @@ bool beepresetstart;
bool beepresetstop, BWreset, bwtouchtune;
bool BWtune, change, clockampm;
bool direction, dropout;
bool dynamicPTYold, edgebeep, externaltune;
bool edgebeep, externaltune;
bool findMemoryAF;
bool firstTouchHandled = false;
bool flashing;
@@ -127,7 +127,7 @@ byte scanhold;
byte scanmodeold;
byte screensaverOptions[5] = {0, 3, 10, 30, 60};
byte screensaverset;
byte showmodulation;
byte showaudio;
byte showrdserrors;
byte showSWMIBand;
byte submenu;
@@ -306,8 +306,8 @@ unsigned long flashingtimer;
unsigned long keypadtimer;
unsigned long lastTouchTime = 0;
unsigned long lowsignaltimer;
unsigned long ModulationpreviousMillis;
unsigned long ModulationpeakPreviousMillis;
unsigned long AudiopreviousMillis;
unsigned long AudiopeakPreviousMillis;
unsigned long NTPtimer;
unsigned long peakholdmillis;
unsigned long processed_rdsblocksold[33];
src/gui.cpp
+11 -11
View File
@@ -893,7 +893,7 @@ void ShowOneLine(byte position, byte item, bool selected) {
FullLineSprite.setTextDatum(TR_DATUM);
FullLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
FullLineSprite.drawString((showmodulation ? textUI(28) : textUI(27)), 298, 2);
FullLineSprite.drawString((showaudio ? textUI(28) : textUI(27)), 298, 2);
break;
case RDSSETTINGS:
@@ -1972,7 +1972,7 @@ void ShowOneButton(byte position, byte item, bool selected) {
PSSprite.drawString(shortLine(removeNewline(textUI(60))), 75, 1);
PSSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
PSSprite.drawString((showmodulation ? textUI(28) : textUI(27)), 75, 15);
PSSprite.drawString((showaudio ? textUI(28) : textUI(27)), 75, 15);
break;
case RDSSETTINGS:
@@ -2969,7 +2969,6 @@ void BuildAdvancedRDS() {
stationIDold = " ";
stationStateold = " ";
af_counterold = 254;
dynamicPTYold = false;
hasafold = false;
haseonold = false;
BWreset = true;
@@ -2987,6 +2986,7 @@ void BuildAdvancedRDS() {
radio.rds.PTYN.call();
radio.rds.ECC.call();
radio.rds.hasArtificialhead.call();
radio.rds.hasDynamicPTY.call();
radio.rds.hasCompressed.call();
radio.rds.hasStereo.call();
radio.rds.TP.call();
@@ -3021,18 +3021,18 @@ void BuildDisplay() {
tft.drawLine(257, 144, 257, 180, FrameColor);
tft.drawLine(248, 30, 248, 0, FrameColor);
if (!showmodulation) tft.drawLine(16, 143, 189, 143, GreyoutColor); else tft.drawLine(16, 143, 189, 143, ActiveColor);
if (!showaudio) tft.drawLine(16, 143, 189, 143, GreyoutColor); else tft.drawLine(16, 143, 189, 143, ActiveColor);
for (byte segments = 0; segments < 93; segments++) {
if (segments > 54) {
if (((segments - 53) % 10) == 0) {
tft.fillRect(22 + (2 * segments), 112, 2, 2, BarSignificantColor);
if (!showmodulation) tft.fillRect(22 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(22 + (2 * segments), 141, 2, 2, BarSignificantColor);
if (!showaudio) tft.fillRect(22 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(22 + (2 * segments), 141, 2, 2, BarSignificantColor);
}
} else {
if (((segments + 1) % 6) == 0) {
tft.fillRect(22 + (2 * segments), 112, 2, 2, BarInsignificantColor);
if (!showmodulation) tft.fillRect(22 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(22 + (2 * segments), 141, 2, 2, BarInsignificantColor);
if (!showaudio) tft.fillRect(22 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(22 + (2 * segments), 141, 2, 2, BarInsignificantColor);
}
}
}
@@ -3054,7 +3054,7 @@ void BuildDisplay() {
tftPrint(ALEFT, "+10", 127, 115, ActiveColor, ActiveColorSmooth, 16);
tftPrint(ALEFT, "+30", 160, 115, ActiveColor, ActiveColorSmooth, 16);
if (!showmodulation) {
if (!showaudio) {
tftPrint(ACENTER, "A", 7, 128, GreyoutColor, BackgroundColor, 16);
tftPrint(ALEFT, "10", 24, 144, GreyoutColor, BackgroundColor, 16);
tftPrint(ALEFT, "30", 54, 144, GreyoutColor, BackgroundColor, 16);
@@ -3545,9 +3545,9 @@ void MenuUpDown(bool dir) {
break;
case ITEM3:
showmodulation = !showmodulation;
showaudio = !showaudio;
OneBigLineSprite.drawString((showmodulation ? textUI(28) : textUI(27)), 135, 0);
OneBigLineSprite.drawString((showaudio ? textUI(28) : textUI(27)), 135, 0);
OneBigLineSprite.pushSprite(24, 118);
break;
@@ -4816,7 +4816,7 @@ void DoMenu() {
case ITEM3:
Infoboxprint(textUI(60));
OneBigLineSprite.drawString((showmodulation ? textUI(28) : textUI(27)), 135, 0);
OneBigLineSprite.drawString((showaudio ? textUI(28) : textUI(27)), 135, 0);
OneBigLineSprite.pushSprite(24, 118);
break;
@@ -5511,7 +5511,7 @@ void DoMenu() {
} else {
if (menupage == CONNECTIVITY && menuoption == ITEM2) {
tryWiFi();
delay(2000);
delay(1750);
}
if (menupage == DISPLAYSETTINGS && menuoption == ITEM5) {
doTheme();
src/main.cpp
+125 -95
View File
@@ -38,12 +38,19 @@ void panic(Args... args) {
}
#pragma region helpers
inline bool isSignalQualityGood(int usn, int wam, int ostatus, int threshold_multiplier = SCAN_SIGNAL_THRESHOLD_USN_MULTIPLIER, int ostatus_threshold = SCAN_SIGNAL_THRESHOLD_OSTATUS) {
return (usn < fmscansens * threshold_multiplier) &&
(wam < SCAN_SIGNAL_THRESHOLD_WAM) &&
(ostatus < ostatus_threshold) &&
(ostatus > -ostatus_threshold);
}
inline void Round30K(unsigned int freq) {
if (freq % FREQ_OIRT_STEP_30K == 1) frequency_OIRT = (freq + 1);
else if (freq % FREQ_OIRT_STEP_30K == 0) frequency_OIRT = (freq - 1);
}
void Round50K(unsigned int freq) {
inline void Round50K(unsigned int freq) {
if (freq % 10 < 3) frequency = (freq - freq % 10);
else if (freq % 10 > 2 && freq % 10 < 8) frequency = (freq - (freq % 10 - 5));
else if (freq % 10 > 7) frequency = (freq - (freq % 10) + 10);
@@ -95,7 +102,7 @@ void doLog() {
case 2: ShowFreq(4); break;
}
delay(200);
delay(DELAY_UI_UPDATE_MS);
ShowFreq(0);
}
autologged = true;
@@ -112,33 +119,58 @@ const char* textUI(uint16_t number) {
else return (const char*)pgm_read_ptr(&(myLanguage[language][number]));
}
inline bool shouldHighlightBWButton(byte temp, byte set) {
return (set == temp) ||
(temp == 17 && set == 0) ||
(temp == 18 && !iMSset) ||
(temp == 19 && !EQset);
}
inline const char* getBWButtonLabel(byte temp, bool isFM) {
constexpr byte BW_OK_BUTTON = 20;
if (temp == BW_OK_BUTTON) return "OK";
return isFM ? BWButtonLabelsFM[temp - 1] : BWButtonLabelsAM[temp - 1];
}
void doBWtuneUp() {
rotary = 0;
constexpr byte BW_OK_BUTTON = 20;
constexpr byte BW_AM_MAX = 4;
if (band < BAND_GAP) {
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsFM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp || (BWsettemp == 17 && BWset == 0) || (BWsettemp == 18 && !iMSset) || (BWsettemp == 19 && !EQset) ? true : false), false);
// FM band
drawButton(getBWButtonLabel(BWsettemp, true), BWsettemp - 1, shouldHighlightBWButton(BWsettemp, BWset), false);
BWsettemp++;
if (BWsettemp > 20) BWsettemp = 1;
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsFM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp || (BWsettemp == 17 && BWset == 0) || (BWsettemp == 18 && !iMSset) || (BWsettemp == 19 && !EQset) ? true : false), true);
if (BWsettemp > BW_OK_BUTTON) BWsettemp = 1;
drawButton(getBWButtonLabel(BWsettemp, true), BWsettemp - 1, shouldHighlightBWButton(BWsettemp, BWset), true);
} else {
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsAM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp ? true : false), false);
// AM band
drawButton(getBWButtonLabel(BWsettemp, false), BWsettemp - 1, (BWset == BWsettemp), false);
BWsettemp++;
if (BWsettemp > 4 && BWsettemp < 20) BWsettemp = 20; else if (BWsettemp > 20) BWsettemp = 1;
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsAM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp ? true : false), true);
if (BWsettemp > BW_AM_MAX && BWsettemp < BW_OK_BUTTON) BWsettemp = BW_OK_BUTTON;
else if (BWsettemp > BW_OK_BUTTON) BWsettemp = 1;
drawButton(getBWButtonLabel(BWsettemp, false), BWsettemp - 1, (BWset == BWsettemp), true);
}
}
void doBWtuneDown() {
rotary = 0;
constexpr byte BW_OK_BUTTON = 20;
constexpr byte BW_AM_MAX = 4;
if (band < BAND_GAP) {
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsFM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp || (BWsettemp == 17 && BWset == 0) || (BWsettemp == 18 && !iMSset) || (BWsettemp == 19 && !EQset) ? true : false), false);
// FM band
drawButton(getBWButtonLabel(BWsettemp, true), BWsettemp - 1, shouldHighlightBWButton(BWsettemp, BWset), false);
BWsettemp--;
if (BWsettemp > 20 || BWsettemp == 0) BWsettemp = 20;
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsFM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp || (BWsettemp == 17 && BWset == 0) || (BWsettemp == 18 && !iMSset) || (BWsettemp == 19 && !EQset) ? true : false), true);
if (BWsettemp > BW_OK_BUTTON || BWsettemp == 0) BWsettemp = BW_OK_BUTTON;
drawButton(getBWButtonLabel(BWsettemp, true), BWsettemp - 1, shouldHighlightBWButton(BWsettemp, BWset), true);
} else {
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsAM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp ? true : false), false);
// AM band
drawButton(getBWButtonLabel(BWsettemp, false), BWsettemp - 1, (BWset == BWsettemp), false);
BWsettemp--;
if (BWsettemp > 4 && BWsettemp < 20) BWsettemp = 4; else if (BWsettemp == 0) BWsettemp = 20;
drawButton((BWsettemp == 20 ? "OK" : BWButtonLabelsAM[BWsettemp - 1]), BWsettemp - 1, (BWset == BWsettemp ? true : false), true);
if (BWsettemp > BW_AM_MAX && BWsettemp < BW_OK_BUTTON) BWsettemp = BW_AM_MAX;
else if (BWsettemp == 0) BWsettemp = BW_OK_BUTTON;
drawButton(getBWButtonLabel(BWsettemp, false), BWsettemp - 1, (BWset == BWsettemp), true);
}
}
@@ -146,8 +178,8 @@ void ShowStereoStatus() {
if (StereoToggle) {
if (band < BAND_GAP) Stereostatus = radio.getStereoStatus(); else Stereostatus = false;
if (Stereostatus != Stereostatusold) {
if (Stereostatus && !screenmute) tft.drawBitmap(32, 5, Stereo, 32, 22, StereoColor);
else if (!screenmute) tft.drawBitmap(32, 5, Stereo, 32, 22, GreyoutColor);
if (Stereostatus && !screenmute) tft.drawBitmap(STEREO_ICON_X, STEREO_ICON_Y, Stereo, 32, 22, StereoColor);
else if (!screenmute) tft.drawBitmap(STEREO_ICON_X, STEREO_ICON_Y, Stereo, 32, 22, GreyoutColor);
Stereostatusold = Stereostatus;
}
}
@@ -156,20 +188,20 @@ void ShowStereoStatus() {
void ShowRSSI() {
if (wifi) rssi = WiFi.RSSI(); else rssi = 0;
if (rssiold != rssi) {
rssiold = rssi;
if (!wifi && batterydetect) tft.drawBitmap(282, 3, WiFi4, 30, 25, BackgroundColor);
else if (rssi == 0) tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor);
else if (rssi > -50 && rssi < 0) tft.drawBitmap(282, 3, WiFi4, 30, 25, WifiColorHigh);
if (!wifi && batterydetect) tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi4, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, BackgroundColor);
else if (rssi == 0) tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi4, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, GreyoutColor);
else if (rssi > -50 && rssi < 0) tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi4, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, WifiColorHigh);
else if (rssi > -60) {
tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor);
tft.drawBitmap(282, 3, WiFi3, 30, 25, WifiColorHigh);
tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi4, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, GreyoutColor);
tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi3, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, WifiColorHigh);
} else if (rssi > -70) {
tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor);
tft.drawBitmap(282, 3, WiFi2, 30, 25, WifiColorLow);
tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi4, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, GreyoutColor);
tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi2, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, WifiColorLow);
} else if (rssi < -70) {
tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor);
tft.drawBitmap(282, 3, WiFi1, 30, 25, WifiColorLow);
tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi4, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, GreyoutColor);
tft.drawBitmap(WIFI_ICON_X, WIFI_ICON_Y, WiFi1, WIFI_ICON_WIDTH, WIFI_ICON_HEIGHT, WifiColorLow);
}
rssiold = rssi;
}
}
@@ -237,8 +269,8 @@ inline void updateCodetect() {
void SetTunerPatch() {
if(FORBIDDEN_TUNER(TEF)) {
radio.init(102);
uint16_t device, hw, sw;
radio.getIdentification(&device, &hw, &sw);
uint16_t hw, sw;
radio.getIdentification(&hw, &sw);
TEF = highByte(hw) * 100 + highByte(sw);
tft.fillScreen(BackgroundColor);
analogWrite(CONTRASTPIN, map(ContrastSet, 0, 100, 15, 255));
@@ -292,7 +324,6 @@ void WakeToSleep(bool yes) {
switch (poweroptions) {
case LCD_OFF:
MuteScreen(1);
StoreFrequency();
break;
case LCD_BRIGHTNESS_1_PERCENT:
analogWrite(CONTRASTPIN, map(ContrastSet / 100, 0, 100, 15, 255));
@@ -554,8 +585,8 @@ void BANDBUTTONPress() {
}
}
}
while (digitalRead(BANDBUTTON) == LOW) delay(50);
delay(75);
while (digitalRead(BANDBUTTON) == LOW) delay(DELAY_BUTTON_DEBOUNCE_MS);
delay(DELAY_BUTTON_DEBOUNCE_EXTRA_MS);
}
void LimitAMFrequency() {
@@ -613,8 +644,8 @@ void BWButtonPress() {
}
}
}
while (digitalRead(BWBUTTON) == LOW) delay(50);
delay(75);
while (digitalRead(BWBUTTON) == LOW) delay(DELAY_BUTTON_DEBOUNCE_MS);
delay(DELAY_BUTTON_DEBOUNCE_EXTRA_MS);
}
void doStereoToggle() {
@@ -749,22 +780,19 @@ void toggleiMSEQ() {
updateiMS();
updateEQ();
iMSEQ = 0;
}
if (iMSEQ == 3) {
} else if (iMSEQ == 3) {
iMSset = 1;
EQset = 0;
updateiMS();
updateEQ();
iMSEQ = 4;
}
if (iMSEQ == 2) {
} else if (iMSEQ == 2) {
iMSset = 0;
EQset = 1;
updateiMS();
updateEQ();
iMSEQ = 3;
}
if (iMSEQ == 1) {
} else if (iMSEQ == 1) {
iMSset = 1;
EQset = 1;
updateiMS();
@@ -853,7 +881,6 @@ void ShowNum(int val) {
}
byte numval[16] = {2, 3, 127, 5, 6, 0, 9, 13, 8, 7, 4, 1, 0, 0, 0, 0};
int GetNum() {
if(!gpio_chip) return -1;
// Get input port 0 and 1
@@ -1224,7 +1251,7 @@ void later_setup_periph() {
}
uint16_t device, hw, sw;
radio.getIdentification(&device, &hw, &sw);
device = radio.getIdentification(&hw, &sw);
if (TEF != (highByte(hw) * 100 + highByte(sw))) SetTunerPatch();
if (lowByte(device) == 14) {
@@ -1274,7 +1301,7 @@ void later_setup_periph() {
}
} else console.print("RX8010SJ is not available at address " + String(RX8010SJ_ADDRESS, HEX));
if(analogRead(BATTERY_PIN) < 200) batterydetect = false;
if(analogRead(BATTERY_PIN) < BATTERY_DETECT_THRESHOLD) batterydetect = false;
else console.print("Battery detected.");
}
@@ -1374,13 +1401,10 @@ void setup() {
attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A), read_encoder, CHANGE);
attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B), read_encoder, CHANGE);
tft.setSwapBytes(true);
SPIFFS.begin();
FrequencySprite.createSprite(200, 50);
FrequencySprite.setTextDatum(TR_DATUM);
FrequencySprite.setSwapBytes(true);
FrequencySprite.loadFont(FREQFONT0, 0);
FrequencySprite.loadFont(FREQFONT1, 1);
FrequencySprite.loadFont(FREQFONT2, 2);
@@ -1389,29 +1413,23 @@ void setup() {
FrequencySprite.loadFont(FREQFONT5, 5);
GeneralTextSprite.createSprite(308, 28);
GeneralTextSprite.setSwapBytes(true);
GeneralTextSprite.loadFont(FONT48, 2);
PSSprite.createSprite(150, 32);
PSSprite.setSwapBytes(true);
PSSprite.loadFont(FONT16, 0);
PSSprite.loadFont(FONT16_CHS, 1);
PSSprite.loadFont(FONT28, 2);
PSSprite.loadFont(FONT28_CHS, 3);
SquelchSprite.createSprite(27, 19);
SquelchSprite.setSwapBytes(true);
FullLineSprite.createSprite(308, 19);
FullLineSprite.setSwapBytes(true);
OneBigLineSprite.createSprite(270, 30);
OneBigLineSprite.setSwapBytes(true);
SignalSprite.createSprite(80, 48);
SignalSprite.loadFont(FONT28, 0);
SignalSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
SignalSprite.setSwapBytes(true);
UpdateFonts();
tft.fillScreen(BackgroundColor);
@@ -1491,17 +1509,17 @@ void setup() {
for (int x = 0; x <= ContrastSet; x++) {
analogWrite(CONTRASTPIN, map(x, 0, 100, 15, 255));
delay(8);
delay(5);
}
console.print("Firmware " + String(VERSION));
console.print("Compiled at " + String(__TIME__) + " " + String(__DATE__));
if(!tef_found) {
console.print(textUI(6));
while (true) delay(1);
while (true) delay(100);
}
TEF = EEPROM.readByte(EE_BYTE_TEF);
if(FORBIDDEN_TUNER(TEF)) SetTunerPatch();
@@ -1513,7 +1531,7 @@ void setup() {
}
if (wifi) {
console.print("Trying WiFi, setting clock to 160 MHz");
console.print("Trying WiFi");
tryWiFi();
delay(1750);
} else {
@@ -1521,7 +1539,7 @@ void setup() {
Udp.stop();
}
while(digitalRead(ROTARY_BUTTON) == LOW) delay(75);
while(digitalRead(ROTARY_BUTTON) == LOW) delay(100);
console.print("Init done.");
@@ -1553,25 +1571,28 @@ void setup() {
console.reset();
}
void ShowModLevel();
void ShowAudioLevel();
void doSquelch();
void loop() {
void handleWiFi() {
if (wifi && !menu) {
webserver.handleClient();
if (millis() >= udplogtimer + 500) {
if (millis() >= udplogtimer + UDP_LOG_INTERVAL_MS) {
sendUDPlog();
udplogtimer = millis();
}
if (millis() >= NTPtimer + 1800000) {
if (millis() >= NTPtimer + NTP_UPDATE_INTERVAL_MS) {
NTPupdate();
NTPtimer = millis();
}
}
}
void handleTouch() {
if (hardwaremodel == PORTABLE_TOUCH_ILI9341 && touch_detect) {
if (tft.getTouchRawZ() > 250) {
if (tft.getTouchRawZ() > TOUCH_RAW_Z_THRESHOLD) {
uint16_t x, y;
tft.getTouch(&x, &y);
if (x > 0 || y > 0) {
@@ -1579,34 +1600,45 @@ void loop() {
doTouchEvent(x, y);
firstTouchHandled = true;
lastTouchTime = millis();
} else if (touchrepeat && millis() - lastTouchTime >= 500) doTouchEvent(x, y);
} else if (touchrepeat && millis() - lastTouchTime >= DELAY_TOUCH_REPEAT_MS) {
doTouchEvent(x, y);
}
}
} else {
firstTouchHandled = false;
touch_detect = false;
}
}
}
Communication();
void handleTimers() {
// tottimer is like the time of the last interaction
if (tot != 0 && millis() >= tottimer + (tot * 60000)) deepSleep();
if (tot != 0 && millis() >= tottimer + (tot * TOT_MULTIPLIER_MS)) {
deepSleep();
}
if (freq_in != 0 && millis() >= keypadtimer + 2000) {
if (freq_in != 0 && millis() >= keypadtimer + DELAY_KEYPAD_TIMEOUT_MS) {
freq_in = 0;
ShowFreq(0);
}
}
void loop() {
handleWiFi();
handleTouch();
Communication();
handleTimers();
if (scandxmode) {
unsigned long waitTime = (scanhold == 0) ? 500 : (scanhold * 1000);
if (!scanholdflag) scanholdflag = (USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80) && (OStatus > -80);
unsigned long waitTime = (scanhold == 0) ? SCAN_HOLD_DEFAULT_MS : (scanhold * 1000);
if (!scanholdflag) scanholdflag = isSignalQualityGood(USN, WAM, OStatus);
bool bypassMillisCheck = scanholdonsignal && !scanholdflag;
bool shouldScan = bypassMillisCheck || (!bypassMillisCheck && (millis() >= scantimer + waitTime));
if (shouldScan) {
if (scanmute && scanholdonsignal) {
radio.setMute();
if (!screenmute) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
if (!screenmute) tft.drawBitmap(SPEAKER_ICON_X, SPEAKER_ICON_Y, Speaker, SPEAKER_ICON_WIDTH, SPEAKER_ICON_HEIGHT, PrimaryColor);
SQ = true;
}
scanholdflag = false;
@@ -1663,7 +1695,7 @@ void loop() {
if (RDSstatus && radio.rds.correctPI != 0) cancelDXScan();
break;
case SIGNAL:
if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80 && OStatus > -80) && (Squelch < SStatus || Squelch == 920)) cancelDXScan();
if (isSignalQualityGood(USN, WAM, OStatus) && (Squelch < SStatus || Squelch == SQUELCH_MAX_VALUE)) cancelDXScan();
break;
}
}
@@ -1700,7 +1732,7 @@ void loop() {
radio.SetFreq(x);
unsigned long millisold = millis();
while (millis() - millisold < 187) {
if (!screenmute && !advancedRDS) ShowModLevel();
if (!screenmute && !advancedRDS) ShowAudioLevel();
}
if (radio.rds.correctPI == radio.getBlockA()) {
frequency = x;
@@ -1792,7 +1824,7 @@ void loop() {
if ((SStatus / 10 > LowLevelSet) && !LowLevelInit && !BWtune && !menu && band < BAND_GAP) {
if (!screenmute && !advancedRDS && !rdsstatscreen && !afscreen) {
if (showmodulation) {
if (showaudio) {
tftPrint(ALEFT, "10", 24, 144, ActiveColor, ActiveColorSmooth, 16);
tftPrint(ALEFT, "30", 54, 144, ActiveColor, ActiveColorSmooth, 16);
tftPrint(ALEFT, "50", 84, 144, ActiveColor, ActiveColorSmooth, 16);
@@ -1815,7 +1847,7 @@ void loop() {
tftPrint(ALEFT, "PS", 3, 193, ActiveColor, ActiveColorSmooth, 16);
tftPrint(ALEFT, "RT", 3, 221, ActiveColor, ActiveColorSmooth, 16);
tftPrint(ALEFT, "PTY", 3, 163, ActiveColor, ActiveColorSmooth, 16);
if (!showmodulation) tft.drawLine(16, 143, 189, 143, GreyoutColor); else tft.drawLine(16, 143, 189, 143, ActiveColor);
if (!showaudio) tft.drawLine(16, 143, 189, 143, GreyoutColor); else tft.drawLine(16, 143, 189, 143, ActiveColor);
}
LowLevelInit = true;
}
@@ -1823,7 +1855,7 @@ void loop() {
if ((SStatus / 10 <= LowLevelSet) && band < BAND_GAP) {
if (LowLevelInit && !BWtune && !menu) {
if (!screenmute && !rdsstatscreen && !afscreen && !advancedRDS) {
if(showmodulation) {
if(showaudio) {
tftPrint(ALEFT, "10", 24, 144, GreyoutColor, BackgroundColor, 16);
tftPrint(ALEFT, "30", 54, 144, GreyoutColor, BackgroundColor, 16);
tftPrint(ALEFT, "50", 84, 144, GreyoutColor, BackgroundColor, 16);
@@ -1875,7 +1907,7 @@ void loop() {
doSquelch();
if (millis() >= tuningtimer + 200) readRds();
GetData();
if (!screenmute && !rdsstatscreen && !afscreen && !advancedRDS) ShowModLevel();
if (!screenmute && !rdsstatscreen && !afscreen && !advancedRDS) ShowAudioLevel();
}
}
@@ -2466,7 +2498,7 @@ void ModeButtonPress() {
if (menuopen) {
if (menupage == CONNECTIVITY && menuoption == ITEM2 && wifi) {
tryWiFi();
delay(2000);
delay(1750);
}
if (menupage == DISPLAYSETTINGS && menuoption == ITEM5) doTheme();
menuopen = false;
@@ -2582,7 +2614,7 @@ void ButtonPress() {
case 1: ShowFreq(3); break;
case 2: ShowFreq(4); break;
}
delay(200);
delay(DELAY_UI_UPDATE_MS);
EdgeBeeper();
while (digitalRead(ROTARY_BUTTON) == LOW) delay(50);
ShowFreq(0);
@@ -2925,8 +2957,8 @@ void ShowFreq(int mode) {
FrequencySprite.setTextDatum(TR_DATUM);
FrequencySprite.setTextColor(FreqColor, FreqColorSmooth, false);
} else {
FrequencySprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
FrequencySprite.setTextDatum(TC_DATUM);
FrequencySprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
}
switch (mode) {
@@ -3006,15 +3038,14 @@ void ShowSignalLevel() {
CNold = 0;
}
}
byte MPprint = constrain(map(MP, 0, 1000, 0, 99), 0, 99);
byte MPprint = constrain(map(MP, 0, 1000, 0, 99), 0, 99);
if (MPprint != MPold) {
tftReplace(ARIGHT, String(MPold), (band < BAND_GAP ? String(MPprint) : "--"), 299, 165, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
MPold = MPprint;
}
byte USprint = constrain(map(US, 0, 1000, 0, 99), 0, 99);
if (USprint != USold) {
tftReplace(ARIGHT, String(USold), (band < BAND_GAP ? String(USprint) : "--"), 299, 147, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
USold = USprint;
@@ -3028,7 +3059,6 @@ void ShowSignalLevel() {
if (unit == 2) SStatusprint = round((float(SStatus) / 10.0 - 10.0 * log10(75) - 90.0) * 10.0);
static int DisplayedSignalSegments = 0;
if (SStatusprint > (SStatusold + 3) || SStatusprint < (SStatusold - 3)) {
if (advancedRDS) tftReplace(ARIGHT, String(SStatusold / 10) + "." + String(abs(SStatusold % 10)), String(SStatusprint / 10) + "." + String(abs(SStatusprint % 10)), 273, 51, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
else {
@@ -3176,8 +3206,8 @@ void ShowOffset() {
}
}
void ShowModLevel() {
if (showmodulation) {
void ShowAudioLevel() {
if(showaudio) {
int segments;
MStatus = (MStatus > 120) ? 120 : MStatus;
@@ -3185,9 +3215,9 @@ void ShowModLevel() {
segments = constrain(map(MStatus, 0, 120, 0, 86), 0, 86);
if (segments < DisplayedSegments && (millis() - ModulationpreviousMillis >= 20)) {
if (segments < DisplayedSegments && (millis() - AudiopreviousMillis >= 20)) {
DisplayedSegments = max(DisplayedSegments - 3, segments);
ModulationpreviousMillis = millis();
AudiopreviousMillis = millis();
} else if (segments > DisplayedSegments) DisplayedSegments = segments;
DisplayedSegments = constrain(DisplayedSegments, 0, 86);
@@ -3198,9 +3228,9 @@ void ShowModLevel() {
}
if (millis() - peakholdmillis >= 1000) {
if (millis() - ModulationpeakPreviousMillis >= 20) {
if (millis() - AudiopeakPreviousMillis >= 20) {
peakholdold = max(peakholdold - 3, DisplayedSegments);
ModulationpeakPreviousMillis = millis();
AudiopeakPreviousMillis = millis();
}
}
@@ -3250,7 +3280,7 @@ void doSquelch() {
if (autosquelch) {
if (band < BAND_GAP) {
if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 100 && OStatus > -100) && (!scandxmode || (scandxmode && !scanmute))) {
if (isSignalQualityGood(USN, WAM, OStatus, SCAN_SIGNAL_THRESHOLD_USN_MULTIPLIER, SCAN_SIGNAL_THRESHOLD_OSTATUS_WIDE) && (!scandxmode || (scandxmode && !scanmute))) {
if (SQ || BWreset) {
if (!seek) radio.setUnMute();
if (!screenmute && !seek) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
@@ -3316,7 +3346,7 @@ void doSquelch() {
}
if (!screenmute && usesquelch && !advancedRDS && !afscreen && !rdsstatscreen) {
if (Squelch != Squelchold) {
SquelchSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
SquelchSprite.setTextColor(PrimaryColor, PrimaryColorSmooth);
SquelchSprite.fillSprite(BackgroundColor);
if (Squelch == -1) SquelchSprite.drawString("ST", 0, 0);
@@ -3517,7 +3547,7 @@ void ShowBattery() {
float v = analogReadMilliVolts(BATTERY_PIN) * 0.002; // 0.002 converts to volts plus corrects the /2 voltage divider
byte battery = map(constrain(v, BATTERY_LOW_VALUE, BATTERY_FULL_VALUE), BATTERY_LOW_VALUE, BATTERY_FULL_VALUE, 0, BAT_LEVEL_STAGE);
byte batteryprobe = map(constrain(v, BATTERY_LOW_VALUE, BATTERY_FULL_VALUE), BATTERY_LOW_VALUE, BATTERY_FULL_VALUE, 0, 20);
byte batteryprobe = map(constrain(v, BATTERY_LOW_VALUE, BATTERY_FULL_VALUE), BATTERY_LOW_VALUE, BATTERY_FULL_VALUE, 0, 50);
if (batteryold != batteryprobe) {
if (batterydetect) {
if (battery == 0) {
@@ -3746,12 +3776,12 @@ void Seek(bool mode) {
ShowFreq(0);
if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
if(band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if(band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
}
if (band < BAND_GAP) {
radio.getStatus(&SStatus, &USN, &WAM, &OStatus, &BW, &MStatus, &CN);
if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80 && OStatus > -80) && (!usesquelch || (Squelch < SStatus || Squelch == 920))) {
if (isSignalQualityGood(USN, WAM, OStatus) && (!usesquelch || (Squelch < SStatus || Squelch == SQUELCH_MAX_VALUE))) {
seek = false;
radio.setUnMute();
if (!screenmute) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
@@ -3903,11 +3933,11 @@ uint8_t doAutoMemory(uint16_t startfreq, uint16_t stopfreq, uint8_t startmem, ui
radio.SetFreq(frequency);
radio.clearRDS();
delay(50);
delay(DELAY_TUNE_MS);
radio.getStatus(&SStatus, &USN, &WAM, &OStatus, &BW, &MStatus, &CN);
if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80 && OStatus > -80)) {
if (isSignalQualityGood(USN, WAM, OStatus)) {
for (byte y = 0; y < 20; y++) {
delay(50);
delay(DELAY_RDS_READ_MS);
radio.readRDS(showrdserrors);
}
src/nonvolatile.cpp
+3 -3
View File
@@ -67,7 +67,7 @@ void saveData() {
EEPROM.writeByte(EE_BYTE_RDS_FILTER, radio.rds.filter);
EEPROM.writeByte(EE_BYTE_RDS_PIERRORS, radio.rds.pierrors);
EEPROM.writeByte(EE_BYTE_USESQUELCH, usesquelch);
EEPROM.writeByte(EE_BYTE_SHOWMODULATION, showmodulation);
EEPROM.writeByte(EE_BYTE_SHOWAUDIO, showaudio);
EEPROM.writeByte(EE_BYTE_AM_NB, amnb);
EEPROM.writeByte(EE_BYTE_FM_NB, fmnb);
EEPROM.writeByte(EE_BYTE_AUDIOMODE, audiomode);
@@ -172,7 +172,7 @@ void loadData() {
frequency_SW = EEPROM.readUInt(EE_UINT16_FREQUENCY_SW);
XDRGTK_key = EEPROM.readString(EE_STRING_XDRGTK_KEY);
usesquelch = EEPROM.readByte(EE_BYTE_USESQUELCH);
showmodulation = EEPROM.readByte(EE_BYTE_SHOWMODULATION);
showaudio = EEPROM.readByte(EE_BYTE_SHOWAUDIO);
amnb = EEPROM.readByte(EE_BYTE_AM_NB);
fmnb = EEPROM.readByte(EE_BYTE_FM_NB);
audiomode = EEPROM.readByte(EE_BYTE_AUDIOMODE);
@@ -282,7 +282,7 @@ void DefaultSettings() {
EEPROM.writeUInt(EE_UINT16_FREQUENCY_SW, 1800);
EEPROM.writeString(EE_STRING_XDRGTK_KEY, "password");
EEPROM.writeByte(EE_BYTE_USESQUELCH, 1);
EEPROM.writeByte(EE_BYTE_SHOWMODULATION, 1);
EEPROM.writeByte(EE_BYTE_SHOWAUDIO, 1);
EEPROM.writeByte(EE_BYTE_AM_NB, 0);
EEPROM.writeByte(EE_BYTE_FM_NB, 0);
EEPROM.writeByte(EE_BYTE_AUDIOMODE, 0);
src/rds.cpp
+8 -9
View File
@@ -17,21 +17,20 @@ void ShowAdvancedRDS() {
if (radio.rds.rdsDerror) tft.fillCircle(200, 41, 5, SignificantColor); else tft.fillCircle(200, 41, 5, InsignificantColor);
}
if (radio.rds.hasDynamicPTY != dynamicPTYold) {
if (radio.rds.hasDynamicPTY) tft.fillCircle(310, 137, 5, InsignificantColor); else tft.fillCircle(310, 137, 5, SignificantColor);
dynamicPTYold = radio.rds.hasDynamicPTY;
if(radio.rds.hasDynamicPTY.changed(0)) {
if(radio.rds.hasDynamicPTY.get()) tft.fillCircle(310, 137, 5, InsignificantColor); else tft.fillCircle(310, 137, 5, SignificantColor);
}
if (radio.rds.hasArtificialhead.changed(0)) {
if (radio.rds.hasArtificialhead) tft.fillCircle(310, 153, 5, InsignificantColor); else tft.fillCircle(310, 153, 5, SignificantColor);
if(radio.rds.hasArtificialhead.changed(0)) {
if(radio.rds.hasArtificialhead) tft.fillCircle(310, 153, 5, InsignificantColor); else tft.fillCircle(310, 153, 5, SignificantColor);
}
if (radio.rds.hasCompressed.changed(0)) {
if (radio.rds.hasCompressed) tft.fillCircle(310, 168, 5, InsignificantColor); else tft.fillCircle(310, 168, 5, SignificantColor);
if(radio.rds.hasCompressed.changed(0)) {
if(radio.rds.hasCompressed) tft.fillCircle(310, 168, 5, InsignificantColor); else tft.fillCircle(310, 168, 5, SignificantColor);
}
if (radio.rds.hasStereo.changed(0)) {
if (radio.rds.hasStereo) tft.fillCircle(310, 183, 5, InsignificantColor); else tft.fillCircle(310, 183, 5, SignificantColor);
if(radio.rds.hasStereo.changed(0)) {
if(radio.rds.hasStereo) tft.fillCircle(310, 183, 5, InsignificantColor); else tft.fillCircle(310, 183, 5, SignificantColor);
}
if (radio.rds.PTYN.changed(0) || rdsreset) {
src/rtc.cpp
+9 -4
View File
@@ -45,6 +45,9 @@ inline byte sumValueFromBinary(byte binary, byte length) {
void sync_from_rx_rtc(int32_t offset = 0) {
if(!rx_rtc_avail) return;
auto old_clock = Wire.getClock();
Wire.setClock(400000);
struct tm timeinfo;
memset(&timeinfo, 0, sizeof(timeinfo));
@@ -66,10 +69,12 @@ void sync_from_rx_rtc(int32_t offset = 0) {
timeinfo.tm_mday = sumValueFromBinary(Wire.read(), 6);
timeinfo.tm_mon = sumValueFromBinary(Wire.read(), 5) - 1;
timeinfo.tm_year = sumValueFromBinary(Wire.read(), 8) + 100;
timeinfo.tm_year = sumValueFromBinary(Wire.read(), 8) + 126;
rtc.setTime(mktime(&timeinfo) + offset);
}
Wire.setClock(old_clock);
}
bool init_rtc() {
@@ -102,7 +107,7 @@ bool init_rtc() {
Wire.write(1 << 2);
Wire.write(toBCD(14));
Wire.write(1);
Wire.write(toBCD(26));
Wire.write(0);
Wire.endTransmission();
writeToModule(0x1F, 0); // Unset stop bit
return true;
@@ -111,7 +116,7 @@ bool init_rtc() {
writeToModule(0x1F, 0);
return true;
}
sync_from_rx_rtc();
sync_from_rx_rtc(1); // mystery offset
return false;
}
@@ -128,7 +133,7 @@ void set_time(time_t time) {
Wire.write(1 << timeinfo->tm_wday);
Wire.write(toBCD(timeinfo->tm_mday));
Wire.write(toBCD(timeinfo->tm_mon + 1));
Wire.write(toBCD((1900 + timeinfo->tm_year) % 100));
Wire.write(toBCD((1900 + timeinfo->tm_year - 26) % 100));
Wire.endTransmission();
writeToModule(0x1F, 0);
}