fully migrated to newest esp-idf

Author: Random90

components/esp32-pcd8544/CMakeLists.txt

@@ -1,3 +1,4 @@
 idf_component_register(SRCS "src/pcd8544.c" "src/pcd8544_pin.c"
                        INCLUDE_DIRS "src"
+                       REQUIRES driver
                        )

main/Tasks/screen_pcd8544/pcd8544_font_utils.c

@@ -1,6 +1,8 @@
 #include <pcd8544_font_utils.h>
 
 #include "esp_log.h"
+// @TODO better bigCharPositions types!
+
 /**
  * @param charArr array of chars to which font data will be passed
  * @param buffer source of text
@@ -11,26 +13,26 @@
  * @TODO validate string, skip special chars, cleanup array sizes!
  * @TODO dynamic rows number calculation
  * */
-static void fillCharsFromBuffer(uint8_t **charArr, char *buffer, int nrOfChars, uint8_t (*bigCharPositions)[6]) {
+static void fillCharsFromBuffer(uint8_t **charArr, char *buffer, int nrOfChars, uint8_t bigCharPositions[6]) {
     for (int i = 0; i <= nrOfChars; i++) {
         // convert to int and fill charArr with pointers to big font characters
         if (*buffer != '.' && *buffer >= '0' && *buffer <= '9') {
             char single_char_buf[1] = {*buffer};
             *charArr = fontDetermination[atoi(single_char_buf)];
-            (*bigCharPositions)[i] = 16;
+            bigCharPositions[i] = 16;
         } else if (*buffer == '.') {
             *charArr = fontDetermination[10];
-            (*bigCharPositions)[i] = 3;
+            bigCharPositions[i] = 3;
         } else {
             *charArr = NULL;
-            (*bigCharPositions)[i] = 0;
+            bigCharPositions[i] = 0;
         }
         buffer++;
         charArr++;
     }
 }
 
-void vGetSpeedChars(uint8_t *charArr[4], float *speed, uint8_t (*bigCharPositions)[6]) {
+void vGetSpeedChars(uint8_t *charArr[4], float *speed, uint8_t *bigCharPositions) {
     // create buffer for converted float
     char buffer[10];
     // prevent overflow
@@ -48,10 +50,10 @@ void vGetSpeedChars(uint8_t *charArr[4], float *speed, uint8_t (*bigCharPosition
     } else {
         snprintf(buffer, 10, "%d.%d", speedInt, fraction);
     }
-    fillCharsFromBuffer(charArr, buffer, 4, &bigCharPositions);
+    fillCharsFromBuffer(charArr, buffer, 4, bigCharPositions);
 }
 
-void vGetDistanceChars(uint8_t *charArr[6], float *distance, uint8_t (*bigCharPositions)[6]) {
+void vGetDistanceChars(uint8_t *charArr[6], float *distance, uint8_t *bigCharPositions) {
     char buffer[10];
     // @TODO handle distance > 999.9
     // @TODO handle distance > 99.99
@@ -64,5 +66,5 @@ void vGetDistanceChars(uint8_t *charArr[6], float *distance, uint8_t (*bigCharPo
     } else {
         snprintf(buffer, 10, "%d.%d", distanceInt, fraction);
     }
-    fillCharsFromBuffer(charArr, buffer, 10, &bigCharPositions);
+    fillCharsFromBuffer(charArr, buffer, 10, bigCharPositions);
 }

main/Tasks/screen_pcd8544/pcd8544_font_utils.h

@@ -12,13 +12,13 @@
  * @param charRowsArr pointer to empty array, which will be filled with next chars row number
  * @return pointer to array of binary characters
  * */
-void vGetSpeedChars(uint8_t *charArr[4], float *speed, uint8_t (*bigCharPositions)[6]);
+void vGetSpeedChars(uint8_t *charArr[4], float *speed, uint8_t *bigCharPositions);
 
 /**
  * @brief convert distance measured from float to included font char array
  * @param charRowsArr pointer to empty array, which will be filled with next chars row number
  * @return pointer to array of binary characters
  * */
-void vGetDistanceChars(uint8_t *charArr[6], float *distance, uint8_t (*bigCharPositions)[6]);
+void vGetDistanceChars(uint8_t *charArr[6], float *distance, uint8_t *bigCharPositions);
 
 #endif

main/Tasks/screen_pcd8544/screen_pcd8544.c

@@ -60,7 +60,7 @@ static void drawAverageBar() {
 static void vDrawMainSpeed() {
     uint8_t *speedChars[4];
     uint8_t currentDrawingPos = 0;
-    vGetSpeedChars(speedChars, &rideParams.speed, &bigCharPositions);
+    vGetSpeedChars(speedChars, &rideParams.speed, bigCharPositions);
     for (int i = 0; i < 4; i++) {
         pcd8544_set_pos(currentDrawingPos, 0);
         pcd8544_draw_bitmap(speedChars[i], bigCharPositions[i], 3, true);
@@ -72,7 +72,7 @@ static void vDrawMainDistance() {
     uint8_t *distanceChars[6];
     uint8_t currentDrawingPos = 0;
     currentDrawingPos = 0;
-    vGetDistanceChars(distanceChars, &rideParams.distance, &bigCharPositions);
+    vGetDistanceChars(distanceChars, &rideParams.distance, bigCharPositions);
     for (int i = 0; i < 6; i++) {
         if (distanceChars[i] == 0) {
             break;

main/wifi.c

@@ -37,7 +37,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base, int32_t e
         ESP_LOGI(TAG, "connect to the AP fail");
     } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
         ip_event_got_ip_t* event = (ip_event_got_ip_t*)event_data;
-        ESP_LOGI(TAG, "got ip:%s", esp_ip4addr_ntoa(&event->ip_info.ip));
+        ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
         s_retry_num = 0;
         xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
     }