Skip to content

Commit 12e5196

Browse files
Merge pull request brettdottech#258 from dreed47/convert-stockwidget-arduino-log
Convert StockWidget to ArduinoLog per brettdottech#220
2 parents 98ebf48 + af4737d commit 12e5196

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

firmware/src/widgets/stockwidget/StockWidget.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "StockTranslations.h"
33
#include "TaskFactory.h"
44
#include <ArduinoJson.h>
5+
#include <ArduinoLog.h>
56
#include <iomanip>
67

78
StockWidget::StockWidget(ScreenManager &manager, ConfigManager &config) : Widget(manager, config) {
@@ -21,15 +22,15 @@ StockWidget::StockWidget(ScreenManager &manager, ConfigManager &config) : Widget
2122
m_stocks[m_stockCount] = stockModel;
2223
m_stockCount++;
2324
if (m_stockCount > MAX_STOCKS) {
24-
Serial.println("MAX STOCKS UNABLE TO ADD MORE");
25+
Log.warningln("MAX STOCKS UNABLE TO ADD MORE");
2526
break;
2627
}
2728
} while (symbol = strtok(nullptr, ","));
2829
}
2930

3031
void StockWidget::setup() {
3132
if (m_stockCount == 0) {
32-
Serial.println("No stock tickers available");
33+
Log.warningln("No stock tickers available");
3334
return;
3435
}
3536
}
@@ -87,13 +88,13 @@ void StockWidget::processResponse(StockDataModel &stock, int httpCode, const Str
8788
stock.setTicker(doc["symbol"].as<String>());
8889
stock.setCurrencySymbol(doc["currency"].as<String>());
8990
} else {
90-
Serial.println("skipping invalid data for: " + stock.getSymbol());
91+
Log.warningln("skipping invalid data for: %s", stock.getSymbol().c_str());
9192
}
9293
} else {
93-
Serial.println("deserializeJson() failed");
94+
Log.errorln("deserializeJson() failed");
9495
}
9596
} else {
96-
Serial.printf("HTTP request failed, error: %d\n", httpCode);
97+
Log.errorln("HTTP request failed, error: %d\n", httpCode);
9798
}
9899
}
99100

@@ -107,7 +108,7 @@ void StockWidget::buttonPressed(uint8_t buttonId, ButtonState state) {
107108
}
108109

109110
void StockWidget::displayStock(int8_t displayIndex, StockDataModel &stock, uint32_t backgroundColor, uint32_t textColor) {
110-
Serial.println("displayStock - " + stock.getSymbol() + " ~ " + stock.getCurrentPrice());
111+
Log.infoln("displayStock - %s ~ %s", stock.getSymbol().c_str(), stock.getCurrentPrice(2).c_str());
111112
if (stock.getCurrentPrice() == 0.0) {
112113
// There isn't any data to display yet
113114
return;

0 commit comments

Comments
 (0)