Go back to plain arduino, this had fucking broke my mind and i have no clue why

This commit is contained in:
2026-01-17 23:20:00 +01:00
parent 7a9f9f868c
commit 35d5e6ecb5
9 changed files with 24 additions and 135 deletions

View File

@@ -1,6 +0,0 @@
# This file was automatically generated for projects
# without default 'CMakeLists.txt' file.
FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
idf_component_register(SRCS ${app_sources})

View File

@@ -1079,7 +1079,10 @@ void setAutoSpeedSPI() {
}
void endMenu() {
if(rds_settings_changed) radio.clearRDS(fullsearchrds);
if(rds_settings_changed) {
radio.clearRDS(fullsearchrds);
RDSstatus = false;
}
rds_settings_changed = menu = false;
menuopen = false;
LowLevelInit = true;
@@ -1175,7 +1178,7 @@ void setup() {
bool tef_found = false;
Wire.begin();
Wire.setClock(400000);
Wire.setClock(100000);
delay(1);
Serial.begin(115200);
@@ -2833,9 +2836,9 @@ void DoMemoryPosTune() {
if (RDSSPYTCP) RemoteClient.print("G:\r\nRESET-------\r\n\r\n");
if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
String stationText = "";
String stationName = "";
if (presets[memorypos].RDSPS[0] != '\0') {
for (byte i = 0; i < 9; i++) stationText += presets[memorypos].RDSPS[i];
for (byte i = 0; i < 9; i++) stationName += presets[memorypos].RDSPS[i];
}
if (presets[memorypos].RDSPI[0] != '\0') {
@@ -2848,7 +2851,7 @@ void DoMemoryPosTune() {
for (byte i = 0; i < 6; i++) radio.rds.picode[i] = '\0';
}
radio.rds.stationName = stationText;
radio.rds.stationName = stationName;
BWset = presets[memorypos].bw;
doBW();
@@ -3981,21 +3984,3 @@ uint8_t doAutoMemory(uint16_t startfreq, uint16_t stopfreq, uint8_t startmem, ui
return error;
}
extern "C" {
void app_main() {
rtc_wdt_disable();
rtc_wdt_protect_off();
initArduino();
setup();
rtc_wdt_enable();
rtc_wdt_protect_on();
while(true) {
loop();
rtc_wdt_feed();
}
}
}

View File

@@ -5,8 +5,8 @@
String HexStringold;
float smoothBER = 0;
int PSLongWidth, AIDWidth, lengths[7];
String stationNameLongOld, AIDStringold;
int AIDWidth, lengths[7];
String AIDStringold;
bool rtABold, ps12errorold, ps34errorold, ps56errorold, ps78errorold;
void ShowAdvancedRDS() {
@@ -431,11 +431,6 @@ void showPS() {
if (!screenmute) tftReplace(ACENTER, PSold, radio.rds.stationName, 160, 201, BWAutoColor, BWAutoColorSmooth, BackgroundColor, 16);
} else if (!rdsstatscreen) {
if (radio.rds.hasLongPS && showlongps) {
if (radio.rds.stationNameLong != stationNameLongOld) {
PSLongWidth = PSSprite.textWidth(radio.rds.stationNameLong); // Measure new width
stationNameLongOld = radio.rds.stationNameLong;
}
lpsDisplay.update(radio.rds.stationNameLong, RDSstatus, RDSColor, RDSColorSmooth, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor);
} else {
lpsDisplay.reset();