mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 20:46:52 +03:00
Rolling 20220322
This commit is contained in:
@@ -52,7 +52,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### Rolling (2022-03-20)
|
##### Rolling (2022-03-22)
|
||||||
|
|
||||||
|
- Bug Fix: no time with fixed IP
|
||||||
|
|
||||||
|
Rolling (2022-03-20)
|
||||||
|
|
||||||
- MQTT: implemented "Retain Flag" - not tested in detail yet
|
- MQTT: implemented "Retain Flag" - not tested in detail yet
|
||||||
|
|
||||||
|
|||||||
@@ -151,8 +151,24 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
|
|||||||
|
|
||||||
if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
|
if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
|
||||||
|
tcpip_adapter_ip_info_t ip_info;
|
||||||
|
int a, b, c, d;
|
||||||
|
strinttoip4(_ipadr, a, b, c, d);
|
||||||
|
IP4_ADDR(&ip_info.ip, a, b, c, d);
|
||||||
|
strinttoip4(_gw, a, b, c, d);
|
||||||
|
IP4_ADDR(&ip_info.gw, a, b, c, d);
|
||||||
|
strinttoip4(_netmask, a, b, c, d);
|
||||||
|
IP4_ADDR(&ip_info.netmask, a, b, c, d);
|
||||||
|
|
||||||
|
tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info);
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
ESP_LOGI(TAG, "set IP %s, GW %s, Netmask %s manual", _ipadr, _gw, _netmask);
|
ESP_LOGI(TAG, "set IP %s, GW %s, Netmask %s manual", _ipadr, _gw, _netmask);
|
||||||
esp_netif_dhcpc_stop(my_sta);
|
esp_netif_dhcpc_stop(my_sta);
|
||||||
|
|
||||||
esp_netif_ip_info_t ip_info;
|
esp_netif_ip_info_t ip_info;
|
||||||
int a, b, c, d;
|
int a, b, c, d;
|
||||||
strinttoip4(_ipadr, a, b, c, d);
|
strinttoip4(_ipadr, a, b, c, d);
|
||||||
@@ -168,6 +184,22 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
|
|||||||
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
|
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
|
||||||
ESP_ERROR_CHECK(esp_wifi_init(&cfg));
|
ESP_ERROR_CHECK(esp_wifi_init(&cfg));
|
||||||
|
|
||||||
|
if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
|
||||||
|
{
|
||||||
|
if (_dns == NULL)
|
||||||
|
_dns = _gw;
|
||||||
|
|
||||||
|
ESP_LOGI(TAG, "set DNS manual");
|
||||||
|
esp_netif_dns_info_t dns_info;
|
||||||
|
ip4_addr_t ip;
|
||||||
|
ip.addr = esp_ip4addr_aton(_dns);
|
||||||
|
ip_addr_set_ip4_u32(&dns_info.ip, ip.addr);
|
||||||
|
ESP_ERROR_CHECK(esp_netif_set_dns_info(my_sta, ESP_NETIF_DNS_MAIN, &dns_info));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
esp_event_handler_instance_t instance_any_id;
|
esp_event_handler_instance_t instance_any_id;
|
||||||
esp_event_handler_instance_t instance_got_ip;
|
esp_event_handler_instance_t instance_got_ip;
|
||||||
ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
|
ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const char* GIT_REV="ebcfc16";
|
const char* GIT_REV="0e90bcb";
|
||||||
const char* GIT_TAG="";
|
const char* GIT_TAG="";
|
||||||
const char* GIT_BRANCH="rolling";
|
const char* GIT_BRANCH="rolling";
|
||||||
const char* BUILD_TIME="2022-03-20 21:31";
|
const char* BUILD_TIME="2022-03-22 20:46";
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
const char* GIT_REV="ebcfc16";
|
const char* GIT_REV="0e90bcb";
|
||||||
const char* GIT_TAG="";
|
const char* GIT_TAG="";
|
||||||
const char* GIT_BRANCH="rolling";
|
const char* GIT_BRANCH="rolling";
|
||||||
const char* BUILD_TIME="2022-03-20 21:31";
|
const char* BUILD_TIME="2022-03-22 20:46";
|
||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user