Merge pull request #134 from SmartThingsCommunity/_update_version_1_8_12

Update version 1 8 12

Author: stdk-scm

example/esp32/README.md

@@ -12,6 +12,8 @@
 
 2. Setup ESP32 build environment according to [guide](https://docs.espressif.com/projects/esp-idf/en/release-v5.0/esp32/get-started/index.html)
 
+> **_NOTE:_** You can also setup other esp32 series like ESP32-S series, ESP32-C series according to their setup guide.
+
 3. Acquire SmartThings Device SDK workflow reading [Getting Started](../../doc/getting_started.md) Document
 
 ## How to build example
@@ -23,6 +25,19 @@
    $ idf.py build
    $ idf.py flash
    ```
+> **_NOTE:_** The examples's default sdkconfig is for esp32 board. To run the example on other esp32 series, change `CONFIG_IDF_TARGET` in sdkconfig with desired target board before build.
+>
+> For example, to run the example on esp32s3 board, change `CONFIG_IDF_TARGET` in sdkconfig file like below.
+>```vim
+>... (Skip) ...
+>CONFIG_IDF_TARGET="esp32s3"
+>... (Skip) ...
+>```
+>You may need to run fullclean to remove previous target board build configuration before building different target.
+>```sh
+>$ idf.py fullclean
+>```
+
 2. Run and monitor esp32. (Please refer [espressif guide](https://docs.espressif.com/projects/esp-idf/en/release-v5.0/esp32/get-started/linux-macos-setup.html#monitor-the-output))
 
     ```sh

src/include/bsp/iot_bsp_system.h

@@ -83,18 +83,6 @@ iot_error_t iot_bsp_system_get_time_in_sec(char* buf, unsigned int buf_len);
  */
 iot_error_t iot_bsp_system_set_time_in_sec(const char* time_in_sec);
 
-/**
- * @brief	Get device unique value
- * @details	The source of unique value
- * @param[out]	uid	a pointer of pointer to a unique id buffer
- * @param[out]	olen	the bytes written to unique id buffer
- * @return	iot_error_t
- * @retval	IOT_ERROR_NONE	success
- * @retval	IOT_ERROR_MEM_ALLOC alloc failed for unique id buffer
- * @retval	IOT_ERROR_NOT_IMPLEMENTED no way to make unique id
- */
-iot_error_t iot_bsp_system_get_uniqueid(unsigned char **uid, size_t *olen);
-
 #ifdef __cplusplus
 }
 #endif

src/include/st_dev_version.h

@@ -26,7 +26,7 @@
 #define VER_MINOR	8
 
 /* patch: bug fix */
-#define VER_PATCH	11
+#define VER_PATCH	12
 
 #define _STDK_STR(s) #s
 #define _STDK_VERSION_STR(a, b, c)	_STDK_STR(a) "." _STDK_STR(b) "." _STDK_STR(c)

src/iot_api.c

@@ -669,7 +669,7 @@ iot_error_t iot_get_time_in_sec(char *buf, size_t buf_len)
 	}
 
 	gettimeofday(&tv_now, NULL);
-	snprintf(buf, buf_len, "%lld", tv_now.tv_sec);
+	snprintf(buf, buf_len, "%lld", (long long)tv_now.tv_sec);
 
 	return IOT_ERROR_NONE;
 }
@@ -700,7 +700,7 @@ iot_error_t iot_get_time_in_ms(char *buf, size_t buf_len)
 
 	gettimeofday(&tv_now, NULL);
 	snprintf(buf, buf_len, "%lld%03ld",
-		tv_now.tv_sec, (tv_now.tv_usec / 1000));
+		(long long)tv_now.tv_sec, (tv_now.tv_usec / 1000));
 
 	return IOT_ERROR_NONE;
 }

src/port/bsp/esp32/iot_bsp_system_esp32.c

@@ -68,24 +68,3 @@ iot_error_t iot_bsp_system_set_time_in_sec(const char* time_in_sec)
 
 	return IOT_ERROR_NONE;
 }
-
-iot_error_t iot_bsp_system_get_uniqueid(unsigned char **uid, size_t *olen)
-{
-	unsigned int *buf;
-	unsigned int chipid_reg = EFUSE_BLK0_RDATA1_REG; /* CRC of MAC */
-	size_t chipid_len = 2 * sizeof(unsigned int);
-
-	buf = (unsigned int *)malloc(chipid_len);
-	if (buf == NULL) {
-		IOT_ERROR("malloc failed for uid");
-		return IOT_ERROR_MEM_ALLOC;
-	}
-
-	buf[0] = REG_READ(chipid_reg + 0x0);
-	buf[1] = REG_READ(chipid_reg + 0x4);
-
-	*uid = (unsigned char *)buf;
-	*olen = chipid_len;
-
-	return IOT_ERROR_NONE;
-}

src/port/bsp/esp32/iot_bsp_wifi_esp32.c

@@ -23,11 +23,6 @@
 #include "freertos/event_groups.h"
 
 #include "esp_idf_version.h"
-#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4,0,0))
-#include "esp32/rom/ets_sys.h"
-#else
-#include "rom/ets_sys.h"
-#endif
 #include "esp_wifi.h"
 #include "esp_event.h"
 #include "esp_log.h"
@@ -520,11 +515,9 @@ uint16_t iot_bsp_wifi_get_scan_result(iot_wifi_scan_result_t *scan_result)
 					iot_wifi_auth_mode_t conv_auth_mode;
 
 					switch (ap_list[i].authmode) {
-#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4,3,0))
 						case WIFI_AUTH_WAPI_PSK:
 							conv_auth_mode = IOT_WIFI_AUTH_UNKNOWN;
 							break;
-#endif
 						case WIFI_AUTH_WPA2_WPA3_PSK:
 						case WIFI_AUTH_WPA3_PSK:
 							conv_auth_mode = IOT_WIFI_AUTH_WPA3_PERSONAL;

src/port/bsp/esp32c3/iot_bsp_system_esp32c3.c

@@ -68,24 +68,3 @@ iot_error_t iot_bsp_system_set_time_in_sec(const char* time_in_sec)
 
 	return IOT_ERROR_NONE;
 }
-
-iot_error_t iot_bsp_system_get_uniqueid(unsigned char **uid, size_t *olen)
-{
-	unsigned int *buf;
-	unsigned int chipid_reg = EFUSE_RD_MAC_SPI_SYS_0_REG; /* FACTORY MAC */
-	size_t chipid_len = 2 * sizeof(unsigned int);
-
-	buf = (unsigned int *)malloc(chipid_len);
-	if (buf == NULL) {
-		IOT_ERROR("malloc failed for uid");
-		return IOT_ERROR_MEM_ALLOC;
-	}
-
-	buf[0] = REG_READ(chipid_reg + 0x0);
-	buf[1] = REG_READ(chipid_reg + 0x4);
-
-	*uid = (unsigned char *)buf;
-	*olen = chipid_len;
-
-	return IOT_ERROR_NONE;
-}

src/port/bsp/esp32s2/iot_bsp_system_esp32s2.c

@@ -68,27 +68,3 @@ iot_error_t iot_bsp_system_set_time_in_sec(const char* time_in_sec)
 
 	return IOT_ERROR_NONE;
 }
-
-iot_error_t iot_bsp_system_get_uniqueid(unsigned char **uid, size_t *olen)
-{
-	/* TODO : Neet to be reviewed */
-#if 0
-	unsigned int *buf;
-	unsigned int chipid_reg = EFUSE_BLK0_RDATA1_REG; /* CRC of MAC */
-	size_t chipid_len = 2 * sizeof(unsigned int);
-
-	buf = (unsigned int *)malloc(chipid_len);
-	if (buf == NULL) {
-		IOT_ERROR("malloc failed for uid");
-		return IOT_ERROR_MEM_ALLOC;
-	}
-
-	buf[0] = REG_READ(chipid_reg + 0x0);
-	buf[1] = REG_READ(chipid_reg + 0x4);
-
-	*uid = (unsigned char *)buf;
-	*olen = chipid_len;
-#endif
-
-	return IOT_ERROR_BAD_REQ;
-}

src/port/bsp/esp8266/iot_bsp_system_esp8266.c

@@ -69,26 +69,3 @@ iot_error_t iot_bsp_system_set_time_in_sec(const char* time_in_sec)
 
 	return IOT_ERROR_NONE;
 }
-
-iot_error_t iot_bsp_system_get_uniqueid(unsigned char **uid, size_t *olen)
-{
-	unsigned int *buf;
-	unsigned int *chipid_reg = (unsigned int *)EFUSE_DATA0_REG;
-	size_t chipid_len = 4 * sizeof(unsigned int);
-
-	buf = (unsigned int *)malloc(chipid_len);
-	if (buf == NULL) {
-		IOT_ERROR("malloc failed for uid");
-		return IOT_ERROR_MEM_ALLOC;
-	}
-
-	buf[0] = REG_READ(chipid_reg++);
-	buf[2] = REG_READ(chipid_reg++);
-	buf[1] = REG_READ(chipid_reg++);
-	buf[3] = REG_READ(chipid_reg++);
-
-	*uid = (unsigned char *)buf;
-	*olen = chipid_len;
-
-	return IOT_ERROR_NONE;
-}

src/port/bsp/linux/iot_bsp_system_linux.c

@@ -74,29 +74,3 @@ iot_error_t iot_bsp_system_set_time_in_sec(const char* time_in_sec)
 
 	return IOT_ERROR_NONE;
 }
-
-iot_error_t iot_bsp_system_get_uniqueid(unsigned char **uid, size_t *olen)
-{
-	FILE *fp = NULL;
-	unsigned char *machine_id;
-	int pos;
-
-	machine_id = (unsigned char*)malloc(MACHINE_ID_LEN_BYTES);
-	if (!machine_id)
-		return IOT_ERROR_MEM_ALLOC;
-
-	fp = fopen(MACHINE_ID_FILE, "r");
-	if (!fp) {
-		printf("could not open the file: %s", MACHINE_ID_FILE);
-		return IOT_ERROR_READ_FAIL;
-	}
-
-	for (pos = 0; pos < MACHINE_ID_LEN_BYTES && !feof(fp); pos++)
-		fscanf(fp, "%2hhx", &machine_id[pos]);
-
-	fclose(fp);
-	*uid = machine_id;
-	*olen = MACHINE_ID_LEN_BYTES;
-
-	return IOT_ERROR_NONE;
-}