Update binaries with SLAAC support

Author: nuclearcat

tools/sdk/esp32/include/bootloader_support/include/esp_app_format.h

@@ -55,6 +55,9 @@ typedef enum {
     ESP_IMAGE_FLASH_SIZE_4MB,       /*!< SPI flash size 4 MB */
     ESP_IMAGE_FLASH_SIZE_8MB,       /*!< SPI flash size 8 MB */
     ESP_IMAGE_FLASH_SIZE_16MB,      /*!< SPI flash size 16 MB */
+    ESP_IMAGE_FLASH_SIZE_32MB,      /*!< SPI flash size 32 MB */
+    ESP_IMAGE_FLASH_SIZE_64MB,      /*!< SPI flash size 64 MB */
+    ESP_IMAGE_FLASH_SIZE_128MB,     /*!< SPI flash size 128 MB */
     ESP_IMAGE_FLASH_SIZE_MAX        /*!< SPI flash size MAX */
 } esp_image_flash_size_t;
 

tools/sdk/esp32/include/driver/include/driver/gpio.h

@@ -498,7 +498,8 @@ esp_err_t gpio_sleep_set_pull_mode(gpio_num_t gpio_num, gpio_pull_mode_t pull);
 
 #if SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP
 
-#define GPIO_IS_DEEP_SLEEP_WAKEUP_VALID_GPIO(gpio_num)        ((gpio_num & ~SOC_GPIO_DEEP_SLEEP_WAKEUP_VALID_GPIO_MASK) == 0)
+#define GPIO_IS_DEEP_SLEEP_WAKEUP_VALID_GPIO(gpio_num)    ((gpio_num >= 0) && \
+                                                          (((1ULL << (gpio_num)) & SOC_GPIO_DEEP_SLEEP_WAKEUP_VALID_GPIO_MASK) != 0))
 
 /**
  * @brief Enable GPIO deep-sleep wake-up function.

tools/sdk/esp32/include/driver/include/driver/sdspi_host.h

@@ -22,8 +22,10 @@ typedef int sdspi_dev_handle_t;
 
 #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
 #define SDSPI_DEFAULT_HOST HSPI_HOST
+#define SDSPI_DEFAULT_DMA  SDSPI_DEFAULT_HOST
 #else
 #define SDSPI_DEFAULT_HOST SPI2_HOST
+#define SDSPI_DEFAULT_DMA  SPI_DMA_CH_AUTO
 #endif
 
 /**
@@ -216,7 +218,7 @@ typedef struct {
     .gpio_miso = GPIO_NUM_2, \
     .gpio_mosi = GPIO_NUM_15, \
     .gpio_sck  = GPIO_NUM_14, \
-    .dma_channel = 1, \
+    .dma_channel = SDSPI_DEFAULT_DMA, \
 }
 
 /**

tools/sdk/esp32/include/driver/include/driver/spi_common.h

@@ -163,7 +163,7 @@ esp_err_t spi_bus_initialize(spi_host_device_t host_id, const spi_bus_config_t *
  * @param host_id SPI peripheral to free
  * @return
  *         - ESP_ERR_INVALID_ARG   if parameter is invalid
- *         - ESP_ERR_INVALID_STATE if not all devices on the bus are freed
+ *         - ESP_ERR_INVALID_STATE if bus hasn't been initialized before, or not all devices on the bus are freed
  *         - ESP_OK                on success
  */
 esp_err_t spi_bus_free(spi_host_device_t host_id);

tools/sdk/esp32/include/driver/include/esp_private/gdma.h

@@ -269,6 +269,9 @@ esp_err_t gdma_register_rx_event_callbacks(gdma_channel_handle_t dma_chan, gdma_
 /**
  * @brief Set DMA descriptor address and start engine
  *
+ * @note This function is allowed to run within ISR context
+ * @note This function is also allowed to run when Cache is disabled, if `CONFIG_GDMA_CTRL_FUNC_IN_IRAM` is enabled
+ *
  * @param[in] dma_chan GDMA channel handle, allocated by `gdma_new_channel`
  * @param[in] desc_base_addr Base address of descriptors (usually the descriptors are chained into a link or ring)
  * @return
@@ -281,6 +284,9 @@ esp_err_t gdma_start(gdma_channel_handle_t dma_chan, intptr_t desc_base_addr);
 /**
  * @brief Stop DMA engine
  *
+ * @note This function is allowed to run within ISR context
+ * @note This function is also allowed to run when Cache is disabled, if `CONFIG_GDMA_CTRL_FUNC_IN_IRAM` is enabled
+ *
  * @param[in] dma_chan GDMA channel handle, allocated by `gdma_new_channel`
  * @return
  *      - ESP_OK: Stop DMA engine successfully
@@ -291,6 +297,9 @@ esp_err_t gdma_stop(gdma_channel_handle_t dma_chan);
 
 /**
  * @brief Make the appended descriptors be aware to the DMA engine
+ *
+ * @note This function is allowed to run within ISR context
+ * @note This function is also allowed to run when Cache is disabled, if `CONFIG_GDMA_CTRL_FUNC_IN_IRAM` is enabled
  * @note This API could also resume a paused DMA engine, make sure new descriptors have been appended to the descriptor chain before calling it.
  *
  * @param[in] dma_chan GDMA channel handle, allocated by `gdma_new_channel`
@@ -303,6 +312,9 @@ esp_err_t gdma_append(gdma_channel_handle_t dma_chan);
 
 /**
  * @brief Reset DMA channel FIFO and internal finite state machine
+ *
+ * @note This function is allowed to run within ISR context
+ * @note This function is also allowed to run when Cache is disabled, if `CONFIG_GDMA_CTRL_FUNC_IN_IRAM` is enabled
  * @note Resetting a DMA channel won't break the connection with the target peripheral
  *
  * @param[in] dma_chan GDMA channel handle, allocated by `gdma_new_channel`

tools/sdk/esp32/include/esp_http_client/include/esp_http_client.h

@@ -149,7 +149,9 @@ typedef enum {
     HttpStatus_MultipleChoices   = 300,
     HttpStatus_MovedPermanently  = 301,
     HttpStatus_Found             = 302,
+    HttpStatus_SeeOther          = 303,
     HttpStatus_TemporaryRedirect = 307,
+    HttpStatus_PermanentRedirect = 308,
 
     /* 4xx - Client Error */
     HttpStatus_BadRequest        = 400,

tools/sdk/esp32/include/esp_lcd/include/esp_lcd_panel_io.h

@@ -98,7 +98,8 @@ typedef struct {
         unsigned int dc_as_cmd_phase: 1; /*!< D/C line value is encoded into SPI transaction command phase */
         unsigned int dc_low_on_data: 1;  /*!< If this flag is enabled, DC line = 0 means transfer data, DC line = 1 means transfer command; vice versa */
         unsigned int octal_mode: 1;      /*!< transmit with octal mode (8 data lines), this mode is used to simulate Intel 8080 timing */
-    } flags;
+        unsigned int lsb_first: 1;       /*!< transmit LSB bit first */
+    } flags; /*!< Extra flags to fine-tune the SPI device */
 } esp_lcd_panel_io_spi_config_t;
 
 /**
@@ -151,6 +152,8 @@ typedef struct {
     int data_gpio_nums[SOC_LCD_I80_BUS_WIDTH]; /*!< GPIOs used for data lines */
     size_t bus_width;          /*!< Number of data lines, 8 or 16 */
     size_t max_transfer_bytes; /*!< Maximum transfer size, this determines the length of internal DMA link */
+    size_t psram_trans_align;  /*!< DMA transfer alignment for data allocated from PSRAM */
+    size_t sram_trans_align;   /*!< DMA transfer alignment for data allocated from SRAM */
 } esp_lcd_i80_bus_config_t;
 
 /**

tools/sdk/esp32/include/esp_lcd/include/esp_lcd_panel_rgb.h

@@ -59,7 +59,7 @@ typedef struct {
     unsigned int hsync_front_porch; /*!< Horizontal front porch, number of PCLK between the end of active data and the next hsync */
     unsigned int vsync_pulse_width; /*!< Vertical sync width, unit: number of lines */
     unsigned int vsync_back_porch;  /*!< Vertical back porch, number of invalid lines between vsync and start of frame */
-    unsigned int vsync_front_porch; /*!< Vertical front porch, number of invalid lines between then end of frame and the next vsync */
+    unsigned int vsync_front_porch; /*!< Vertical front porch, number of invalid lines between the end of frame and the next vsync */
     struct {
         unsigned int hsync_idle_low: 1;  /*!< The hsync signal is low in IDLE state */
         unsigned int vsync_idle_low: 1;  /*!< The vsync signal is low in IDLE state */

tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_core.h

@@ -63,6 +63,8 @@ typedef struct {
     char *fw_version;
     /** Model (Optional). If not set, PROJECT_NAME is used as default (recommended)*/
     char *model;
+    /** Subtype (Optional). */
+    char *subtype;
 } esp_rmaker_node_info_t;
 
 /** ESP RainMaker Configuration */
@@ -430,10 +432,11 @@ esp_err_t esp_rmaker_node_add_attribute(const esp_rmaker_node_t *node, const cha
  */
 esp_err_t esp_rmaker_node_add_fw_version(const esp_rmaker_node_t *node, const char *fw_version);
 
-/** Add model for a node (Not recommended)
+/** Add model for a node
  *
  * Model is set internally to the project name. This API can be used to
- * override that name.
+ * override that name, now that a new field "project" has also been added
+ * internally to the node info.
  *
  * @param node Node handle.
  * @param[in] model New model string.
@@ -443,6 +446,16 @@ esp_err_t esp_rmaker_node_add_fw_version(const esp_rmaker_node_t *node, const ch
  */
 esp_err_t esp_rmaker_node_add_model(const esp_rmaker_node_t *node, const char *model);
 
+/** Add subtype for a node
+ *
+ * @param node Node handle.
+ * @param[in] subtype Subtype string.
+ *
+ * @return ESP_OK on success.
+ * @return error in case of failure.
+ */
+esp_err_t esp_rmaker_node_add_subtype(const esp_rmaker_node_t *node, const char *subtype);
+
 /**
  * Create a Device
  *
@@ -572,6 +585,18 @@ esp_err_t esp_rmaker_device_add_attribute(const esp_rmaker_device_t *device, con
  */
 esp_err_t esp_rmaker_device_add_subtype(const esp_rmaker_device_t *device, const char *subtype);
 
+/** Add a Device model
+ *
+ * This would primarily be used by the phone apps to render different icons for the same device type.
+ *
+ * @param[in] device Device handle.
+ * @param[in] model String describing the model.
+ *
+ * @return ESP_OK if the model was added successfully.
+ * @return error in case of failure.
+ */
+esp_err_t esp_rmaker_device_add_model(const esp_rmaker_device_t *device, const char *model);
+
 /** Get device name from handle
  *
  * @param[in] device Device handle.

tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_ota.h

@@ -34,6 +34,8 @@ typedef enum {
     OTA_STATUS_FAILED,
     /** OTA was delayed by the application */
     OTA_STATUS_DELAYED,
+    /** OTA rejected due to some reason (wrong project, version, etc.) */
+    OTA_STATUS_REJECTED,
 } ota_status_t;
 
 /** OTA Workflow type */
@@ -145,6 +147,29 @@ esp_err_t esp_rmaker_ota_enable(esp_rmaker_ota_config_t *ota_config, esp_rmaker_
  */
 esp_err_t esp_rmaker_ota_report_status(esp_rmaker_ota_handle_t ota_handle, ota_status_t status, char *additional_info);
 
+/** Default OTA callback
+ *
+ * This is the default OTA callback which will get used if you do not pass your own callback. You can call this
+ * even from your callback, in case you want better control on when the OTA can proceed and yet let the actual
+ * OTA process be managed by the RainMaker Core.
+ *
+ * @param[in] handle An OTA handle assigned by the ESP RainMaker Core
+ * @param[in] ota_data The data to be used for the OTA
+ *
+ * @return ESP_OK if the OTA was successful
+ * @return ESP_FAIL if the OTA failed.
+ * */
+esp_err_t esp_rmaker_ota_default_cb(esp_rmaker_ota_handle_t handle, esp_rmaker_ota_data_t *ota_data);
+
+/** Fetch OTA Info
+ *
+ * For OTA using Topics, this API can be used to explicitly ask the backend if an OTA is available.
+ * If it is, then the OTA callback would get invoked.
+ *
+ * @return ESP_OK if the OTA fetch publish message was successful.
+ * @return error on failure
+ */
+esp_err_t esp_rmaker_ota_fetch(void);
 #ifdef __cplusplus
 }
 #endif