Skip to content

Commit

Permalink
issue with network merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@lomassubedi
lomassubedi committed Feb 19, 2024
1 parent d0a241b commit cb0935c
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 113 deletions.
88 changes: 44 additions & 44 deletions ezlopi-cloud/ezlopi-cloud-network/ezlopi_cloud_network.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
void network_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_key_method_str, cJSON_GetObjectItem(cj_request, ezlopi_key_method_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);
if (cjson_result)
{
Expand Down Expand Up @@ -55,65 +55,65 @@ static int get_wifi_properties(cJSON* interface_array)
cJSON_AddStringToObject(wifi_properties, ezlopi__id_str, ezlopi_wifi_str);
cJSON_AddStringToObject(wifi_properties, ezlopi_enabled_str, ezlopi_auto_str);

cJSON* wifi_ipv4 = cJSON_CreateObject();
if (wifi_ipv4)
{
esp_netif_ip_info_t* ip_info = ezlopi_wifi_get_ip_infos();
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->gw));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_ip_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->ip));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_mask_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->netmask));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_gateway_str, tmp_string);
cJSON_AddStringToObject(wifi_ipv4, ezlopi_mode_str, ezlopi_dhcp_str);

cJSON* wifi_ipv4 = cJSON_CreateObject();
if (wifi_ipv4)
{
esp_netif_ip_info_t* ip_info = ezlopi_wifi_get_ip_infos();
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->gw));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_gateway_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->ip));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_ip_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->netmask));
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->ip));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_mask_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->netmask));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_gateway_str, tmp_string);
cJSON_AddStringToObject(wifi_ipv4, ezlopi_mode_str, ezlopi_dhcp_str);

if (!cJSON_AddItemToObjectCS(wifi_properties, ezlopi_ipv4_str, wifi_ipv4))
cJSON* wifi_ipv4 = cJSON_CreateObject();
if (wifi_ipv4)
{
cJSON_Delete(wifi_ipv4);
wifi_ipv4 = NULL;
esp_netif_ip_info_t* ip_info = ezlopi_wifi_get_ip_infos();
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->gw));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_gateway_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->ip));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_ip_str, tmp_string);
snprintf(tmp_string, sizeof(tmp_string), IPSTR, IP2STR(&ip_info->netmask));
cJSON_AddStringToObject(wifi_ipv4, ezlopi_mask_str, tmp_string);
cJSON_AddStringToObject(wifi_ipv4, ezlopi_mode_str, ezlopi_dhcp_str);

if (!cJSON_AddItemToObjectCS(wifi_properties, ezlopi_ipv4_str, wifi_ipv4))
{
cJSON_Delete(wifi_ipv4);
wifi_ipv4 = NULL;
}
}
}
cJSON_AddStringToObject(wifi_properties, ezlopi_network_str, ezlopi_wan_str);
cJSON_AddStringToObject(wifi_properties, ezlopi_status_str, ezlopi_up_str);
cJSON_AddStringToObject(wifi_properties, ezlopi_type_str, ezlopi_wifi_str);
cJSON_AddStringToObject(wifi_properties, ezlopi_network_str, ezlopi_wan_str);
cJSON_AddStringToObject(wifi_properties, ezlopi_status_str, ezlopi_up_str);
cJSON_AddStringToObject(wifi_properties, ezlopi_type_str, ezlopi_wifi_str);

if (!cJSON_AddItemToArray(interface_array, wifi_properties))
if (!cJSON_AddItemToArray(interface_array, wifi_properties))
{
cJSON_Delete(wifi_properties);
}
}
else
{
cJSON_Delete(wifi_properties);
ret = 1;
}
return ret;
}
else

void network_wifi_scan_start(cJSON * cj_request, cJSON * cj_response)
{
ret = 1;
ezlopi_wifi_scan_start();
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);
}
return ret;
}

void network_wifi_scan_start(cJSON* cj_request, cJSON* cj_response)
{
ezlopi_wifi_scan_start();
cJSON_AddItemReferenceToObject(cj_response, ezlopi_id_str, cJSON_GetObjectItem(cj_request, ezlopi_id_str));
cJSON_AddItemReferenceToObject(cj_response, ezlopi_key_method_str, cJSON_GetObjectItem(cj_request, ezlopi_key_method_str));
cJSON* cjson_result = cJSON_AddObjectToObject(cj_response, ezlopi_result_str);
}

void network_wifi_scan_stop(cJSON* cj_request, cJSON* cj_response)
{
ezlopi_wifi_scan_stop();
cJSON_AddItemReferenceToObject(cj_response, ezlopi_id_str, cJSON_GetObjectItem(cj_request, ezlopi_id_str));
cJSON_AddItemReferenceToObject(cj_response, ezlopi_key_method_str, cJSON_GetObjectItem(cj_request, ezlopi_key_method_str));
cJSON* cjson_result = cJSON_AddObjectToObject(cj_response, ezlopi_result_str);
}
void network_wifi_scan_stop(cJSON * cj_request, cJSON * cj_response)
{
ezlopi_wifi_scan_stop();
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);
}

2 changes: 1 addition & 1 deletion ezlopi-core/ezlopi-core-scenes/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

file(GLOB_RECURSE config_src "*.c")

idf_component_register(SRCS "ezlopi_core_scenes_cjson.c" "ezlopi_core_scenes_print.c" "ezlopi_core_scenes_value.c" "${config_src}"
idf_component_register(SRCS "ezlopi_core_scenes_when_methods.c" "ezlopi_core_scenes_cjson.c" "ezlopi_core_scenes_print.c" "ezlopi_core_scenes_value.c" "${config_src}"
INCLUDE_DIRS "."
REQUIRES core
)
Loading

0 comments on commit cb0935c

Please sign in to comment.