acidvegas/acid-drop
acidvegas/acid-drop
1
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 1 Wiki Activity

fixed status bar percent colors

Browse Source
This commit is contained in:
Dionysus 2024-05-27 18:22:24 -04:00
parent 5fe9e4d240
commit a317971c77
Signed by: acidvegas
GPG Key ID: EF4B922DB85DC9DE
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.ino
View File

@ -22,8 +22,8 @@
#define MAX_LINES ((SCREEN_HEIGHT - INPUT_LINE_HEIGHT - STATUS_BAR_HEIGHT) / (CHAR_HEIGHT + LINE_SPACING)) #define MAX_LINES ((SCREEN_HEIGHT - INPUT_LINE_HEIGHT - STATUS_BAR_HEIGHT) / (CHAR_HEIGHT + LINE_SPACING))
#define BOARD_BAT_ADC 4 // Define the ADC pin used for battery reading #define BOARD_BAT_ADC 4 // Define the ADC pin used for battery reading
#define CONV_FACTOR 1.8 // Conversion factor for the ADC to voltage conversion #define CONV_FACTOR 1.8 // Conversion factor for the ADC to voltage conversion
#define READS 20 // Number of readings for averaging #define READS 20 // Number of readings for averaging
Pangodream_18650_CL BL(BOARD_BAT_ADC, CONV_FACTOR, READS); Pangodream_18650_CL BL(BOARD_BAT_ADC, CONV_FACTOR, READS);
TFT_eSPI tft = TFT_eSPI(); TFT_eSPI tft = TFT_eSPI();
@ -42,7 +42,6 @@ String nick = "";
bool debugMode = false; bool debugMode = false;
unsigned long debugStartTime = 0; unsigned long debugStartTime = 0;
// IRC connection // IRC connection
const char* server = "irc.supernets.org"; const char* server = "irc.supernets.org";
const int port = 6697; const int port = 6697;
@ -347,7 +346,6 @@ void displayLines() {
displayInputLine(); displayInputLine();
} }
void addLine(String senderNick, String message, String type, uint16_t errorColor = TFT_WHITE, uint16_t reasonColor = TFT_WHITE) { void addLine(String senderNick, String message, String type, uint16_t errorColor = TFT_WHITE, uint16_t reasonColor = TFT_WHITE) {
if (type != "error" && nickColors.find(senderNick) == nickColors.end()) if (type != "error" && nickColors.find(senderNick) == nickColors.end())
nickColors[senderNick] = generateRandomColor(); nickColors[senderNick] = generateRandomColor();
@ -608,8 +606,6 @@ void parseAndDisplay(String line) {
} }
} }
void handleKeyboardInput(char key) { void handleKeyboardInput(char key) {
if (key == '\n' || key == '\r') { // Enter if (key == '\n' || key == '\r') { // Enter
if (inputBuffer.startsWith("/nick ")) { if (inputBuffer.startsWith("/nick ")) {
@ -706,7 +702,6 @@ void displayInputLine() {
tft.print("> " + displayInput); tft.print("> " + displayInput);
} }
void displayCenteredText(String text) { void displayCenteredText(String text) {
tft.fillScreen(TFT_BLACK); tft.fillScreen(TFT_BLACK);
tft.setTextDatum(MC_DATUM); tft.setTextDatum(MC_DATUM);
@ -951,19 +946,17 @@ void handleWiFiSelection(char key) {
} }
} }
} else { } else {
password = ""; // Open networks have no password password = "";
connectToWiFi(); connectToWiFi();
} }
} }
} }
void updateStatusBar() { void updateStatusBar() {
Serial.println("Updating status bar..."); Serial.println("Updating status bar...");
uint16_t darkerGrey = tft.color565(25, 25, 25); uint16_t darkerGrey = tft.color565(25, 25, 25);
tft.fillRect(0, 0, SCREEN_WIDTH, STATUS_BAR_HEIGHT, darkerGrey); tft.fillRect(0, 0, SCREEN_WIDTH, STATUS_BAR_HEIGHT, darkerGrey);
// Display time
struct tm timeinfo; struct tm timeinfo;
char timeStr[9]; char timeStr[9];
if (!getLocalTime(&timeinfo)) { if (!getLocalTime(&timeinfo)) {
@ -1020,10 +1013,10 @@ void updateStatusBar() {
tft.drawString(batteryStr + 5, SCREEN_WIDTH - 5, STATUS_BAR_HEIGHT / 2); tft.drawString(batteryStr + 5, SCREEN_WIDTH - 5, STATUS_BAR_HEIGHT / 2);
} }
uint16_t getColorFromPercentage(int rssi) { uint16_t getColorFromPercentage(int percentage) {
if (rssi > -50) return TFT_GREEN; if (percentage > 75) return TFT_GREEN;
else if (rssi > -60) return TFT_YELLOW; else if (percentage > 50) return TFT_YELLOW;
else if (rssi > -70) return TFT_ORANGE; else if (percentage > 25) return TFT_ORANGE;
else return TFT_RED; else return TFT_RED;
} }