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

Merge pull request #845 from kb8u/bugfix_814

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-04-24 07:42:26 +02:00
committed by GitHub
parent 934562cfd0 6e7434ef8a
commit 4ed2fc97be
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
TEF6686_ESP32.ino
View File

@@ -1,7 +1,6 @@
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#include <WiFiClient.h> #include <WiFiClient.h>
#include <HTTPClient.h>
#include <EEPROM.h> #include <EEPROM.h>
#include <Wire.h> #include <Wire.h>
#include <math.h> #include <math.h>
@@ -346,6 +345,7 @@ String ptynold = " ";
String PTYold; String PTYold;
String RabbitearsPassword; String RabbitearsPassword;
String RabbitearsUser; String RabbitearsUser;
String RabbitearsHeader = "POST /tvdx/fm_spot HTTP/1.1\r\nHost: rabbitears.info\r\nUser-Agent: ESP32\r\nAccept: */*\r\nConnection: close\r\nContent-Type: application/json\r\nContent-Length: ";
String rds_clock; String rds_clock;
String rds_clockold; String rds_clockold;
String rds_date; String rds_date;
@@ -1038,6 +1038,7 @@ void loop() {
} }
} }
doLog(); doLog();
if (memorypos == scanstart) rabbitearssend();
DoMemoryPosTune(); DoMemoryPosTune();
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
autologged = false; autologged = false;
@@ -4232,22 +4233,7 @@ void TuneUp() {
if (fmdefaultstepsize == 2 && stepsize == 0 && frequency == 8795) frequency = 8790; if (fmdefaultstepsize == 2 && stepsize == 0 && frequency == 8795) frequency = 8790;
if (frequency >= (HighEdgeSet * 10) + 1) { if (frequency >= (HighEdgeSet * 10) + 1) {
if (scandxmode && RabbitearsUser.length() && RabbitearsPassword.length()) { if (scandxmode) rabbitearssend();
byte i = 0;
bool hasreport = false;
for (i = 0; i < 100; i++) {
if (rabbitearspi[i]) {
hasreport = true;
break;
}
}
if (hasreport) {
rabbitearssend();
for (i = 0; i < 100; i++) {
rabbitearspi[i] = 0;
}
}
}
frequency = LowEdgeSet * 10; frequency = LowEdgeSet * 10;
if (fmdefaultstepsize == 2 && stepsize == 0 && frequency == 8750) frequency = 8775; if (fmdefaultstepsize == 2 && stepsize == 0 && frequency == 8750) frequency = 8775;
if (edgebeep) EdgeBeeper(); if (edgebeep) EdgeBeeper();
@@ -5006,11 +4992,18 @@ void startFMDXScan() {
} }
void rabbitearssend () { void rabbitearssend () {
byte i = 0;
bool hasreport = false;
for (i = 0; i < 100; i++) {
if (rabbitearspi[i]) {
hasreport = true;
break;
}
}
if (!hasreport) return;
if (WiFi.status() != WL_CONNECTED) return; if (WiFi.status() != WL_CONNECTED) return;
String RabbitearsURL = "http://rabbitears.info/tvdx/fm_spot";
WiFiClient RabbitearsClient; WiFiClient RabbitearsClient;
HTTPClient http;
byte i;
String json = String("{\"tuner_key\":\""); String json = String("{\"tuner_key\":\"");
json += RabbitearsUser; json += RabbitearsUser;
json += String("\",\"password\":\""); json += String("\",\"password\":\"");
@@ -5026,14 +5019,17 @@ void rabbitearssend () {
json += String("\",\"pi_code\":"); json += String("\",\"pi_code\":");
json += String(rabbitearspi[i]); json += String(rabbitearspi[i]);
json += String("},"); json += String("},");
rabbitearspi[i] = 0;
} }
} }
json.remove(json.length() - 1); // remove trailing comma json.remove(json.length() - 1); // remove trailing comma
json += String("}}"); json += String("}}");
http.begin(RabbitearsClient, RabbitearsURL.c_str()); if(RabbitearsClient.connect("rabbitears.info",80)) {
http.addHeader("Content-Type", "application/json"); String payload = RabbitearsHeader + json.length() + "\r\n\r\n" + json;
http.POST(json); RabbitearsClient.print(payload);
http.end(); RabbitearsClient.flush();
RabbitearsClient.stop();
}
} }
void setAutoSpeedSPI() { void setAutoSpeedSPI() {