Clean up
This commit is contained in:
@@ -2,13 +2,11 @@
|
|||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
#include <TFT_eSPI.h> // https://github.com/Bodmer/TFT_eSPI
|
#include <TFT_eSPI.h> // https://github.com/Bodmer/TFT_eSPI
|
||||||
#include <TimeLib.h> // https://github.com/PaulStoffregen/Time
|
#include <TimeLib.h> // https://github.com/PaulStoffregen/Time
|
||||||
#include <FS.h>
|
|
||||||
#include "src/font.h"
|
#include "src/font.h"
|
||||||
#include "src/TEF6686.h"
|
#include "src/TEF6686.h"
|
||||||
#include "src/constants.h"
|
#include "src/constants.h"
|
||||||
#include "src/language.h"
|
#include "src/language.h"
|
||||||
|
|
||||||
|
|
||||||
#define GFXFF 1
|
#define GFXFF 1
|
||||||
#define FONT24 &Aura2Regular24pt7b
|
#define FONT24 &Aura2Regular24pt7b
|
||||||
#define FONT14 &Aura2Regular14pt8b
|
#define FONT14 &Aura2Regular14pt8b
|
||||||
|
|||||||
@@ -298,8 +298,6 @@ bool TEF6686::readRDS(bool showrdserrors)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ps_process == 2) {
|
if (ps_process == 2) {
|
||||||
// strcpy(rds.stationName, ps_buffer);
|
|
||||||
|
|
||||||
RDScharConverter(ps_buffer, rds.PStext, sizeof(rds.PStext) / sizeof(wchar_t));
|
RDScharConverter(ps_buffer, rds.PStext, sizeof(rds.PStext) / sizeof(wchar_t));
|
||||||
rds.stationName = convertToUTF8(rds.PStext);
|
rds.stationName = convertToUTF8(rds.PStext);
|
||||||
|
|
||||||
@@ -365,9 +363,7 @@ bool TEF6686::readRDS(bool showrdserrors)
|
|||||||
if (rds.rtAB != ABold) {
|
if (rds.rtAB != ABold) {
|
||||||
offsetold = 0;
|
offsetold = 0;
|
||||||
rds.stationText = "";
|
rds.stationText = "";
|
||||||
//for (int i = 0; i < 65; i++) rds.stationText[i] = 0;
|
|
||||||
if (rt_timer == 64) {
|
if (rt_timer == 64) {
|
||||||
// strcpy(rds.stationText, stationTextBuffer);
|
|
||||||
RDScharConverter(stationTextBuffer, rds.RTtext, sizeof(rds.RTtext) / sizeof(wchar_t));
|
RDScharConverter(stationTextBuffer, rds.RTtext, sizeof(rds.RTtext) / sizeof(wchar_t));
|
||||||
rds.stationText = convertToUTF8(rds.RTtext);
|
rds.stationText = convertToUTF8(rds.RTtext);
|
||||||
}
|
}
|
||||||
@@ -399,7 +395,6 @@ bool TEF6686::readRDS(bool showrdserrors)
|
|||||||
strcpy(stationTextBuffer, rt_buffer);
|
strcpy(stationTextBuffer, rt_buffer);
|
||||||
for (int i = 0; i < 64; i++) stationTextBuffer[i] = stationTextBuffer[i];
|
for (int i = 0; i < 64; i++) stationTextBuffer[i] = stationTextBuffer[i];
|
||||||
if (rt_timer < 64) {
|
if (rt_timer < 64) {
|
||||||
// strcpy(rds.stationText, stationTextBuffer);
|
|
||||||
RDScharConverter(stationTextBuffer, rds.RTtext, sizeof(rds.RTtext) / sizeof(wchar_t));
|
RDScharConverter(stationTextBuffer, rds.RTtext, sizeof(rds.RTtext) / sizeof(wchar_t));
|
||||||
rds.stationText = convertToUTF8(rds.RTtext);
|
rds.stationText = convertToUTF8(rds.RTtext);
|
||||||
rt_timer++;
|
rt_timer++;
|
||||||
|
|||||||
Reference in New Issue
Block a user