You've already forked TEF6686_ESP32
little clean up
This commit is contained in:
@@ -384,8 +384,7 @@ void Communication() {
|
||||
int symPos = data_str.indexOf("*F");
|
||||
if (symPos >= 5) {
|
||||
String freq = data_str.substring(0, symPos);
|
||||
freq = freq.substring(0, freq.length() - 1);
|
||||
frequency = freq.toInt();
|
||||
frequency = freq.substring(0, freq.length() - 1).toInt();
|
||||
if (scandxmode) cancelDXScan();
|
||||
radio.SetFreq(frequency);
|
||||
if (afscreen) BuildAdvancedRDS();
|
||||
@@ -407,9 +406,8 @@ void XDRGTKRoutine() {
|
||||
if (XDRGTKUSB) {
|
||||
while (Serial.available() > 0) {
|
||||
char c = Serial.read();
|
||||
if (buff_pos < 16 && c != '\n') {
|
||||
buff[buff_pos++] = c;
|
||||
} else {
|
||||
if (buff_pos < 16 && c != '\n') buff[buff_pos++] = c;
|
||||
else {
|
||||
buff[buff_pos] = '\0';
|
||||
buff_pos = 0;
|
||||
XDRGTKdata = true;
|
||||
@@ -421,9 +419,8 @@ void XDRGTKRoutine() {
|
||||
if (XDRGTKTCP && RemoteClient.available() > 0) {
|
||||
while (RemoteClient.available() > 0) {
|
||||
char c = RemoteClient.read();
|
||||
if (buff_pos < 16 && c != '\n') {
|
||||
buff[buff_pos++] = c;
|
||||
} else {
|
||||
if (buff_pos < 16 && c != '\n') buff[buff_pos++] = c;
|
||||
else {
|
||||
buff[buff_pos] = '\0';
|
||||
buff_pos = 0;
|
||||
XDRGTKdata = true;
|
||||
@@ -921,8 +918,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);
|
||||
|
||||
713
src/main.cpp
713
src/main.cpp
File diff suppressed because it is too large
Load Diff
50
src/utils.cpp
Normal file
50
src/utils.cpp
Normal file
@@ -0,0 +1,50 @@
|
||||
#include "utils.h"
|
||||
|
||||
HSV RGB565toHSV(uint16_t color) {
|
||||
uint8_t r = ((color >> 11) & 0x1F) * 8; // Convert 5-bit to 8-bit
|
||||
uint8_t g = ((color >> 5) & 0x3F) * 4; // Convert 6-bit to 8-bit
|
||||
uint8_t b = (color & 0x1F) * 8; // Convert 5-bit to 8-bit
|
||||
|
||||
float rf = r / 255.0, gf = g / 255.0, bf = b / 255.0;
|
||||
float maxVal = max(rf, max(gf, bf));
|
||||
float minVal = min(rf, min(gf, bf));
|
||||
float delta = maxVal - minVal;
|
||||
|
||||
HSV hsv;
|
||||
hsv.v = maxVal;
|
||||
|
||||
if (delta < 0.0001) {
|
||||
hsv.h = 0;
|
||||
hsv.s = 0;
|
||||
} else {
|
||||
hsv.s = delta / maxVal;
|
||||
|
||||
if (maxVal == rf) hsv.h = fmod(((gf - bf) / delta), 6.0);
|
||||
else if (maxVal == gf) hsv.h = ((bf - rf) / delta) + 2.0;
|
||||
else hsv.h = ((rf - gf) / delta) + 4.0;
|
||||
|
||||
hsv.h *= 60.0;
|
||||
if (hsv.h < 0) hsv.h += 360.0;
|
||||
}
|
||||
return hsv;
|
||||
}
|
||||
|
||||
uint16_t HSVtoRGB565(float h, float s, float v) {
|
||||
float c = v * s;
|
||||
float x = c * (1 - fabs(fmod(h / 60.0, 2) - 1));
|
||||
float m = v - c;
|
||||
|
||||
float rf, gf, bf;
|
||||
if (h < 60) rf = c, gf = x, bf = 0;
|
||||
else if (h < 120) rf = x, gf = c, bf = 0;
|
||||
else if (h < 180) rf = 0, gf = c, bf = x;
|
||||
else if (h < 240) rf = 0, gf = x, bf = c;
|
||||
else if (h < 300) rf = x, gf = 0, bf = c;
|
||||
else rf = c, gf = 0, bf = x;
|
||||
|
||||
uint8_t r = (rf + m) * 255;
|
||||
uint8_t g = (gf + m) * 255;
|
||||
uint8_t b = (bf + m) * 255;
|
||||
|
||||
return ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
|
||||
}
|
||||
Reference in New Issue
Block a user