mirror of https://github.com/ARMmbed/mbed-os.git
ESP8266 test config and tcp_echo test fix for ESP8266
parent
a5f1426a44
commit
47390e62d6
|
@ -28,13 +28,13 @@
|
||||||
|
|
||||||
using namespace utest::v1;
|
using namespace utest::v1;
|
||||||
|
|
||||||
#ifndef MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE
|
#ifndef MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE
|
||||||
#define MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE 256
|
#define MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
char tx_buffer[MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
char tx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
||||||
char rx_buffer[MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
char rx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
||||||
}
|
}
|
||||||
|
|
||||||
void prep_buffer(char *tx_buffer, size_t tx_size) {
|
void prep_buffer(char *tx_buffer, size_t tx_size) {
|
||||||
|
@ -44,7 +44,7 @@ void prep_buffer(char *tx_buffer, size_t tx_size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_tcp_echo() {
|
void test_tcp_echo() {
|
||||||
|
int n = 0;
|
||||||
NetworkInterface* net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
|
NetworkInterface* net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
|
||||||
int err = MBED_CONF_APP_CONNECT_STATEMENT;
|
int err = MBED_CONF_APP_CONNECT_STATEMENT;
|
||||||
|
|
||||||
|
@ -86,7 +86,12 @@ void test_tcp_echo() {
|
||||||
|
|
||||||
prep_buffer(tx_buffer, sizeof(tx_buffer));
|
prep_buffer(tx_buffer, sizeof(tx_buffer));
|
||||||
#if defined(MBED_CONF_APP_TCP_ECHO_PREFIX)
|
#if defined(MBED_CONF_APP_TCP_ECHO_PREFIX)
|
||||||
sock.recv(rx_buffer, sizeof(MBED_CONF_APP_TCP_ECHO_PREFIX));
|
n = sock.recv(rx_buffer, sizeof(MBED_CONF_APP_TCP_ECHO_PREFIX));
|
||||||
|
if (n >= 0) {
|
||||||
|
printf("recv-ed prefix: %d bytes - %.*s \n", n, n, rx_buffer);
|
||||||
|
} else {
|
||||||
|
printf("Network error in receiving prefix: %d\n", n);
|
||||||
|
}
|
||||||
#endif /* MBED_CONF_APP_TCP_ECHO_PREFIX */
|
#endif /* MBED_CONF_APP_TCP_ECHO_PREFIX */
|
||||||
const int ret = sock.send(tx_buffer, sizeof(tx_buffer));
|
const int ret = sock.send(tx_buffer, sizeof(tx_buffer));
|
||||||
if (ret >= 0) {
|
if (ret >= 0) {
|
||||||
|
@ -95,7 +100,7 @@ void test_tcp_echo() {
|
||||||
printf("Network error %d\n", ret);
|
printf("Network error %d\n", ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
int n = sock.recv(rx_buffer, sizeof(rx_buffer));
|
n = sock.recv(rx_buffer, sizeof(rx_buffer));
|
||||||
if (n >= 0) {
|
if (n >= 0) {
|
||||||
printf("recv %d bytes - %.*s \n", n, n, rx_buffer);
|
printf("recv %d bytes - %.*s \n", n, n, rx_buffer);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
{
|
||||||
|
"config": {
|
||||||
|
"header-file": {
|
||||||
|
"help" : "String for including your driver header file",
|
||||||
|
"value" : "\"ESP8266Interface.h\""
|
||||||
|
},
|
||||||
|
"object-construction" : {
|
||||||
|
"value" : "new ESP8266Interface( D1, D0, false )"
|
||||||
|
},
|
||||||
|
"connect-statement" : {
|
||||||
|
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL with your WiFi settings",
|
||||||
|
"value" : "((ESP8266Interface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL)"
|
||||||
|
},
|
||||||
|
"echo-server-addr" : {
|
||||||
|
"help" : "IP address of echo server",
|
||||||
|
"value" : "\"195.34.89.241\""
|
||||||
|
},
|
||||||
|
"echo-server-port" : {
|
||||||
|
"help" : "Port of echo server",
|
||||||
|
"value" : "7"
|
||||||
|
},
|
||||||
|
"tcp-echo-prefix" : {
|
||||||
|
"help" : "Some servers send a prefix before echoed message",
|
||||||
|
"value" : "\"u-blox AG TCP/UDP test service\\n\""
|
||||||
|
},
|
||||||
|
"tcp-client-echo-buffer-size" : {
|
||||||
|
"help" : "Number of bytes to be send to echo server",
|
||||||
|
"value" : "200"
|
||||||
|
},
|
||||||
|
"ESP8266-TX": {
|
||||||
|
"value":"D1"
|
||||||
|
},
|
||||||
|
"ESP8266-RX": {
|
||||||
|
"value":"D0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,5 +4,6 @@
|
||||||
"HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
|
"HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
|
||||||
"ODIN_WIFI" : "OdinInterface.json",
|
"ODIN_WIFI" : "OdinInterface.json",
|
||||||
"ODIN_ETHERNET" : "Odin_EthernetInterface.json",
|
"ODIN_ETHERNET" : "Odin_EthernetInterface.json",
|
||||||
"REALTEK_WIFI" : "RealtekInterface.json"
|
"REALTEK_WIFI" : "RealtekInterface.json",
|
||||||
|
"ESP8266_WIFI" : "ESP8266Interface.json"
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
},
|
},
|
||||||
"K64F": {
|
"K64F": {
|
||||||
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
|
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
|
||||||
"test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]
|
"test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "ESP8266_WIFI", "ETHERNET"]
|
||||||
},
|
},
|
||||||
"NUCLEO_F429ZI": {
|
"NUCLEO_F429ZI": {
|
||||||
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
|
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
|
||||||
|
|
Loading…
Reference in New Issue