Skip to content

Commit a0f8bbb

Browse files
committed
chore: remove non-critical changes for separate PRs
1 parent c17f225 commit a0f8bbb

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
.vscode/launch.json
66
.vscode/ipch
77
src/secrets_override.h
8-
**/.DS_Store

src/applicationInternal/gui/guiMemoryOptimizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ void setGUIlistIndicesToBeShown_afterSlide(t_gui_state *gui_state) {
248248
// swipe to previous item in list
249249
omote_log_d(" Will swipe to previous item in list\r\n");
250250
oldListIndex = gui_state->gui_on_tab[1].gui_list_index_previous;
251-
if (oldListIndex == 1) {
251+
if ((oldListIndex == 1)) {
252252
// next state is the "first state"
253253
gui_state->gui_on_tab[0] = {NULL, "", 0};
254254
gui_state->gui_on_tab[1] = {NULL, "", 1};

src/applicationInternal/gui/guiStatusUpdate.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void updateBatteryStatusOnGUI() {
1212
get_battery_status(&battery_voltage, &battery_percentage, &battery_ischarging);
1313

1414
char buffer1[20];
15-
snprintf(buffer1, sizeof(buffer1), "Voltage: %.2f V", (float)battery_voltage / 1000);
15+
sprintf(buffer1, "Voltage: %.2f V", (float)battery_voltage / 1000);
1616

1717
// GUI settings
1818
if (objBattSettingsVoltage != NULL) {lv_label_set_text_fmt(objBattSettingsVoltage, "%s", buffer1);}
@@ -22,9 +22,9 @@ void updateBatteryStatusOnGUI() {
2222
// GUI status bar at the top
2323
char buffer2[12];
2424
// Voltage and percentage
25-
// snprintf(buffer2, sizeof(buffer2), "%.1fV, %d%%", (float)getBatteryVoltage() / 1000, battery_percentage);
25+
// sprintf(buffer2, "%.1fV, %d%%", (float)getBatteryVoltage() / 1000, battery_percentage);
2626
// only percentage
27-
snprintf(buffer2, sizeof(buffer2), "%d%%", battery_percentage);
27+
sprintf(buffer2, "%d%%", battery_percentage);
2828
for (int i=0; i<strlen(buffer2); i++) {
2929
if (buffer2[i] == '.') {
3030
buffer2[i] = ',';

src/applicationInternal/hardware/arduinoLayer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
#elif defined(WIN32) || defined(__linux__) || defined(__APPLE__)
1010
#include <stdint.h>
11-
#include <stdlib.h>
12-
1311
// For Windows and Linux there is no Arduino framework available. So we have to simulate at least those very few calls to Arduino functions which are left in the code.
1412
// Note: Of course there is a lot more Arduino code in folder "hardware/ESP32/*", but this code is only active in case of esp32, so we don't have to simulate this in the Arduino layer if Windows/Linux is active.
1513
void delay(uint32_t ms);

0 commit comments

Comments
 (0)