Development

.gitignore

@@ -1,3 +1,4 @@
+*.bin
 firmware/**
 firmware/v*/**
 firmware/releaseNote.txt
@@ -70,4 +71,5 @@ _deps
 
 
 dependencies.lock
-sdkconfig.old
+sdkconfig.old
+sdkconfig

README.md

@@ -36,12 +36,10 @@ Navigate to your terminal or bash shell and execute the following commands:
 
 ```bash
 git clone --recursive git@github.com:ezloteam/Ezlo_Pi.git ezlopi
-cd ezlopi/firmware/ezlopi
+cd Ezlo_Pi
 ```
 ### 2. Configure the Projec
-You need to configure the project as per the chip type you are using. It needs to be modified the file ```sdkconfig``` , equivalent to making changes with ```idf.py menuconfig```.
-EzloPi needs to have constant set of configurations which are defined for different variants of chips and saved in the file such that ```sdkconfig.<chip type>.<flash size>```. Copy the content of the chip you are using and paste it into ```sdkconfig```. For example if I want to build and run this firmware on ESP32C3 with 4MB of memory, I need to copy content of [sdkconfig.esp32c3.4mb](sdkconfig.esp32c3.4mb) into ```sdkconfig``` or rename the file ```sdkconfig.esp32c3.4mb``` to ```sdkconfig```, and then build as mentioned at #2. The list of pre-defined ```sdkconfig``` for different variants of ESP32 are listed as : 
-
+You need to configure the project as per the chip type you are using. It needs to be renamed the file ```sdkconfig.<chip type>.<flash size>``` to ```sdkconfig``` and then build the project with IDF command.
 * __[ESP32 4MB Standard](sdkconfig.esp32.4mb)__
 * __[ESP32-S3 4MB ](sdkconfig.esp32s3.4mb)__
 * __[ESP32-S3 8MB](sdkconfig.esp32s3.8mb)__

ezlopi-cloud/ezlopi-cloud-constants/ezlopi_cloud_keywords.c

@@ -83,6 +83,8 @@ const char* ezlopi_firmware_version_str = "firmware_version";
 const char* ezlopi_uptime_str = "uptime";
 const char* ezlopi_mac_str = "mac";
 const char* ezlopi_uuid_str = "uuid";
+const char* ezlopi_cloud_uuid_str = "cloud_uuid";
+const char* ezlopi_config_version_str = "config_version";
 const char* ezlopi_firmware_type_str = "firmware_type";
 const char* ezlopi_deviceTypeId_str = "deviceTypeId";
 const char* ezlopi_parentDeviceId_str = "parentDeviceId";
@@ -161,9 +163,11 @@ const char* ezlopi_internet_status_str = "internet_status";
 const char* ezlopi_build_date_str = "build_date";
 const char* ezlopi_unknown_str = "unknown";
 const char* ezlopi_manufacturer_name_str = "manufacturer_name";
+const char* ezlopi_build_str = "build";
 const char* ezlopi_firmware_build_str = "firmware_build";
 const char* ezlopi_chip_str = "chip";
 const char* ezlopi_provisioned_status_str = "provisioned_status";
+const char* ezlopi_provisioned_str = "provisioned";
 const char* ezlopi_model_number_str = "model_number";
 const char* ezlopi_serial_str = "serial";
 const char* ezlopi_uuid_provisioning_str = "uuid_provisioning";
@@ -172,6 +176,7 @@ const char* ezlopi_cloud_server_str = "cloud_server";
 const char* ezlopi_provision_token_str = "provision_token";
 const char* ezlopi_device_type_ezlopi_str = "device_type_ezlopi";
 const char* ezlopi_ssl_private_key_str = "ssl_private_key";
+const char* ezlopi_ssl_public_key_str = "ssl_public_key";
 const char* ezlopi_ssl_shared_key_str = "ssl_shared_key";
 const char* ezlopi_signing_ca_certificate_str = "signing_ca_certificate";
 const char* ezlopi_len_str = "len";
@@ -186,10 +191,8 @@ const char* ezlopi_config_id_str = "config_id";
 const char* ezlopi_config_time_str = "config_time";
 const char* ezlopi_ssid_str = "ssid";
 const char* ezlopi_dev_type_ezlopi_str = "dev_type_ezlopi";
-const char* ezlopi_dev_flash_str = "dev_flash";
+const char* ezlopi_flash_size_str = "flash_size";
 const char* ezlopi_dev_free_flash_str = "dev_free_flash";
-const char* ezlopi_manf_name_str = "manf_name";
-const char* ezlopi_model_num_str = "model_num";
 const char* ezlopi_sta_connection_str = "sta_connection";
 const char* ezlopi_ip_sta_str = "ip_sta";
 const char* ezlopi_ip_nmask_str = "ip_nmask";
@@ -201,13 +204,19 @@ const char* ezlopi_uuid_prov_str = "uuid_prov";
 const char* ezlopi_status_write_str = "status_write";
 const char* ezlopi_status_connect_str = "status_connect";
 const char* ezlopi_first_start_str = "first_start";
+
 const char* ezlopi_gpio1_str = "gpio1";
 const char* ezlopi_gpio2_str = "gpio2";
 const char* ezlopi_gpio3_str = "gpio3";
+const char* ezlopi_gpio4_str = "gpio4";
+const char* ezlopi_gpio5_str = "gpio5";
+const char* ezlopi_gpio6_str = "gpio6";
+const char* ezlopi_gpio7_str = "gpio7";
+const char* ezlopi_gpio8_str = "gpio8";
+
 const char* ezlopi_gpio_tx_str = "gpio_tx";
 const char* ezlopi_gpio_rx_str = "gpio_rx";
 const char* ezlopi_baud_str = "baud";
-const char* ezlopi_baud_rate_str = "baud_rate";
 const char* ezlopi_sceneId_str = "sceneId";
 const char* ezlopi_changed_by_str = "changed_by";
 
@@ -217,14 +226,15 @@ const char* scene_status_partially_finished_str = "partially_finished";
 const char* scene_status_failed_str = "failed";
 const char* scene_status_stopped_str = "stopped";
 
-const char* ezlopi_valueformatted_str = "valueFormatted";
-const char* ezlopi_value_default_str = "valueDefault";
+// const char* ezlopi_valueformatted_str = "valueFormatted";
+const char* ezlopi_valueDefault_str = "valueDefault";
 const char* ezlopi_text_str = "text";
 const char* ezlopi_lang_tag_str = "lang_tag";
 const char* ezlopi_description_str = "description";
-const char* ezlopi_value_min_str = "valueMin";
-const char* ezlopi_value_max_str = "valueMax";
+const char* ezlopi_valueMin_str = "valueMin";
+const char* ezlopi_valueMax_str = "valueMax";
 const char* ezlopi_idle_str = "idle";
+const char* ezlopi_is_active_str = "is_active";
 
 const char* ezlopi_armed_str = "armed";
 const char* ezlopi_subtype_str = "subtype";
@@ -269,4 +279,44 @@ const char* ezlopi_houseMode_str = "houseMode";
 
 const char* ezlopi_client_id_str = "client_id";
 
+const char* ezlopi_endValue_str = "endValue";
+const char* ezlopi_startValue_str = "startValue";
+const char* ezlopi_item_str = "item";
+const char* ezlopi_comparator_str = "comparator";
+const char* ezlopi_scenes_str = "scenes";
+
+const char* ezlopi_logic_inv_str = "logic_inv";
+const char* ezlopi_duty_cycle_str = "duty_cycle";
+const char* ezlopi_freq_hz_str = "freq_hz";
+const char* ezlopi_slave_addr_str = "slave_addr";
+const char* ezlopi_pull_up_str = "pull_up";
+
+const char* ezlopi_red_str = "red";
+const char* ezlopi_green_str = "green";
+const char* ezlopi_blue_str = "blue";
+const char* ezlopi_cwhite_str = "cwhite";
+
+const char* ezlopi_minValue_str = "minValue";
+const char* ezlopi_maxValue_str = "maxValue";
+
+const char* ezlopi_confidence_level_str = "confidence_level";
+const char* ezlopi_elementType_str = "elementType";
+
+const char* ezlopi_min_move_distance_str = "min_move_distance";
+const char* ezlopi_max_move_distance_str = "max_move_distance";
+const char* ezlopi_min_still_distance_str = "min_still_distance";
+const char* ezlopi_max_still_distance_str = "max_still_distance";
+const char* ezlopi_timeout_str = "timeout";
+
+const char* ezlopi_latitude_str = "latitude";
+const char* ezlopi_longitude_str = "longitude";
+
+const char* ezlopi_urls_str = "urls";
+
+const char* ezlopi_parity_str = "parity";
+const char* ezlopi_start_bits_str = "start_bits";
+const char* ezlopi_stop_bits_str = "stop_bits";
+const char* ezlopi_frame_size_str = "frame_size";
+const char* ezlopi_flow_control_str = "flow_control";
+
 #endif // __EZLOPI_CLOUD_KEYWORDS_H__

ezlopi-cloud/ezlopi-cloud-constants/ezlopi_cloud_keywords.h

@@ -84,6 +84,8 @@ extern const char* ezlopi_firmware_version_str;
 extern const char* ezlopi_uptime_str;
 extern const char* ezlopi_mac_str;
 extern const char* ezlopi_uuid_str;
+extern const char* ezlopi_cloud_uuid_str;
+extern const char* ezlopi_config_version_str;
 extern const char* ezlopi_firmware_type_str;
 extern const char* ezlopi_deviceTypeId_str;
 extern const char* ezlopi_parentDeviceId_str;
@@ -163,9 +165,11 @@ extern const char* ezlopi_internet_status_str;
 extern const char* ezlopi_build_date_str;
 extern const char* ezlopi_unknown_str;
 extern const char* ezlopi_manufacturer_name_str;
-extern const char* ezlopi_firmware_build_str;
+extern const char* ezlopi_build_str;
+const char* ezlopi_firmware_build_str;
 extern const char* ezlopi_chip_str;
 extern const char* ezlopi_provisioned_status_str;
+const char* ezlopi_provisioned_str;
 extern const char* ezlopi_model_number_str;
 extern const char* ezlopi_serial_str;
 extern const char* ezlopi_uuid_provisioning_str;
@@ -174,6 +178,7 @@ extern const char* ezlopi_cloud_server_str;
 extern const char* ezlopi_provision_token_str;
 extern const char* ezlopi_device_type_ezlopi_str;
 extern const char* ezlopi_ssl_private_key_str;
+extern const char* ezlopi_ssl_public_key_str;
 extern const char* ezlopi_ssl_shared_key_str;
 extern const char* ezlopi_signing_ca_certificate_str;
 extern const char* ezlopi_len_str;
@@ -188,10 +193,8 @@ extern const char* ezlopi_config_id_str;
 extern const char* ezlopi_config_time_str;
 extern const char* ezlopi_ssid_str;
 extern const char* ezlopi_dev_type_ezlopi_str;
-extern const char* ezlopi_dev_flash_str;
+extern const char* ezlopi_flash_size_str;
 extern const char* ezlopi_dev_free_flash_str;
-extern const char* ezlopi_manf_name_str;
-extern const char* ezlopi_model_num_str;
 extern const char* ezlopi_sta_connection_str;
 extern const char* ezlopi_ip_sta_str;
 extern const char* ezlopi_ip_nmask_str;
@@ -203,13 +206,19 @@ extern const char* ezlopi_uuid_prov_str;
 extern const char* ezlopi_status_write_str;
 extern const char* ezlopi_status_connect_str;
 extern const char* ezlopi_first_start_str;
+
 extern const char* ezlopi_gpio1_str;
 extern const char* ezlopi_gpio2_str;
 extern const char* ezlopi_gpio3_str;
+extern const char* ezlopi_gpio4_str;
+extern const char* ezlopi_gpio5_str;
+extern const char* ezlopi_gpio6_str;
+extern const char* ezlopi_gpio7_str;
+extern const char* ezlopi_gpio8_str;
+
 extern const char* ezlopi_gpio_tx_str;
 extern const char* ezlopi_gpio_rx_str;
 extern const char* ezlopi_baud_str;
-extern const char* ezlopi_baud_rate_str;
 extern const char* ezlopi_sceneId_str;
 extern const char* ezlopi_changed_by_str;
 
@@ -221,16 +230,18 @@ extern const char* scene_status_stopped_str;
 extern const char* ezlopi_armed_str;
 extern const char* ezlopi_subtype_str;
 
-extern const char* ezlopi_value_default_str;
+extern const char* ezlopi_valueDefault_str;
 extern const char* ezlopi_text_str;
 extern const char* ezlopi_label_str;
 extern const char* ezlopi_lang_tag_str;
 extern const char* ezlopi_description_str;
 extern const char* ezlopi_value_type_str;
-extern const char* ezlopi_value_min_str;
-extern const char* ezlopi_value_max_str;
+extern const char* ezlopi_valueMin_str;
+extern const char* ezlopi_valueMax_str;
 extern const char* ezlopi_no_str;
 extern const char* ezlopi_idle_str;
+extern const char* ezlopi_is_active_str;
+
 extern const char* ezlopi_location_str;
 extern const char* ezlopi_locations_str;
 extern const char* ezlopi_custom_timezone_str;
@@ -271,4 +282,44 @@ extern const char* ezlopi_houseMode_str;
 extern const char* ezlopi_client_id_str;
 extern const char* ezlopi_source_str;
 
+extern const char* ezlopi_endValue_str;
+extern const char* ezlopi_startValue_str;
+extern const char* ezlopi_item_str;
+extern const char* ezlopi_comparator_str;
+extern const char* ezlopi_scenes_str;
+
+extern const char* ezlopi_logic_inv_str;
+extern const char* ezlopi_duty_cycle_str;
+extern const char* ezlopi_freq_hz_str;
+extern const char* ezlopi_slave_addr_str;
+extern const char* ezlopi_pull_up_str;
+
+extern const char* ezlopi_red_str;
+extern const char* ezlopi_green_str;
+extern const char* ezlopi_blue_str;
+extern const char* ezlopi_cwhite_str;
+
+extern const char* ezlopi_minValue_str;
+extern const char* ezlopi_maxValue_str;
+
+extern const char* ezlopi_confidence_level_str;
+extern const char* ezlopi_elementType_str;
+
+extern const char* ezlopi_min_move_distance_str;
+extern const char* ezlopi_max_move_distance_str;
+extern const char* ezlopi_min_still_distance_str;
+extern const char* ezlopi_max_still_distance_str;
+extern const char* ezlopi_timeout_str;
+
+extern const char* ezlopi_latitude_str;
+extern const char* ezlopi_longitude_str;
+
+extern const char* ezlopi_urls_str;
+
+const char* ezlopi_parity_str;
+const char* ezlopi_start_bits_str;
+const char* ezlopi_stop_bits_str;
+const char* ezlopi_frame_size_str;
+const char* ezlopi_flow_control_str;
+
 #endif // __EZLOPI_CLOUD_KEYWORDS_H__

ezlopi-cloud/ezlopi-cloud-coordinates/CMakeLists.txt

@@ -5,6 +5,7 @@ idf_component_register(SRCS "ezlopi_cloud_coordinates.c"
                         REQUIRES    json
                                     ezlopi-util-trace
                                     ezlopi-core-nvs
+                                    ezlopi-core-ezlopi
                                     ezlopi-cloud-constants
                         )
 

ezlopi-cloud/ezlopi-cloud-coordinates/ezlopi_cloud_coordinates.c

@@ -4,50 +4,51 @@
 #include "ezlopi_util_trace.h"
 
 #include "ezlopi_core_nvs.h"
+#include "ezlopi_core_cjson_macros.h"
 
 #include "ezlopi_cloud_constants.h"
 #include "ezlopi_cloud_coordinates.h"
 
-static float latitude;
-static float longitude;
+static double sg_latitude;
+static double sg_longitude;
 
 void hub_coordinates_set(cJSON* cj_request, cJSON* cj_response)
 {
-    cJSON_AddItemReferenceToObject(cj_response, ezlopi_id_str, cJSON_GetObjectItem(cj_request, ezlopi_id_str));
-    cJSON_AddItemReferenceToObject(cj_response, ezlopi_method_str, cJSON_GetObjectItem(cj_request, ezlopi_method_str));
     cJSON_AddObjectToObject(cj_response, ezlopi_result_str);
     if (cj_request)
     {
         cJSON* cj_params = cJSON_GetObjectItem(cj_request, ezlopi_params_str);
         if (cj_params)
         {
-            latitude = cJSON_GetObjectItem(cj_params, "latitude")->valuedouble;
-            longitude = cJSON_GetObjectItem(cj_params, "longitude")->valuedouble;
-            char* lat_long_str = cJSON_Print(cj_params);
-            cJSON_Minify(lat_long_str);
-            ezlopi_nvs_write_latitude_longitude(lat_long_str);
-            free(lat_long_str);
+            CJSON_GET_VALUE_DOUBLE(cj_params, ezlopi_latitude_str, sg_latitude);
+            CJSON_GET_VALUE_DOUBLE(cj_params, ezlopi_longitude_str, sg_longitude);
+
+            char lat_long_str[256];
+            if (cJSON_PrintPreallocated(cj_params, lat_long_str, sizeof(lat_long_str), false))
+            {
+                ezlopi_nvs_write_latitude_longitude(lat_long_str);
+            }
         }
     }
 }
 
 void hub_coordinates_get(cJSON* cj_request, cJSON* cj_response)
 {
-    cJSON_AddItemReferenceToObject(cj_response, ezlopi_id_str, cJSON_GetObjectItem(cj_request, ezlopi_id_str));
-    cJSON_AddItemReferenceToObject(cj_response, ezlopi_method_str, cJSON_GetObjectItem(cj_request, ezlopi_method_str));
     char* lat_long_vals = ezlopi_nvs_read_latidtude_longitude();
-    cJSON* cj_lat_long_val = cJSON_Parse(lat_long_vals);
-    cJSON_AddItemToObject(cj_response, ezlopi_result_str, cj_lat_long_val);
-    free(lat_long_vals);
+    if (lat_long_vals)
+    {
+        cJSON_AddRawToObject(cj_response, ezlopi_result_str, lat_long_vals);
+        free(lat_long_vals);
+    }
 }
 
-float ezlopi_cloud_get_latitude()
+double ezlopi_cloud_get_latitude()
 {
-    return latitude;
+    return sg_latitude;
 }
 
-float ezlopi_cloud_get_longitude()
+double ezlopi_cloud_get_longitude()
 {
-    return longitude;
+    return sg_longitude;
 }
 

ezlopi-cloud/ezlopi-cloud-coordinates/ezlopi_cloud_coordinates.h

@@ -4,10 +4,10 @@
 
 #include "cJSON.h"
 
-void hub_coordinates_set(cJSON *cjson_request, cJSON *cjson_response);
+void hub_coordinates_set(cJSON* cjson_request, cJSON* cjson_response);
 void hub_coordinates_get(cJSON* cj_request, cJSON* cj_response);
-float ezlopi_cloud_get_longitude();
-float ezlopi_cloud_get_latitude();
+double ezlopi_cloud_get_longitude();
+double ezlopi_cloud_get_latitude();
 
 #endif // _EZLOPI_CLOUD_COORDINSTES_H_
 

ezlopi-cloud/ezlopi-cloud-data/ezlopi_cloud_data.c

@@ -9,10 +9,8 @@
 #include "ezlopi_cloud_methods_str.h"
 
 void data_list(cJSON *cj_request, cJSON *cj_response)
-{
-    cJSON_AddItemReferenceToObject(cj_response, ezlopi_id_str, cJSON_GetObjectItem(cj_request, ezlopi_id_str));
-    cJSON_AddItemReferenceToObject(cj_response, ezlopi_method_str, cJSON_GetObjectItem(cj_request, ezlopi_method_str));
-    cJSON *cjson_result = cJSON_AddObjectToObject(cj_response, ezlopi_result_str);
+{    
+    cJSON* cjson_result = cJSON_AddObjectToObject(cj_response, ezlopi_result_str);
     if (cjson_result)
     {
         cJSON *cj_settings = cJSON_AddObjectToObject(cjson_result, ezlopi_settings_str);