new partitions and bugfixes

fix #31
fix #33

Author: kglowacki

components/awsiot/awsiot_rest.c

@@ -58,6 +58,9 @@ esp_err_t awsiot_update_shadow(awsiot_config_t* awsiot_config, char* body) {
 //	sprintf(host_header, "Host: %s", awsiot_config->endpoint);
 
 	request_t* req = req_new(uri);
+	if (!req) {
+		return ESP_FAIL;
+	}
 
 	req->ca_cert = req_parse_x509_crt((unsigned char*)verisign_root_ca_pem_start, verisign_root_ca_pem_end-verisign_root_ca_pem_start);
 	if (!req->ca_cert) {

components/net/thing_speak.c

@@ -43,6 +43,7 @@ static void set_config_str_field(char** field, char* value) {
 
 static char* prepare_thingspeak_payload(oap_measurement_t* meas) {
 	char* payload = malloc(512);
+	if (!payload) return NULL;
 	sprintf(payload, "api_key=%s", apikey);
 
 	if (meas->pm) {
@@ -69,6 +70,9 @@ static char* prepare_thingspeak_payload(oap_measurement_t* meas) {
 
 static esp_err_t rest_post(char* uri, char* payload) {
 	request_t* req = req_new(uri);
+	if (!req) {
+		return ESP_FAIL;
+	}
 	ESP_LOGD(TAG, "request payload: %s", payload);
 
 	req_setopt(req, REQ_SET_POSTFIELDS, payload);
@@ -116,10 +120,13 @@ static esp_err_t thing_speak_send(oap_measurement_t* meas, oap_sensor_config_t*
 	}
 
 	char* payload = prepare_thingspeak_payload(meas);
-	esp_err_t ret = rest_post(OAP_THING_SPEAK_URI, payload);
-	free(payload);
-
-	return ret;
+	if (payload) {
+		esp_err_t ret = rest_post(OAP_THING_SPEAK_URI, payload);
+		free(payload);
+		return ret;
+	} else {
+		return ESP_FAIL;
+	}
 }
 
 oap_publisher_t thingspeak_publisher = {

components/oap_common/include/oap_debug.h

@@ -33,3 +33,4 @@ void heap_log_free(heap_log* log);
 
 void log_task_stack(const char* task);
 void log_heap_size(const char* msg);
+void reduce_heap_size_to(size_t size);

components/oap_common/oap_debug.c

@@ -53,6 +53,22 @@ void log_heap_size(const char* msg) {
 	last_free_heap = free_heap;
 }
 
+static void* dummy;
+void reduce_heap_size_to(size_t size) {
+	size_t reduce_by = xPortGetFreeHeapSize() - size;
+	if (reduce_by > 0) {
+		ESP_LOGE(TAG, "********************** REDUCE HEAP BY %d TO %d bytes !!!!!!!!!!!", reduce_by, size);
+		do {
+			size_t block = reduce_by > 10000 ? 10000 : reduce_by;
+			reduce_by-=block;
+			dummy = malloc(block);
+			if (!dummy) {
+				ESP_LOGE(TAG, "FAILED TO ALLOCATE!");
+			}
+		} while (reduce_by > 0);
+	}
+}
+
 static int heap_log_count = 0;
 
 /*

components/oap_common/test/test_oap_storage.c

@@ -100,7 +100,7 @@ TEST_CASE("bigblob", "[oap_common]")
 {
 	nvs_clean_if_necessary();
 
-	size_t blob_size = MAX_NVS_VALUE_SIZE * 1 + 10;
+	size_t blob_size = MAX_NVS_VALUE_SIZE * 10 + 10;
 	void* blob = malloc(blob_size);
 
 	TEST_ESP_ERR(ESP_ERR_NVS_NOT_FOUND, storage_get_bigblob("blob", &blob, NULL));

components/ota/ota.c

@@ -144,6 +144,9 @@ esp_err_t fetch_last_ota_info(ota_config_t* ota_config, ota_info_t* ota_info)
 {
 	ESP_LOGI(TAG, "fetch ota info from %s", ota_config->index_uri);
     request_t* req = req_new(ota_config->index_uri);
+    if (!req) {
+    	return OAP_OTA_ERR_REQUEST_FAILED;
+    }
 
 //	ESP_LOGI(TAG, "REQ.HOST:%s", (char*)req_list_get_key(req->opt, "host")->value);
 //	ESP_LOGI(TAG, "REQ.PATH:%s", (char*)req_list_get_key(req->opt, "path")->value);
@@ -202,6 +205,9 @@ esp_err_t download_ota_binary(ota_config_t* ota_config, ota_info_t* ota_info, es
     ESP_LOGI(TAG, "download ota binary from %s", file_uri);
 
     request_t* req = req_new(file_uri);
+    if (!req) {
+    	return OAP_OTA_ERR_REQUEST_FAILED;
+    }
     req->ca_cert = req_parse_x509_crt((unsigned char*)_root_ca_pem_start, _root_ca_pem_end-_root_ca_pem_start);
 
     req_setopt(req, REQ_SET_HEADER, "Connection: close");
@@ -350,6 +356,7 @@ esp_err_t check_ota(ota_config_t* ota_config) {
 }
 
 static void check_ota_task(ota_config_t* ota_config) {
+	delay(1000);
 	check_ota(ota_config);
 	vTaskDelete(NULL);
 }

main/main.c

@@ -357,6 +357,8 @@ void app_main() {
 	delay(1000);
 	ESP_LOGI(TAG,"starting app... firmware %s", oap_version_str());
 
+	//130kb is a nice cap to test against alloc fails
+	//reduce_heap_size_to(130000);
 	storage_init();
 
 	ESP_LOGD(TAG, "retrieve sensor config");

partitions.csv

@@ -0,0 +1,9 @@
+# Name,   Type, SubType, Offset,   Size
+# Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
+nvs,      data, nvs,     0x9000,   0x13000
+otadata,  data, ota,     0x1c000,  0x2000
+phy_init, data, phy,     0x1e000,  0x1000
+factory,  0,    0,       0x30000,  0x140000
+coredump, data, coredump,,         0x10000
+ota_0,    0,    ota_0,   ,         0x140000
+ota_1,    0,    ota_1,   ,         0x140000

sdkconfig.defaults

@@ -29,7 +29,7 @@ CONFIG_LOG_BOOTLOADER_LEVEL=2
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
+CONFIG_ESPTOOLPY_PORT="/opt/oap/dev/ttyOAP"
 # CONFIG_ESPTOOLPY_BAUD_115200B is not set
 # CONFIG_ESPTOOLPY_BAUD_230400B is not set
 CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -74,20 +74,18 @@ CONFIG_MONITOR_BAUD=115200
 #
 # OpenAirProject
 #
-CONFIG_OAP_PM_SAMPLE_BUF_SIZE=120
-CONFIG_OAP_RESULT_BUFFER_SIZE=1
 CONFIG_OAP_CONTROL_PANEL=1
 
 #
 # Partition Table
 #
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-CONFIG_PARTITION_TABLE_TWO_OTA=y
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
-CONFIG_PARTITION_TABLE_FILENAME="partitions_two_ota.csv"
-CONFIG_APP_OFFSET=0x10000
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x30000
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_APP_OFFSET=0x30000
 
 #
 # Compiler options
@@ -441,7 +439,6 @@ CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_OAP_OTA_ENABLED=1
 CONFIG_OAP_OTA_BIN_URI_PREFIX="https://openairproject.com/ota/"
 CONFIG_OAP_OTA_INDEX_URI="https://openairproject.com/ota/index.txt"
-CONFIG_OAP_OTA_CHECK_INTERVAL=3600
 
 #
 # OAP Peripherals
@@ -451,6 +448,13 @@ CONFIG_OAP_LED_G_PIN=27
 CONFIG_OAP_LED_B_PIN=14
 CONFIG_OAP_BTN_0_PIN=39
 
+#
+# OAP measurements
+#
+CONFIG_OAP_PM_SAMPLE_BUF_SIZE=120
+CONFIG_OAP_HEATER_CONTROL_PIN=21
+CONFIG_OAP_FAN_CONTROL_PIN=22
+
 #
 # OAP PMSx003 Sensor
 #
@@ -460,8 +464,6 @@ CONFIG_OAP_PM_UART_RXD_PIN=13
 CONFIG_OAP_PM_UART_TXD_PIN=5
 CONFIG_OAP_PM_UART_RTS_PIN=18
 CONFIG_OAP_PM_UART_CTS_PIN=19
-CONFIG_OAP_HEATER_CONTROL_PIN=21
-CONFIG_OAP_FAN_CONTROL_PIN=22
 CONFIG_OAP_PM_ENABLED_AUX=0
 CONFIG_OAP_PM_UART_NUM_AUX=0x2
 CONFIG_OAP_PM_SENSOR_CONTROL_PIN_AUX=2

unit-test-app/partition_table_unit_test_app.csv

@@ -1,10 +1,10 @@
-# Special partition table for unit test app
-#
-# Name,     Type, SubType, Offset,   Size, Flags
+# Let's keep it the same as for app
+# Name,   Type, SubType, Offset,   Size
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,        data, nvs,     0x9000,  0x6000
-#otadata,    data, ota,     0xd000,  0x2000
-phy_init,   data, phy,     0xf000,  0x1000
-factory,    0,    0,       0x10000, 0x140000
-ota_0,      0,    ota_0,   ,        256K
-ota_1,      0,    ota_1,   ,        256K
+nvs,      data, nvs,     0x9000,   0x13000
+otadata,  data, ota,     0x1c000,  0x2000
+phy_init, data, phy,     0x1e000,  0x1000
+factory,  0,    0,       0x30000,  0x140000
+coredump, data, coredump,,         0x10000
+ota_0,    0,    ota_0,   ,         0x140000
+ota_1,    0,    ota_1,   ,         0x140000

unit-test-app/sdkconfig.defaults

@@ -31,7 +31,7 @@ CONFIG_LOG_BOOTLOADER_LEVEL=3
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
+CONFIG_ESPTOOLPY_PORT="/opt/oap/dev/ttyOAP.TEST"
 # CONFIG_ESPTOOLPY_BAUD_115200B is not set
 # CONFIG_ESPTOOLPY_BAUD_230400B is not set
 CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -80,9 +80,9 @@ CONFIG_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table_unit_test_app.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x30000
 CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_app.csv"
-CONFIG_APP_OFFSET=0x10000
+CONFIG_APP_OFFSET=0x30000
 
 #
 # Compiler options
@@ -424,11 +424,6 @@ CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 
-#
-# OAP measurements
-#
-CONFIG_OAP_PM_SAMPLE_BUF_SIZE=120
-
 #
 # OpenSSL
 #
@@ -442,7 +437,6 @@ CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_OAP_OTA_ENABLED=1
 CONFIG_OAP_OTA_BIN_URI_PREFIX="https://openairproject.com/ota/"
 CONFIG_OAP_OTA_INDEX_URI="https://openairproject.com/ota/index.txt"
-CONFIG_OAP_OTA_CHECK_INTERVAL=3600
 
 #
 # OAP Peripherals
@@ -452,6 +446,13 @@ CONFIG_OAP_LED_G_PIN=27
 CONFIG_OAP_LED_B_PIN=14
 CONFIG_OAP_BTN_0_PIN=35
 
+#
+# OAP measurements
+#
+CONFIG_OAP_PM_SAMPLE_BUF_SIZE=120
+CONFIG_OAP_HEATER_CONTROL_PIN=21
+CONFIG_OAP_FAN_CONTROL_PIN=22
+
 #
 # OAP PMSx003 Sensor
 #
@@ -461,8 +462,6 @@ CONFIG_OAP_PM_UART_RXD_PIN=13
 CONFIG_OAP_PM_UART_TXD_PIN=5
 CONFIG_OAP_PM_UART_RTS_PIN=18
 CONFIG_OAP_PM_UART_CTS_PIN=19
-CONFIG_OAP_HEATER_CONTROL_PIN=21
-CONFIG_OAP_FAN_CONTROL_PIN=22
 CONFIG_OAP_PM_ENABLED_AUX=0
 CONFIG_OAP_PM_UART_NUM_AUX=0x2
 CONFIG_OAP_PM_SENSOR_CONTROL_PIN_AUX=2