Restore CI Builds

sieren · May 23, 2021 · 3c227e2 · 3c227e2
1 parent 549172e
commit 3c227e2
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -22,3 +22,9 @@
 [submodule "components/esp_i2c_helper"]
 	path = components/esp_i2c_helper
 	url = https://github.com/tuupola/esp_i2c_helper.git
+[submodule "components/esp-rainmaker"]
+	path = components/esp-rainmaker
+	url = https://github.com/espressif/esp-rainmaker.git
+[submodule "components/esp_littlefs"]
+	path = components/esp_littlefs
+	url = https://github.com/joltwallet/esp_littlefs.git
diff --git a/.travis.yml b/.travis.yml
@@ -21,12 +21,13 @@ install:
   # Get required packages - already done above, see addons: apt: packages:
   # - sudo apt-get install git wget make libncurses-dev flex bison gperf python python-serial
   # Prepare directory for the toolchain
+  - python3 -m pip || wget -qO- https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3
   - mkdir -p ~/esp
   - cd ~/esp
   # Get ESP-IDF from github
   - git clone --recursive https://github.com/espressif/esp-idf.git
   - cd esp-idf
-  - git checkout release/v4.0
+  - git checkout cf457d41
   - git submodule update --init --recursive
   - export IDF_PATH=~/esp/esp-idf
   - ./install.sh
@@ -55,7 +56,5 @@ script:
   # Update configuration so that kconfig doesn't start interactive mode
   - mkdir build
   - cd build
-  - cmake ../
-  - make -j 8
-  - cmake -DBOARD=M5STACK ../
+  - cmake -DBOARD=M5STACKCORE2 ../
   - make -j 8
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND compile_definitions "ARDUINO=202000")
 # Ignore warning in Azure IoT Library in esp32 Arduino
 # pending PR: https://github.com/VSChina/ESP32_AzureIoT_Arduino/pull/15
 list(APPEND compile_options "-Wno-maybe-uninitialized")
-list(APPEND EXTRA_COMPONENT_DIRS components/lvgl_esp32_drivers components/lvgl_esp32_drivers/lvgl_touch components/lvgl_esp32_drivers/lvgl_tft)
+list(APPEND EXTRA_COMPONENT_DIRS components/esp-rainmaker/components/ components/lvgl_esp32_drivers components/lvgl_esp32_drivers/lvgl_touch components/lvgl_esp32_drivers/lvgl_tft)
 
 
 project(homepoint)
diff --git a/components/arduino-esp32 b/components/arduino-esp32
diff --git a/components/esp-rainmaker b/components/esp-rainmaker
diff --git a/components/esp_littlefs b/components/esp_littlefs
diff --git a/main/fs/spiffs_drv.c b/main/fs/spiffs_drv.c
@@ -136,7 +136,7 @@ void spiffs_drv_init()
   drv.seek_cb = my_seek_cb;                 /*Callback to seek in a file (Move cursor) */
   drv.tell_cb = my_tell_cb;                 /*Callback to tell the cursor position  */
   drv.size_cb = my_size_cb;
-   ESP_LOGE(TAG, "FS init");
+  ESP_LOGE(TAG, "FS init");
   lv_fs_drv_register(&drv);                 /*Finally register the drive*/
-   ESP_LOGE(TAG, "FS done");
+  ESP_LOGE(TAG, "FS done");
 }
diff --git a/main/mqtt/MQTTConnection.cpp b/main/mqtt/MQTTConnection.cpp
@@ -61,6 +61,9 @@ namespace mqtt
         case MQTT_EVENT_ERROR:
             ESP_LOGI(TAG, "MQTT_EVENT_ERROR");
             break;
+        case MQTT_EVENT_DELETED:
+            ESP_LOGI(TAG, "MQTT_EVENT_DELETED");
+            break;
         case MQTT_EVENT_ANY:
             ESP_LOGI(TAG, "MQTT_EVENT_ANY");
             break;

diff --git a/main/wifi/WifiContext.cpp b/main/wifi/WifiContext.cpp
@@ -39,8 +39,8 @@ static void event_handler(void* arg, esp_event_base_t event_base,
         callback(ctx::WifiAssociationState::CONNECTING);
     } 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",
-                 ip4addr_ntoa(&event->ip_info.ip));
+        ESP_LOGI(TAG, "got ip:" IPSTR "\n",
+                 IP2STR(&event->ip_info.ip));
         xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
         callback(ctx::WifiAssociationState::CONNECTED);
     }
@@ -112,7 +112,7 @@ namespace ctx
     strcpy(reinterpret_cast<char*>(wifi_config.sta.password), mPassword.c_str());
 
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     ESP_ERROR_CHECK(esp_wifi_start() );
 
     ESP_LOGI(TAG, "wifi_init_sta finished.");