arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

emulation on host: missing mock functions, improve host interface handling (#7404)

Browse Source
This commit is contained in:
david gauchard 2020-06-24 19:05:57 +02:00 committed by GitHub
parent b26388812a
commit 5d60c55fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 411 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/host/common/MockEsp.cpp
View File

@ -108,6 +108,11 @@ uint32_t EspClass::getFreeHeap()
return 30000; return 30000;
} }
uint16_t EspClass::getMaxFreeBlockSize()
{
return 20000;
}
String EspClass::getResetReason() String EspClass::getResetReason()
{ {
return "Power on"; return "Power on";

5
tests/host/common/MockWiFiServerSocket.cpp
View File

@ -145,3 +145,8 @@ void WiFiServer::close ()
::close(pcb2int(_listen_pcb)); ::close(pcb2int(_listen_pcb));
_listen_pcb = int2pcb(-1); _listen_pcb = int2pcb(-1);
} }
void WiFiServer::stop ()
{
close();
}

763
tests/host/common/user_interface.cpp
View File

@ -1,32 +1,32 @@
/* /*
Arduino emulation - espressif sdk host implementation Arduino emulation - espressif sdk host implementation
Copyright (c) 2018 david gauchard. All rights reserved. Copyright (c) 2018 david gauchard. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
to deal with the Software without restriction, including without limitation to deal with the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense, the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions: Software is furnished to do so, subject to the following conditions:
- Redistributions of source code must retain the above copyright notice, - Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimers. this list of conditions and the following disclaimers.
- Redistributions in binary form must reproduce the above copyright notice, - Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimers in the this list of conditions and the following disclaimers in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
- The names of its contributors may not be used to endorse or promote - The names of its contributors may not be used to endorse or promote
products derived from this Software without specific prior written products derived from this Software without specific prior written
permission. permission.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS WITH THE SOFTWARE. DEALINGS WITH THE SOFTWARE.
*/ */
#include <lwip/def.h> #include <lwip/def.h>
@ -46,446 +46,447 @@ extern "C"
#include <user_interface.h> #include <user_interface.h>
#include <lwip/netif.h> #include <lwip/netif.h>
uint8 wifi_get_opmode(void) uint8 wifi_get_opmode(void)
{ {
return STATION_MODE; return STATION_MODE;
} }
phy_mode_t wifi_get_phy_mode(void) phy_mode_t wifi_get_phy_mode(void)
{ {
return PHY_MODE_11N; return PHY_MODE_11N;
} }
uint8 wifi_get_channel (void) uint8 wifi_get_channel(void)
{ {
return 1; return 1;
} }
uint8 wifi_station_get_current_ap_id (void) uint8 wifi_station_get_current_ap_id(void)
{ {
return 0; return 0;
} }
station_status_t wifi_station_get_connect_status (void) station_status_t wifi_station_get_connect_status(void)
{ {
return STATION_GOT_IP; return STATION_GOT_IP;
} }
uint8 wifi_station_get_auto_connect (void) uint8 wifi_station_get_auto_connect(void)
{ {
return 1; return 1;
} }
bool wifi_station_get_config (struct station_config *config) bool wifi_station_get_config(struct station_config *config)
{ {
strcpy((char*)config->ssid, "emulated-ssid"); strcpy((char*)config->ssid, "emulated-ssid");
strcpy((char*)config->password, "emulated-ssid-password"); strcpy((char*)config->password, "emulated-ssid-password");
config->bssid_set = 0; config->bssid_set = 0;
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
config->bssid[i] = i; config->bssid[i] = i;
config->threshold.rssi = 1; config->threshold.rssi = 1;
config->threshold.authmode = AUTH_WPA_PSK; config->threshold.authmode = AUTH_WPA_PSK;
#ifdef NONOSDK3V0 #ifdef NONOSDK3V0
config->open_and_wep_mode_disable = true; config->open_and_wep_mode_disable = true;
#endif #endif
return true; return true;
} }
void wifi_fpm_close(void) void wifi_fpm_close(void)
{ {
} }
sint8 wifi_fpm_do_sleep (uint32 sleep_time_in_us) sint8 wifi_fpm_do_sleep(uint32 sleep_time_in_us)
{ {
usleep(sleep_time_in_us); usleep(sleep_time_in_us);
return 1; return 1;
} }
void wifi_fpm_do_wakeup (void) void wifi_fpm_do_wakeup(void)
{ {
} }
void wifi_fpm_open (void) void wifi_fpm_open(void)
{ {
} }
void wifi_fpm_set_sleep_type (sleep_type_t type) void wifi_fpm_set_sleep_type(sleep_type_t type)
{ {
(void)type; (void)type;
} }
uint32_t global_ipv4_netfmt = 0; // global binding uint32_t global_ipv4_netfmt = 0; // global binding
netif netif0; netif netif0;
uint32_t global_source_address = INADDR_ANY; uint32_t global_source_address = INADDR_ANY;
bool wifi_get_ip_info (uint8 if_index, struct ip_info *info) bool wifi_get_ip_info(uint8 if_index, struct ip_info *info)
{ {
// emulate wifi_get_ip_info() // emulate wifi_get_ip_info()
// ignore if_index // ignore if_index
// use global option -i (host_interface) to select bound interface/address // use global option -i (host_interface) to select bound interface/address
struct ifaddrs * ifAddrStruct = NULL, * ifa = NULL; struct ifaddrs * ifAddrStruct = NULL, * ifa = NULL;
uint32_t ipv4 = lwip_htonl(0x7f000001); uint32_t ipv4 = lwip_htonl(0x7f000001);
uint32_t mask = lwip_htonl(0xff000000); uint32_t mask = lwip_htonl(0xff000000);
global_source_address = INADDR_ANY; // =0 global_source_address = INADDR_ANY; // =0
if (getifaddrs(&ifAddrStruct) != 0) if (getifaddrs(&ifAddrStruct) != 0)
{ {
perror("getifaddrs"); perror("getifaddrs");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (host_interface)
mockverbose("host: looking for interface '%s':\n", host_interface);
else
mockverbose("host: looking the first for non-local IPv4 interface:\n");
for (ifa = ifAddrStruct; ifa != NULL; ifa = ifa->ifa_next)
{
mockverbose("host: interface: %s", ifa->ifa_name);
if ( ifa->ifa_addr
&& ifa->ifa_addr->sa_family == AF_INET // ip_info is IPv4 only
)
{
auto test_ipv4 = lwip_ntohl(*(uint32_t*)&((struct sockaddr_in*)ifa->ifa_addr)->sin_addr);
mockverbose(" IPV4 (0x%08lx)", test_ipv4);
if ((test_ipv4 & 0xff000000) == 0x7f000000)
// 127./8
mockverbose(" (local, ignored)");
else
{
if (!host_interface || (host_interface && strcmp(ifa->ifa_name, host_interface) == 0))
{
// use the first non-local interface, or, if specified, the one selected by user on cmdline
ipv4 = *(uint32_t*)&((struct sockaddr_in*)ifa->ifa_addr)->sin_addr;
mask = *(uint32_t*)&((struct sockaddr_in*)ifa->ifa_netmask)->sin_addr;
mockverbose(" (selected)\n");
global_source_address = ntohl(ipv4);
break;
}
}
}
mockverbose("\n");
}
if (ifAddrStruct != NULL)
freeifaddrs(ifAddrStruct);
(void)if_index; if (host_interface)
//if (if_index != STATION_IF) mockverbose("host: looking for interface '%s':\n", host_interface);
// fprintf(stderr, "we are not AP"); for (ifa = ifAddrStruct; ifa != NULL; ifa = ifa->ifa_next)
{
mockverbose("host: interface: %s", ifa->ifa_name);
if (ifa->ifa_addr
&& ifa->ifa_addr->sa_family == AF_INET // ip_info is IPv4 only
)
{
auto test_ipv4 = lwip_ntohl(*(uint32_t*) & ((struct sockaddr_in*)ifa->ifa_addr)->sin_addr);
mockverbose(" IPV4 (0x%08lx)", test_ipv4);
if ((test_ipv4 & 0xff000000) == 0x7f000000)
// 127./8
mockverbose(" (local, ignored)");
else
{
if (!host_interface || (host_interface && strcmp(ifa->ifa_name, host_interface) == 0))
{
// use the first non-local interface, or, if specified, the one selected by user on cmdline
ipv4 = *(uint32_t*) & ((struct sockaddr_in*)ifa->ifa_addr)->sin_addr;
mask = *(uint32_t*) & ((struct sockaddr_in*)ifa->ifa_netmask)->sin_addr;
mockverbose(" (selected)\n");
if (host_interface)
global_source_address = ntohl(ipv4);
break;
}
}
}
mockverbose("\n");
}
if (global_ipv4_netfmt == NO_GLOBAL_BINDING) if (ifAddrStruct != NULL)
global_ipv4_netfmt = ipv4; freeifaddrs(ifAddrStruct);
if (info) (void)if_index;
{ //if (if_index != STATION_IF)
info->ip.addr = ipv4; // fprintf(stderr, "we are not AP");
info->netmask.addr = mask;
info->gw.addr = ipv4;
netif0.ip_addr.addr = ipv4; if (global_ipv4_netfmt == NO_GLOBAL_BINDING)
netif0.netmask.addr = mask; global_ipv4_netfmt = ipv4;
netif0.gw.addr = ipv4;
netif0.flags = NETIF_FLAG_IGMP | NETIF_FLAG_UP | NETIF_FLAG_LINK_UP;
netif0.next = nullptr;
}
return true; if (info)
} {
info->ip.addr = ipv4;
info->netmask.addr = mask;
info->gw.addr = ipv4;
uint8 wifi_get_listen_interval (void) netif0.ip_addr.addr = ipv4;
{ netif0.netmask.addr = mask;
return 1; netif0.gw.addr = ipv4;
} netif0.flags = NETIF_FLAG_IGMP | NETIF_FLAG_UP | NETIF_FLAG_LINK_UP;
netif0.next = nullptr;
}
bool wifi_get_macaddr(uint8 if_index, uint8 *macaddr) return true;
{ }
(void)if_index;
macaddr[0] = 0xde;
macaddr[1] = 0xba;
macaddr[2] = 0x7a;
macaddr[3] = 0xb1;
macaddr[4] = 0xe0;
macaddr[5] = 0x42;
return true;
}
uint8 wifi_get_opmode_default (void) uint8 wifi_get_listen_interval(void)
{ {
return STATION_MODE; return 1;
} }
bool wifi_get_macaddr(uint8 if_index, uint8 *macaddr)
{
(void)if_index;
macaddr[0] = 0xde;
macaddr[1] = 0xba;
macaddr[2] = 0x7a;
macaddr[3] = 0xb1;
macaddr[4] = 0xe0;
macaddr[5] = 0x42;
return true;
}
uint8 wifi_get_opmode_default(void)
{
return STATION_MODE;
}
#ifdef NONOSDK3V0 #ifdef NONOSDK3V0
sleep_level_t wifi_get_sleep_level (void) sleep_level_t wifi_get_sleep_level(void)
{ {
return MIN_SLEEP_T; return MIN_SLEEP_T;
} }
#endif // nonos-sdk-pre-3 #endif // nonos-sdk-pre-3
sleep_type_t wifi_get_sleep_type (void) sleep_type_t wifi_get_sleep_type(void)
{ {
return NONE_SLEEP_T; return NONE_SLEEP_T;
} }
bool wifi_set_channel (uint8 channel) bool wifi_set_channel(uint8 channel)
{ {
(void)channel; (void)channel;
return true; return true;
} }
wifi_event_handler_cb_t wifi_event_handler_cb_emu = nullptr; wifi_event_handler_cb_t wifi_event_handler_cb_emu = nullptr;
void wifi_set_event_handler_cb (wifi_event_handler_cb_t cb) void wifi_set_event_handler_cb(wifi_event_handler_cb_t cb)
{ {
wifi_event_handler_cb_emu = cb; wifi_event_handler_cb_emu = cb;
mockverbose("TODO: wifi_set_event_handler_cb set\n"); mockverbose("TODO: wifi_set_event_handler_cb set\n");
} }
bool wifi_set_ip_info (uint8 if_index, struct ip_info *info) bool wifi_set_ip_info(uint8 if_index, struct ip_info *info)
{ {
(void)if_index; (void)if_index;
(void)info; (void)info;
return false; return false;
} }
bool wifi_set_listen_interval (uint8 interval) bool wifi_set_listen_interval(uint8 interval)
{ {
(void)interval; (void)interval;
return true; return true;
} }
bool wifi_set_opmode (uint8 opmode) bool wifi_set_opmode(uint8 opmode)
{ {
return opmode == STATION_MODE || opmode == STATIONAP_MODE; return opmode == STATION_MODE || opmode == STATIONAP_MODE;
} }
bool wifi_set_opmode_current (uint8 opmode) bool wifi_set_opmode_current(uint8 opmode)
{ {
return opmode == STATION_MODE || opmode == STATIONAP_MODE; return opmode == STATION_MODE || opmode == STATIONAP_MODE;
} }
bool wifi_set_phy_mode (phy_mode_t mode) bool wifi_set_phy_mode(phy_mode_t mode)
{ {
(void)mode; (void)mode;
return true; return true;
} }
#ifdef NONOSDK3V0 #ifdef NONOSDK3V0
bool wifi_set_sleep_level (sleep_level_t level) bool wifi_set_sleep_level(sleep_level_t level)
{ {
(void)level; (void)level;
return true; return true;
} }
#endif #endif
bool wifi_set_sleep_type (sleep_type_t type) bool wifi_set_sleep_type(sleep_type_t type)
{ {
(void)type; (void)type;
return true; return true;
} }
bool wifi_station_connect (void) bool wifi_station_connect(void)
{ {
return true; return true;
} }
bool wifi_station_dhcpc_start (void) bool wifi_station_dhcpc_start(void)
{ {
return true; return true;
} }
bool wifi_station_dhcpc_stop (void) bool wifi_station_dhcpc_stop(void)
{ {
return true; return true;
} }
bool wifi_station_disconnect (void) bool wifi_station_disconnect(void)
{ {
return true; return true;
} }
bool wifi_station_get_config_default (struct station_config *config) bool wifi_station_get_config_default(struct station_config *config)
{ {
return wifi_station_get_config(config); return wifi_station_get_config(config);
} }
char wifi_station_get_hostname_str [128]; char wifi_station_get_hostname_str [128];
const char* wifi_station_get_hostname (void) const char* wifi_station_get_hostname(void)
{ {
return strcpy(wifi_station_get_hostname_str, "esposix"); return strcpy(wifi_station_get_hostname_str, "esposix");
} }
bool wifi_station_get_reconnect_policy () bool wifi_station_get_reconnect_policy()
{ {
return true; return true;
} }
sint8 wifi_station_get_rssi (void) sint8 wifi_station_get_rssi(void)
{ {
return 5; return 5;
} }
bool wifi_station_set_auto_connect (uint8 set) bool wifi_station_set_auto_connect(uint8 set)
{ {
return set != 0; return set != 0;
} }
bool wifi_station_set_config (struct station_config *config) bool wifi_station_set_config(struct station_config *config)
{ {
(void)config; (void)config;
return true; return true;
} }
bool wifi_station_set_config_current (struct station_config *config) bool wifi_station_set_config_current(struct station_config *config)
{ {
(void)config; (void)config;
return true; return true;
} }
bool wifi_station_set_hostname (const char *name) bool wifi_station_set_hostname(const char *name)
{ {
(void)name; (void)name;
return true; return true;
} }
bool wifi_station_set_reconnect_policy (bool set) bool wifi_station_set_reconnect_policy(bool set)
{ {
(void)set; (void)set;
return true; return true;
} }
void system_phy_set_max_tpw (uint8 max_tpw) void system_phy_set_max_tpw(uint8 max_tpw)
{ {
(void)max_tpw; (void)max_tpw;
} }
bool wifi_softap_dhcps_start(void) bool wifi_softap_dhcps_start(void)
{ {
return true; return true;
} }
enum dhcp_status wifi_softap_dhcps_status(void) enum dhcp_status wifi_softap_dhcps_status(void)
{ {
return DHCP_STARTED; return DHCP_STARTED;
} }
bool wifi_softap_dhcps_stop(void) bool wifi_softap_dhcps_stop(void)
{ {
return true; return true;
} }
bool wifi_softap_get_config(struct softap_config *config) bool wifi_softap_get_config(struct softap_config *config)
{ {
strcpy((char*)config->ssid, "apssid"); strcpy((char*)config->ssid, "apssid");
strcpy((char*)config->password, "appasswd"); strcpy((char*)config->password, "appasswd");
config->ssid_len = strlen("appasswd"); config->ssid_len = strlen("appasswd");
config->channel = 1; config->channel = 1;
config->authmode = AUTH_WPA2_PSK; config->authmode = AUTH_WPA2_PSK;
config->ssid_hidden = 0; config->ssid_hidden = 0;
config->max_connection = 4; config->max_connection = 4;
config->beacon_interval = 100; config->beacon_interval = 100;
return true; return true;
} }
bool wifi_softap_get_config_default(struct softap_config *config) bool wifi_softap_get_config_default(struct softap_config *config)
{ {
return wifi_softap_get_config(config); return wifi_softap_get_config(config);
} }
uint8 wifi_softap_get_station_num(void) uint8 wifi_softap_get_station_num(void)
{ {
return 2; return 2;
} }
bool wifi_softap_set_config(struct softap_config *config) bool wifi_softap_set_config(struct softap_config *config)
{ {
(void)config; (void)config;
return true; return true;
} }
bool wifi_softap_set_config_current(struct softap_config *config) bool wifi_softap_set_config_current(struct softap_config *config)
{ {
(void)config; (void)config;
return true; return true;
} }
bool wifi_softap_set_dhcps_lease(struct dhcps_lease *please) bool wifi_softap_set_dhcps_lease(struct dhcps_lease *please)
{ {
(void)please; (void)please;
return true; return true;
} }
bool wifi_softap_set_dhcps_lease_time(uint32 minute) bool wifi_softap_set_dhcps_lease_time(uint32 minute)
{ {
(void)minute; (void)minute;
return true; return true;
} }
bool wifi_softap_set_dhcps_offer_option(uint8 level, void* optarg) bool wifi_softap_set_dhcps_offer_option(uint8 level, void* optarg)
{ {
(void)level; (void)level;
(void)optarg; (void)optarg;
return true; return true;
} }
bool wifi_station_scan(struct scan_config *config, scan_done_cb_t cb) bool wifi_station_scan(struct scan_config *config, scan_done_cb_t cb)
{ {
(void)config; (void)config;
cb(nullptr, FAIL); cb(nullptr, FAIL);
return false; return false;
} }
uint32_t core_version = 1; uint32_t core_version = 1;
/////////////////////////////////////// ///////////////////////////////////////
// not user_interface // not user_interface
void ets_isr_mask (int intr) void ets_isr_mask(int intr)
{ {
(void)intr; (void)intr;
} }
void ets_isr_unmask (int intr) void ets_isr_unmask(int intr)
{ {
(void)intr; (void)intr;
} }
void esp_schedule (void) void esp_schedule(void)
{ {
} }
void dns_setserver (u8_t numdns, ip_addr_t *dnsserver) void dns_setserver(u8_t numdns, ip_addr_t *dnsserver)
{ {
(void)numdns; (void)numdns;
(void)dnsserver; (void)dnsserver;
} }
ip_addr_t dns_getserver (u8_t numdns) ip_addr_t dns_getserver(u8_t numdns)
{ {
(void)numdns; (void)numdns;
ip_addr_t addr = { 0x7f000001 }; ip_addr_t addr = { 0x7f000001 };
return addr; return addr;
} }
#include <smartconfig.h> #include <smartconfig.h>
bool smartconfig_start (sc_callback_t cb, ...) bool smartconfig_start(sc_callback_t cb, ...)
{ {
//XXXFIXME ... -> ptr //XXXFIXME ... -> ptr
cb(SC_STATUS_LINK, NULL); cb(SC_STATUS_LINK, NULL);
return true; return true;
} }
bool smartconfig_stop (void) bool smartconfig_stop(void)
{ {
return true; return true;
} }
sleep_type_t wifi_fpm_get_sleep_type(void) sleep_type_t wifi_fpm_get_sleep_type(void)
{ {
return NONE_SLEEP_T; return NONE_SLEEP_T;
} }
} // extern "C" } // extern "C"

24
tests/restyle.sh
View File

@ -8,23 +8,35 @@ pwd
test -d cores/esp8266 test -d cores/esp8266
test -d libraries test -d libraries
#all="cores/esp8266 libraries" # should be: all="cores/esp8266 libraries"
all=" all="
libraries/ESP8266mDNS libraries/ESP8266mDNS
libraries/Wire libraries/Wire
cores/esp8266/core_esp8266_si2c.cpp cores/esp8266/core_esp8266_si2c.cpp
" "
# core
for d in $all; do for d in $all; do
for e in c cpp h; do if [ -d "$d" ]; then
find $d -name "*.$e" -exec \ echo "-------- directory $d:"
astyle \ for e in c cpp h; do
--suffix=none \ find $d -name "*.$e" -exec \
--options=${org}/astyle_core.conf {} \; astyle \
--suffix=none \
--options=${org}/astyle_core.conf {} \;
done done
else
echo "-------- file $d:"
astyle --suffix=none --options=${org}/astyle_core.conf "$d"
fi
done done
# examples
for d in libraries; do for d in libraries; do
echo "-------- examples in $d:"
find $d -name "*.ino" -exec \ find $d -name "*.ino" -exec \
astyle \ astyle \
--suffix=none \ --suffix=none \