Linting

3 files changed, 27 insertions, 27 deletions

diff --git a/src/ble.cpp b/src/ble.cpp
index 9425686..552055d 100644
--- a/src/ble.cpp
+++ b/src/ble.cpp
@@ -51,24 +51,24 @@ class BadgeSelectorCallbacks : public NimBLECharacteristicCallbacks
         {
             LOG_F("Write!");
             const char *val = pCharacteristic->getValue().c_str();
-            char *end = NULL;
+            char *end = nullptr;
             long newVal = strtol(val, &end, 10);
             String defVal("0");
-            if (end == NULL || end == val)
+            if (end == nullptr || end == val)
             {
                 LOG_F("Error parsing value\n");
                 pCharacteristic->setValue(defVal);
-                pCharacteristic->notify(defVal, BLE_HS_CONN_HANDLE_NONE);
+                (void) pCharacteristic->notify(defVal, BLE_HS_CONN_HANDLE_NONE);
             }
             else if (newVal >= ARRAY_SIZE(templates))
             {
-                LOG_F("Value out of range: %d\n", newVal);
+                LOG_F("Value out of range: %ld\n", newVal);
                 pCharacteristic->setValue(defVal);
-                pCharacteristic->notify(defVal, BLE_HS_CONN_HANDLE_NONE);
+                (void) pCharacteristic->notify(defVal, BLE_HS_CONN_HANDLE_NONE);
             }
             else
             {
-                LOG_F("Value set to %d\n", newVal);
+                LOG_F("Value set to %ld\n", newVal);
                 value_changed.value = newVal;
                 value_changed.changed = true;
             }
@@ -76,7 +76,7 @@ class BadgeSelectorCallbacks : public NimBLECharacteristicCallbacks
     }
 } badgeSelectorCallbacks;
 
-void de::uvok::badge::ble_init(void)
+void de::uvok::badge::ble_init()
 {
     NimBLEDevice::init("Espadge");
 
@@ -118,13 +118,13 @@ void de::uvok::badge::ble_init(void)
     server->start();
 }
 
-bool de::uvok::badge::ble_is_active(void)
+bool de::uvok::badge::ble_is_active()
 {
     return pAdvertising->isAdvertising() || server->getConnectedCount() > 0;
     // ???? NimBLEDevice::getConnectedClients().size() > 0;
 }
 
-void de::uvok::badge::ble_advertise(void)
+void de::uvok::badge::ble_advertise()
 {
     if (!pAdvertising->isAdvertising())
     {
@@ -134,7 +134,7 @@ void de::uvok::badge::ble_advertise(void)
     }
 }
 
-de::uvok::badge::ble_poll_result_t de::uvok::badge::ble_poll(void)
+de::uvok::badge::ble_poll_result_t de::uvok::badge::ble_poll()
 {
     if (value_changed.changed)
     {
@@ -156,5 +156,5 @@ void de::uvok::badge::ble_set_image(uint8_t image)
     LOG_F("Notify BLE: set image to %d\n", image);
     String s(image);
     selectorCharacteristic->setValue(s);
-    selectorCharacteristic->notify(s, BLE_HS_CONN_HANDLE_NONE);
+    (void) selectorCharacteristic->notify(s, BLE_HS_CONN_HANDLE_NONE);
 }
\ No newline at end of file
diff --git a/src/display.cpp b/src/display.cpp
index 1aa91bc..37b938a 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -48,7 +48,7 @@ static uint8_t displayed = 0;
 static bool is_initial = true;
 static constexpr uint8_t rotation = 3;
 
-void de::uvok::badge::display_init(void)
+void de::uvok::badge::display_init()
 {
     LOG_F("Init display...\n");
 
@@ -117,7 +117,7 @@ static void displayDo(display_mode_t mode)
         if (mode == DISPLAY_FULL)
         {
             display.setFullWindow();
-            display.drawXBitmap(0, 0, (unsigned char *)imgs[displayed].bits, imgs[displayed].width,
+            display.drawXBitmap(0, 0, (const unsigned char *)imgs[displayed].bits, imgs[displayed].width,
                                 imgs[displayed].height, GxEPD_BLACK);
         }
         else
@@ -135,7 +135,7 @@ static void displayDo(display_mode_t mode)
     display.hibernate();
 }
 
-uint8_t de::uvok::badge::display_prev(void)
+uint8_t de::uvok::badge::display_prev()
 {
     displayed--;
     if (displayed >= image_count)
@@ -144,14 +144,14 @@ uint8_t de::uvok::badge::display_prev(void)
     return displayed;
 }
 
-uint8_t de::uvok::badge::display_next(void)
+uint8_t de::uvok::badge::display_next()
 {
     displayed = (displayed + 1) % image_count;
     displayDo(DISPLAY_PREVIEW);
     return displayed;
 }
 
-uint8_t de::uvok::badge::display_refresh(void)
+uint8_t de::uvok::badge::display_refresh()
 {
     displayDo(DISPLAY_FULL);
     return displayed;
@@ -169,7 +169,7 @@ void de::uvok::badge::display_direct(uint8_t num)
 void de::uvok::badge::display_indicator(DisplayIndicator indicator)
 {
     LOG_F("Set indicator to %d\n", indicator);
-    // no idea what do about initial state..
+    // no idea what do about initial state.
     display.setRotation(rotation);
     display.setTextColor(GxEPD_BLACK);
     display.setFont(&FreeMono9pt7b);
diff --git a/src/gpio.cpp b/src/gpio.cpp
index 0d852b9..8b227bb 100644
--- a/src/gpio.cpp
+++ b/src/gpio.cpp
@@ -49,16 +49,16 @@ static struct
 } gpio_task_stuff;
 
 static ARDUINO_ISR_ATTR void gpio_pin_irq(void *);
-static void gpio_loop(void *);
+__attribute__((noreturn)) static void gpio_loop(void *);
 
 //! Create task, initialize pins...
-void de::uvok::badge::gpio_init(void)
+void de::uvok::badge::gpio_init()
 {
     gpio_task_stuff.queue_handle =
         xQueueCreateStatic(4, sizeof(pin_notification_t), &(gpio_task_stuff.queue_storage[0]), &gpio_task_stuff.queue);
 #if UVOK_EPAP_BOARD == BOARD_ESP32_CROWPANEL
-    uint8_t inPins[] = {HOME_KEY, EXIT_KEY, HOME_KEY, NEXT_KEY, OK_KEY, PRV_KEY};
-    for (uint8_t p : inPins)
+    const uint8_t inPins[] = {HOME_KEY, EXIT_KEY, HOME_KEY, NEXT_KEY, OK_KEY, PRV_KEY};
+    for (const uint8_t p : inPins)
     {
         pinMode(p, GPIO_MODE_INPUT);
         // simply use pin number as arg
@@ -68,20 +68,20 @@ void de::uvok::badge::gpio_init(void)
 #endif
 
     // ** TASK AFTER QUEUE ** !!!
-    xTaskCreateStatic(gpio_loop, "gpio", GPIO_STACK, NULL, configMAX_PRIORITIES - 1, gpio_task_stuff.task_stack,
+    xTaskCreateStatic(gpio_loop, "gpio", GPIO_STACK, nullptr, configMAX_PRIORITIES - 1, gpio_task_stuff.task_stack,
                       &gpio_task_stuff.task);
 }
 
 static volatile uint32_t event;
 
 // "Poll task", for button 0.
-de::uvok::badge::gpio_poll_result_t de::uvok::badge::gpio_poll(void)
+de::uvok::badge::gpio_poll_result_t de::uvok::badge::gpio_poll()
 {
     if (event)
     {
-        uint32_t r = event;
+        const uint32_t r = event;
         event = 0;
-        return {.duration_ms = (uint16_t)(r >> 8), .pin_number = (uint8_t)(r & 0xff), .has_data = true};
+        return {.duration_ms = static_cast<uint16_t>(r >> 8), .pin_number = static_cast<uint8_t>(r & 0xff), .has_data = true};
     }
 
     return {0};
@@ -90,8 +90,8 @@ de::uvok::badge::gpio_poll_result_t de::uvok::badge::gpio_poll(void)
 //! GPIO task loop, read / handle queue.
 static void gpio_loop(void *ctx)
 {
-    Serial.println("Starting GPIO loop");
-    while (1)
+    LOG_F("Starting GPIO loop\n");
+    while (true)
     {
         pin_notification_t received;
         if (xQueueReceive(gpio_task_stuff.queue_handle, &received, portMAX_DELAY) == pdTRUE)