[release] v0.4.0

.github/workflows/docs.yml

@@ -1,11 +1,12 @@
 name: Deploy docs on GitHub Pages
+
 on:
   push:
     branches:
       - master
 
 jobs:
-  build:
+  docs:
     name: Deploy docs
     runs-on: ubuntu-latest
     steps:
@@ -17,5 +18,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CONFIG_FILE: mkdocs.yml
-          EXTRA_PACKAGES: build-base
+          EXTRA_PACKAGES: build-base doxygen
           REQUIREMENTS: docs/requirements.txt

.gitignore

@@ -252,3 +252,9 @@ cython_debug/
 # End of https://www.toptal.com/developers/gitignore/api/c,c++,visualstudiocode,python
 
 .vscode/settings.json
+
+# mkdocs
+xml/
+ltapi/
+ltambz/
+hashChanges.yaml

.gitmodules

@@ -0,0 +1,2 @@
+[submodule "tools/boardgen"]
+	url = https://github.com/kuba2k2/boardgen

README.md

@@ -2,17 +2,17 @@
 
 <div align="center" markdown>
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/kuba2k2/libretuya/docs?label=docs)](https://kuba2k2.github.io/libretuya/)
-![GitHub last commit](https://img.shields.io/github/last-commit/kuba2k2/libretuya)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/kuba2k2/libretuya/Deploy%20docs%20on%20GitHub%20Pages?label=docs&logo=markdown)](https://kuba2k2.github.io/libretuya/)
+![GitHub last commit](https://img.shields.io/github/last-commit/kuba2k2/libretuya?logo=github)
 
-[![Code style: clang-format](https://img.shields.io/badge/code%20style-clang--format-purple.svg)](https://github.com/psf/black)
+[![Code style: clang-format](https://img.shields.io/badge/code%20style-clang--format-purple.svg)](.clang-format)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 [![Discord](https://img.shields.io/discord/967863521511608370?color=%235865F2&label=Discord&logo=discord&logoColor=white)](https://discord.gg/SyGCB9Xwtf)
+[![PlatformIO Registry](https://badges.registry.platformio.org/packages/kuba2k2/platform/libretuya.svg)](https://registry.platformio.org/platforms/kuba2k2/libretuya)
 
 ![RTL8710BN](https://img.shields.io/badge/-rtl8710bn-blue)
 
-<!-- [![PlatformIO Registry](https://badges.registry.platformio.org/packages/kuba2k2/platform/libretuya.svg)](https://registry.platformio.org/platforms/kuba2k2/libretuya) -->
 </div>
 
 PlatformIO development platform for IoT modules manufactured by Tuya Inc.
@@ -100,9 +100,10 @@ arduino/
 │  ├─ cores/                        Wiring core files
 │  ├─ libraries/                    Supported built-in platform libraries
 ├─ libretuya/
-│  ├─ api/                      LibreTuya API (interfaces + LT class) for Arduino frameworks
+│  ├─ api/                      Library interfaces
 │  ├─ common/                   Units common to all platforms
 │  ├─ compat/                   Fixes for compatibility with ESP32 framework
+│  ├─ core/                     LibreTuya API for Arduino cores
 │  ├─ libraries/                Built-in platform-independent libraries
 boards/
 ├─ <board name>/                Board-specific code
@@ -178,14 +179,14 @@ Flash I/O           | ❓
 **CORE LIBRARIES**  |
 SoftwareSerial      | ❌
 SPI                 | ❌
-Wire                | ❌
+Wire                | ❗
 **OTHER LIBRARIES** |
 Wi-Fi STA/AP/Mixed  | ✔️
 Wi-Fi Client (SSL)  | ✔️ (✔️)
 Wi-Fi Server        | ✔️
-Wi-Fi Events        | ❌
+Wi-Fi Events        | ✔️
 IPv6                | ❌
-HTTP Client (SSL)   | ✔️ (❌)
+HTTP Client (SSL)   | ✔️ (✔️)
 HTTP Server         | ✔️
 NVS / Preferences   | ❌
 SPIFFS              | ❌

SUMMARY.md

@@ -0,0 +1,42 @@
+* [Home](README.md)
+* [Configuration](docs/config.md)
+* Reference
+	* [LibreTuya API](docs/reference/lt-api.md)
+		* [Class reference](ltapi/class_libre_tuya.md)
+		* [Static functions](ltapi/_libre_tuya_a_p_i_8cpp.md)
+		* [Logger](ltapi/lt__logger_8h.md)
+	* Common API
+		* [Flash](ltapi/class_i_flash_class.md)
+		* [FS](ltapi/classfs_1_1_f_s.md)
+		* [Preferences](ltapi/class_i_preferences.md)
+		* [WiFi API](ltapi/class_i_wi_fi_generic_class.md)
+			* [Station](ltapi/class_i_wi_fi_s_t_a_class.md)
+			* [Access Point](ltapi/class_i_wi_fi_a_p_class.md)
+			* [Scanning](ltapi/class_i_wi_fi_scan_class.md)
+			* [TCP Client](ltapi/class_i_wi_fi_client.md)
+			* [SSL Client](ltapi/class_i_wi_fi_client_secure.md)
+			* [TCP Server](ltapi/class_i_wi_fi_server.md)
+	* [LibreTuya libraries](docs/libs-built-in.md)
+		* [base64](ltapi/classbase64.md)
+		* [HTTPClient](ltapi/class_h_t_t_p_client.md)
+		* NetUtils
+			* [ssl/MbedTLSClient](ltapi/class_mbed_t_l_s_client.md)
+			* [IPv6Address](ltapi/classarduino_1_1_i_pv6_address.md)
+			* [LwIPRxBuffer](ltapi/class_lw_i_p_rx_buffer.md)
+		* [WebServer](ltapi/class_web_server.md)
+		* [WiFiMulti](ltapi/class_wi_fi_multi.md)
+	* [Third party libraries](docs/libs-3rd-party.md)
+	* Full documentation
+		* [Classes](ltapi/classes.md)
+		* [Functions](ltapi/functions.md)
+		* [Macros](ltapi/macros.md)
+		* [File list](ltapi/files.md)
+* Platforms
+	* Realtek AmebaZ Series
+		* Boards
+			* [WR3](boards/wr3/README.md)
+		* C library
+			* [Built-in functions](docs/platform/realtek-ambz/stdlib.md)
+			* [Memory management](docs/platform/realtek-ambz/memory-management.md)
+		* [Debugging](docs/platform/realtek/debugging.md)
+		* [Exception decoder](docs/platform/realtek/exception-decoder.md)

arduino/libretuya/api/Events.cpp

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-17. */
+
+#include "Events.h"
+
+uint16_t EventHandler_s::lastId = 1;

arduino/libretuya/api/Events.h

@@ -0,0 +1,117 @@
+/*
+ ESP8266WiFiGeneric.h - esp8266 Wifi support.
+ Based on WiFi.h from Ardiono WiFi shield library.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014
+ Reworked by Markus Sattler, December 2015
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include <functional>
+
+#include "WiFiEvents.h"
+
+typedef enum {
+	ARDUINO_EVENT_WIFI_READY = 0,			/**< ESP32 WiFi ready */
+	ARDUINO_EVENT_WIFI_SCAN_DONE,			/**< ESP32 finish scanning AP */
+	ARDUINO_EVENT_WIFI_STA_START,			/**< ESP32 station start */
+	ARDUINO_EVENT_WIFI_STA_STOP,			/**< ESP32 station stop */
+	ARDUINO_EVENT_WIFI_STA_CONNECTED,		/**< ESP32 station connected to AP */
+	ARDUINO_EVENT_WIFI_STA_DISCONNECTED,	/**< ESP32 station disconnected from AP */
+	ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE, /**< the auth mode of AP connected by ESP32 station changed */
+	ARDUINO_EVENT_WIFI_STA_GOT_IP,
+	ARDUINO_EVENT_WIFI_STA_GOT_IP6,
+	ARDUINO_EVENT_WIFI_STA_LOST_IP,
+	ARDUINO_EVENT_WIFI_AP_START,		   /**< ESP32 soft-AP start */
+	ARDUINO_EVENT_WIFI_AP_STOP,			   /**< ESP32 soft-AP stop */
+	ARDUINO_EVENT_WIFI_AP_STACONNECTED,	   /**< a station connected to ESP32 soft-AP */
+	ARDUINO_EVENT_WIFI_AP_STADISCONNECTED, /**< a station disconnected from ESP32 soft-AP */
+	ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED,
+	ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED, /**< Receive probe request packet in soft-AP interface */
+	ARDUINO_EVENT_WIFI_AP_GOT_IP6,
+	ARDUINO_EVENT_WIFI_FTM_REPORT, /**< Receive report of FTM procedure */
+	ARDUINO_EVENT_ETH_START,
+	ARDUINO_EVENT_ETH_STOP,
+	ARDUINO_EVENT_ETH_CONNECTED,
+	ARDUINO_EVENT_ETH_DISCONNECTED,
+	ARDUINO_EVENT_ETH_GOT_IP,
+	ARDUINO_EVENT_ETH_GOT_IP6,
+	ARDUINO_EVENT_WPS_ER_SUCCESS,	  /**< ESP32 station wps succeeds in enrollee mode */
+	ARDUINO_EVENT_WPS_ER_FAILED,	  /**< ESP32 station wps fails in enrollee mode */
+	ARDUINO_EVENT_WPS_ER_TIMEOUT,	  /**< ESP32 station wps timeout in enrollee mode */
+	ARDUINO_EVENT_WPS_ER_PIN,		  /**< ESP32 station wps pin code in enrollee mode */
+	ARDUINO_EVENT_WPS_ER_PBC_OVERLAP, /**< ESP32 station wps overlap in enrollee mode */
+	ARDUINO_EVENT_SC_SCAN_DONE,
+	ARDUINO_EVENT_SC_FOUND_CHANNEL,
+	ARDUINO_EVENT_SC_GOT_SSID_PSWD,
+	ARDUINO_EVENT_SC_SEND_ACK_DONE,
+	ARDUINO_EVENT_PROV_INIT,
+	ARDUINO_EVENT_PROV_DEINIT,
+	ARDUINO_EVENT_PROV_START,
+	ARDUINO_EVENT_PROV_END,
+	ARDUINO_EVENT_PROV_CRED_RECV,
+	ARDUINO_EVENT_PROV_CRED_FAIL,
+	ARDUINO_EVENT_PROV_CRED_SUCCESS,
+	ARDUINO_EVENT_MAX
+} arduino_event_id_t;
+
+typedef union {
+	wifi_event_sta_scan_done_t wifi_scan_done;
+	wifi_event_sta_authmode_change_t wifi_sta_authmode_change;
+	wifi_event_sta_connected_t wifi_sta_connected;
+	wifi_event_sta_disconnected_t wifi_sta_disconnected;
+	wifi_event_sta_wps_er_pin_t wps_er_pin;
+	wifi_event_sta_wps_fail_reason_t wps_fail_reason;
+	wifi_event_ap_probe_req_rx_t wifi_ap_probereqrecved;
+	wifi_event_ap_staconnected_t wifi_ap_staconnected;
+	wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected;
+	wifi_event_ftm_report_t wifi_ftm_report;
+	ip_event_ap_staipassigned_t wifi_ap_staipassigned;
+	ip_event_got_ip_t got_ip;
+	ip_event_got_ip6_t got_ip6;
+	// smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
+	// esp_eth_handle_t eth_connected;
+	// wifi_sta_config_t prov_cred_recv;
+	// wifi_prov_sta_fail_reason_t prov_fail_reason;
+} arduino_event_info_t;
+
+typedef struct {
+	arduino_event_id_t event_id;
+	arduino_event_info_t event_info;
+} arduino_event_t;
+
+#define EventId		arduino_event_id_t
+#define EventId_t	arduino_event_id_t
+#define EventInfo	arduino_event_info_t
+#define EventInfo_t arduino_event_info_t
+#define Event_t		arduino_event_t
+
+typedef void (*EventCb)(EventId event);
+typedef std::function<void(EventId event, EventInfo info)> EventFuncCb;
+typedef void (*EventSysCb)(Event_t *event);
+
+typedef struct EventHandler_s {
+	static uint16_t lastId;
+	uint16_t id;
+	EventCb cb;
+	EventFuncCb fcb;
+	EventSysCb scb;
+	EventId eventId;
+
+	EventHandler_s() : id(lastId++), cb(NULL), fcb(NULL), scb(NULL) {}
+} EventHandler;

arduino/libretuya/api/LibreTuyaAPI.cpp

@@ -1,17 +0,0 @@
-/* Copyright (c) Kuba Szczodrzyński 2022-04-29. */
-
-#include "LibreTuyaAPI.h"
-
-__weak char *strdup(const char *s) {
-	size_t len = strlen(s) + 1;
-	void *newp = malloc(len);
-	if (newp == NULL)
-		return NULL;
-	return (char *)memcpy(newp, s, len);
-}
-
-String ipToString(const IPAddress &ip) {
-	char szRet[16];
-	sprintf(szRet, "%hhu.%hhu.%hhu.%hhu", ip[0], ip[1], ip[2], ip[3]);
-	return String(szRet);
-}

arduino/libretuya/api/Preferences.h

@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "api/String.h"
+#include <api/String.h>
 
 typedef enum {
 	PT_I8,

arduino/libretuya/api/WiFi.cpp

@@ -0,0 +1,84 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-17. */
+
+#include "WiFi.h"
+
+std::vector<EventHandler> IWiFiGenericClass::handlers;
+
+uint16_t IWiFiGenericClass::onEvent(EventCb callback, EventId eventId) {
+	if (!callback)
+		return 0;
+	EventHandler handler;
+	handler.cb		= callback;
+	handler.eventId = eventId;
+	handlers.push_back(handler);
+	return handler.id;
+}
+
+uint16_t IWiFiGenericClass::onEvent(EventFuncCb callback, EventId eventId) {
+	if (!callback)
+		return 0;
+	EventHandler handler;
+	handler.fcb		= callback;
+	handler.eventId = eventId;
+	handlers.push_back(handler);
+	return handler.id;
+}
+
+uint16_t IWiFiGenericClass::onEvent(EventSysCb callback, EventId eventId) {
+	if (!callback)
+		return 0;
+	EventHandler handler;
+	handler.scb		= callback;
+	handler.eventId = eventId;
+	handlers.push_back(handler);
+	return handler.id;
+}
+
+void IWiFiGenericClass::removeEvent(EventCb callback, EventId eventId) {
+	if (!callback)
+		return;
+	for (uint16_t i = 0; i < handlers.size(); i++) {
+		EventHandler handler = handlers[i];
+		if (handler.cb == callback && handler.eventId == eventId) {
+			handlers.erase(handlers.begin() + i);
+		}
+	}
+}
+
+void IWiFiGenericClass::removeEvent(EventSysCb callback, EventId eventId) {
+	if (!callback)
+		return;
+	for (uint16_t i = 0; i < handlers.size(); i++) {
+		EventHandler handler = handlers[i];
+		if (handler.scb == callback && handler.eventId == eventId) {
+			handlers.erase(handlers.begin() + i);
+		}
+	}
+}
+
+void IWiFiGenericClass::removeEvent(uint16_t id) {
+	for (uint16_t i = 0; i < handlers.size(); i++) {
+		EventHandler handler = handlers[i];
+		if (handler.id == id) {
+			handlers.erase(handlers.begin() + i);
+		}
+	}
+}
+
+void IWiFiGenericClass::postEvent(EventId eventId, EventInfo eventInfo) {
+	for (auto handler : handlers) {
+		if (handler.eventId != ARDUINO_EVENT_MAX && handler.eventId != eventId)
+			continue;
+		if (handler.cb) {
+			handler.cb(eventId);
+		} else if (handler.fcb) {
+			handler.fcb(eventId, eventInfo);
+		} else if (handler.scb) {
+			Event_t event = {
+				.event_id	= eventId,
+				.event_info = eventInfo,
+			};
+			handler.scb(&event);
+		}
+	}
+}

arduino/libretuya/api/WiFi.h

@@ -26,12 +26,11 @@
 #include <api/IPAddress.h>
 #include <api/IPv6Address.h>
 #include <api/Print.h>
+#include <vector>
 
+#include "Events.h"
 #include "WiFiType.h"
 
-// TODO wifi events
-// TODO WiFiMulti library
-
 class IWiFiClass {
   public:
 	virtual void printDiag(Print &dest) = 0;
@@ -64,6 +63,20 @@ class IWiFiGenericClass {
 	static IPAddress calculateBroadcast(IPAddress ip, IPAddress subnet);
 	static uint8_t calculateSubnetCIDR(IPAddress subnetMask);
 	static String macToString(uint8_t *mac);
+
+  protected:
+	static std::vector<EventHandler> handlers;
+
+  public:
+	uint16_t onEvent(EventCb callback, EventId eventId = ARDUINO_EVENT_MAX);
+	uint16_t onEvent(EventFuncCb callback, EventId eventId = ARDUINO_EVENT_MAX);
+	uint16_t onEvent(EventSysCb callback, EventId eventId = ARDUINO_EVENT_MAX);
+	void removeEvent(EventCb callback, EventId eventId);
+	void removeEvent(EventSysCb callback, EventId eventId);
+	void removeEvent(uint16_t id);
+
+  protected:
+	static void postEvent(EventId eventId, EventInfo eventInfo);
 };
 
 class IWiFiSTAClass {

arduino/libretuya/api/WiFiEvents.h

@@ -0,0 +1,173 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "WiFiType.h"
+
+/** Argument structure for WIFI_EVENT_SCAN_DONE event */
+typedef struct {
+	uint32_t status; /**< status of scanning APs: 0 - success, 1 - failure */
+	uint8_t number;	 /**< number of scan results */
+	uint8_t scan_id; /**< scan sequence number, used for block scan */
+} wifi_event_sta_scan_done_t;
+
+/** Argument structure for WIFI_EVENT_STA_CONNECTED event */
+typedef struct {
+	uint8_t ssid[32];		   /**< SSID of connected AP */
+	uint8_t ssid_len;		   /**< SSID length of connected AP */
+	uint8_t bssid[6];		   /**< BSSID of connected AP*/
+	uint8_t channel;		   /**< channel of connected AP*/
+	wifi_auth_mode_t authmode; /**< authentication mode used by AP*/
+} wifi_event_sta_connected_t;
+
+/** Argument structure for WIFI_EVENT_STA_DISCONNECTED event */
+typedef struct {
+	uint8_t ssid[32]; /**< SSID of disconnected AP */
+	uint8_t ssid_len; /**< SSID length of disconnected AP */
+	uint8_t bssid[6]; /**< BSSID of disconnected AP */
+	uint8_t reason;	  /**< reason of disconnection */
+} wifi_event_sta_disconnected_t;
+
+/** Argument structure for WIFI_EVENT_STA_AUTHMODE_CHANGE event */
+typedef struct {
+	wifi_auth_mode_t old_mode; /**< the old auth mode of AP */
+	wifi_auth_mode_t new_mode; /**< the new auth mode of AP */
+} wifi_event_sta_authmode_change_t;
+
+/** Argument structure for WIFI_EVENT_STA_WPS_ER_PIN event */
+typedef struct {
+	uint8_t pin_code[8]; /**< PIN code of station in enrollee mode */
+} wifi_event_sta_wps_er_pin_t;
+
+/** Argument structure for WIFI_EVENT_STA_WPS_ER_FAILED event */
+typedef enum {
+	WPS_FAIL_REASON_NORMAL = 0, /**< ESP32 WPS normal fail reason */
+	WPS_FAIL_REASON_RECV_M2D,	/**< ESP32 WPS receive M2D frame */
+	WPS_FAIL_REASON_MAX
+} wifi_event_sta_wps_fail_reason_t;
+
+#define MAX_SSID_LEN	   32
+#define MAX_PASSPHRASE_LEN 64
+#define MAX_WPS_AP_CRED	   3
+
+/** Argument structure for WIFI_EVENT_STA_WPS_ER_SUCCESS event */
+typedef struct {
+	uint8_t ap_cred_cnt; /**< Number of AP credentials received */
+
+	struct {
+		uint8_t ssid[MAX_SSID_LEN];				/**< SSID of AP */
+		uint8_t passphrase[MAX_PASSPHRASE_LEN]; /**< Passphrase for the AP */
+	} ap_cred[MAX_WPS_AP_CRED];					/**< All AP credentials received from WPS handshake */
+} wifi_event_sta_wps_er_success_t;
+
+/** Argument structure for WIFI_EVENT_AP_STACONNECTED event */
+typedef struct {
+	uint8_t mac[6];		/**< MAC address of the station connected to ESP32 soft-AP */
+	uint8_t aid;		/**< the aid that ESP32 soft-AP gives to the station connected to  */
+	bool is_mesh_child; /**< flag to identify mesh child */
+} wifi_event_ap_staconnected_t;
+
+/** Argument structure for WIFI_EVENT_AP_STADISCONNECTED event */
+typedef struct {
+	uint8_t mac[6];		/**< MAC address of the station disconnects to ESP32 soft-AP */
+	uint8_t aid;		/**< the aid that ESP32 soft-AP gave to the station disconnects to  */
+	bool is_mesh_child; /**< flag to identify mesh child */
+} wifi_event_ap_stadisconnected_t;
+
+/** Argument structure for WIFI_EVENT_AP_PROBEREQRECVED event */
+typedef struct {
+	int rssi;		/**< Received probe request signal strength */
+	uint8_t mac[6]; /**< MAC address of the station which send probe request */
+} wifi_event_ap_probe_req_rx_t;
+
+/**
+ * @brief FTM operation status types
+ *
+ */
+typedef enum {
+	FTM_STATUS_SUCCESS = 0,	  /**< FTM exchange is successful */
+	FTM_STATUS_UNSUPPORTED,	  /**< Peer does not support FTM */
+	FTM_STATUS_CONF_REJECTED, /**< Peer rejected FTM configuration in FTM Request */
+	FTM_STATUS_NO_RESPONSE,	  /**< Peer did not respond to FTM Requests */
+	FTM_STATUS_FAIL,		  /**< Unknown error during FTM exchange */
+} wifi_ftm_status_t;
+
+/** Argument structure for */
+typedef struct {
+	uint8_t dlog_token; /**< Dialog Token of the FTM frame */
+	int8_t rssi;		/**< RSSI of the FTM frame received */
+	uint32_t rtt;		/**< Round Trip Time in pSec with a peer */
+	uint64_t t1;		/**< Time of departure of FTM frame from FTM Responder in pSec */
+	uint64_t t2;		/**< Time of arrival of FTM frame at FTM Initiator in pSec */
+	uint64_t t3;		/**< Time of departure of ACK from FTM Initiator in pSec */
+	uint64_t t4;		/**< Time of arrival of ACK at FTM Responder in pSec */
+} wifi_ftm_report_entry_t;
+
+/** Argument structure for WIFI_EVENT_FTM_REPORT event */
+typedef struct {
+	uint8_t peer_mac[6];	  /**< MAC address of the FTM Peer */
+	wifi_ftm_status_t status; /**< Status of the FTM operation */
+	uint32_t rtt_raw;		  /**< Raw average Round-Trip-Time with peer in Nano-Seconds */
+	uint32_t rtt_est;		  /**< Estimated Round-Trip-Time with peer in Nano-Seconds */
+	uint32_t dist_est;		  /**< Estimated one-way distance in Centi-Meters */
+	wifi_ftm_report_entry_t
+		*ftm_report_data;			/**< Pointer to FTM Report with multiple entries, should be freed after use */
+	uint8_t ftm_report_num_entries; /**< Number of entries in the FTM Report data */
+} wifi_event_ftm_report_t;
+
+#define WIFI_STATIS_BUFFER (1 << 0)
+#define WIFI_STATIS_RXTX   (1 << 1)
+#define WIFI_STATIS_HW	   (1 << 2)
+#define WIFI_STATIS_DIAG   (1 << 3)
+#define WIFI_STATIS_PS	   (1 << 4)
+#define WIFI_STATIS_ALL	   (-1)
+
+/** Argument structure for WIFI_EVENT_ACTION_TX_STATUS event */
+typedef struct {
+	int ifx;		  /**< WiFi interface to send request to */
+	uint32_t context; /**< Context to identify the request */
+	uint8_t da[6];	  /**< Destination MAC address */
+	uint8_t status;	  /**< Status of the operation */
+} wifi_event_action_tx_status_t;
+
+/** Argument structure for WIFI_EVENT_ROC_DONE event */
+typedef struct {
+	uint32_t context; /**< Context to identify the request */
+} wifi_event_roc_done_t;
+
+/** Event structure for IP_EVENT_STA_GOT_IP, IP_EVENT_ETH_GOT_IP events  */
+typedef struct {
+	esp_ip4_addr_t ip;		/**< Interface IPV4 address */
+	esp_ip4_addr_t netmask; /**< Interface IPV4 netmask */
+	esp_ip4_addr_t gw;		/**< Interface IPV4 gateway address */
+} esp_netif_ip_info_t;
+
+/** @brief IPV6 IP address information
+ */
+typedef struct {
+	esp_ip6_addr_t ip; /**< Interface IPV6 address */
+} esp_netif_ip6_info_t;
+
+typedef struct {
+	int if_index;				 /*!< Interface index for which the event is received (left for legacy compilation) */
+	void *esp_netif;			 /*!< Pointer to corresponding esp-netif object */
+	esp_netif_ip_info_t ip_info; /*!< IP address, netmask, gatway IP address */
+	bool ip_changed;			 /*!< Whether the assigned IP has changed or not */
+} ip_event_got_ip_t;
+
+/** Event structure for IP_EVENT_GOT_IP6 event */
+typedef struct {
+	int if_index;				   /*!< Interface index for which the event is received (left for legacy compilation) */
+	void *esp_netif;			   /*!< Pointer to corresponding esp-netif object */
+	esp_netif_ip6_info_t ip6_info; /*!< IPv6 address of the interface */
+	int ip_index;				   /*!< IPv6 address index */
+} ip_event_got_ip6_t;
+
+/** Event structure for IP_EVENT_AP_STAIPASSIGNED event */
+typedef struct {
+	esp_ip4_addr_t ip; /*!< IP address which was assigned to the station */
+} ip_event_ap_staipassigned_t;

arduino/libretuya/api/WiFiType.h

@@ -34,12 +34,28 @@
 #define WIFI_AP		WIFI_MODE_AP
 #define WIFI_AP_STA WIFI_MODE_APSTA
 
+#define WiFiEvent_t		arduino_event_id_t
+#define WiFiEventInfo_t arduino_event_info_t
+#define WiFiEventId_t	uint16_t
+
+struct esp_ip6_addr {
+	uint32_t addr[4];
+	uint8_t zone;
+};
+
+struct esp_ip4_addr {
+	uint32_t addr;
+};
+
+typedef struct esp_ip4_addr esp_ip4_addr_t;
+typedef struct esp_ip6_addr esp_ip6_addr_t;
+
 typedef enum {
-	WIFI_MODE_NULL = 0,
-	WIFI_MODE_STA,
-	WIFI_MODE_AP,
-	WIFI_MODE_APSTA,
-	WIFI_MODE_MAX,
+	WIFI_MODE_NULL = 0, /**< null mode */
+	WIFI_MODE_STA,		/**< WiFi station mode */
+	WIFI_MODE_AP,		/**< WiFi soft-AP mode */
+	WIFI_MODE_APSTA,	/**< WiFi station + soft-AP mode */
+	WIFI_MODE_MAX
 } wifi_mode_t;
 
 typedef enum {
@@ -54,13 +70,54 @@ typedef enum {
 } wl_status_t;
 
 typedef enum {
-	WIFI_AUTH_INVALID	   = 255,
-	WIFI_AUTH_AUTO		   = 200,
-	WIFI_AUTH_OPEN		   = 0,
-	WIFI_AUTH_WEP		   = 1,
-	WIFI_AUTH_WPA		   = 5,
-	WIFI_AUTH_WPA2		   = 6,
-	WIFI_AUTH_WPA_PSK	   = 2,
-	WIFI_AUTH_WPA2_PSK	   = 3,
-	WIFI_AUTH_WPA_WPA2_PSK = 4,
+	WIFI_AUTH_OPEN = 0,		   /**< authenticate mode : open */
+	WIFI_AUTH_WEP,			   /**< authenticate mode : WEP */
+	WIFI_AUTH_WPA_PSK,		   /**< authenticate mode : WPA_PSK */
+	WIFI_AUTH_WPA2_PSK,		   /**< authenticate mode : WPA2_PSK */
+	WIFI_AUTH_WPA_WPA2_PSK,	   /**< authenticate mode : WPA_WPA2_PSK */
+	WIFI_AUTH_WPA2_ENTERPRISE, /**< authenticate mode : WPA2_ENTERPRISE */
+	WIFI_AUTH_WPA3_PSK,		   /**< authenticate mode : WPA3_PSK */
+	WIFI_AUTH_WPA2_WPA3_PSK,   /**< authenticate mode : WPA2_WPA3_PSK */
+	WIFI_AUTH_WAPI_PSK,		   /**< authenticate mode : WAPI_PSK */
+	WIFI_AUTH_WPA,
+	WIFI_AUTH_WPA2,
+	WIFI_AUTH_AUTO	  = 200,
+	WIFI_AUTH_INVALID = 255,
+	WIFI_AUTH_MAX
 } wifi_auth_mode_t;
+
+typedef enum {
+	WIFI_REASON_UNSPECIFIED				 = 1,
+	WIFI_REASON_AUTH_EXPIRE				 = 2,
+	WIFI_REASON_AUTH_LEAVE				 = 3,
+	WIFI_REASON_ASSOC_EXPIRE			 = 4,
+	WIFI_REASON_ASSOC_TOOMANY			 = 5,
+	WIFI_REASON_NOT_AUTHED				 = 6,
+	WIFI_REASON_NOT_ASSOCED				 = 7,
+	WIFI_REASON_ASSOC_LEAVE				 = 8,
+	WIFI_REASON_ASSOC_NOT_AUTHED		 = 9,
+	WIFI_REASON_DISASSOC_PWRCAP_BAD		 = 10,
+	WIFI_REASON_DISASSOC_SUPCHAN_BAD	 = 11,
+	WIFI_REASON_BSS_TRANSITION_DISASSOC	 = 12,
+	WIFI_REASON_IE_INVALID				 = 13,
+	WIFI_REASON_MIC_FAILURE				 = 14,
+	WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT	 = 15,
+	WIFI_REASON_GROUP_KEY_UPDATE_TIMEOUT = 16,
+	WIFI_REASON_IE_IN_4WAY_DIFFERS		 = 17,
+	WIFI_REASON_GROUP_CIPHER_INVALID	 = 18,
+	WIFI_REASON_PAIRWISE_CIPHER_INVALID	 = 19,
+	WIFI_REASON_AKMP_INVALID			 = 20,
+	WIFI_REASON_UNSUPP_RSN_IE_VERSION	 = 21,
+	WIFI_REASON_INVALID_RSN_IE_CAP		 = 22,
+	WIFI_REASON_802_1X_AUTH_FAILED		 = 23,
+	WIFI_REASON_CIPHER_SUITE_REJECTED	 = 24,
+	WIFI_REASON_INVALID_PMKID			 = 53,
+	WIFI_REASON_BEACON_TIMEOUT			 = 200,
+	WIFI_REASON_NO_AP_FOUND				 = 201,
+	WIFI_REASON_AUTH_FAIL				 = 202,
+	WIFI_REASON_ASSOC_FAIL				 = 203,
+	WIFI_REASON_HANDSHAKE_TIMEOUT		 = 204,
+	WIFI_REASON_CONNECTION_FAIL			 = 205,
+	WIFI_REASON_AP_TSF_RESET			 = 206,
+	WIFI_REASON_ROAMING					 = 207,
+} wifi_err_reason_t;

arduino/libretuya/api/Wire.h

@@ -0,0 +1,66 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-09. */
+
+#include <api/Stream.h>
+
+class ITwoWire : public Stream {
+  protected:
+	int8_t _sda	   = -1;
+	int8_t _scl	   = -1;
+	uint32_t _freq = 0;
+
+	void (*onRequestCallback)(void);
+	void (*onReceiveCallback)(int);
+
+  public:
+	bool begin() {
+		return begin(_sda, _scl, _freq);
+	}
+
+	bool begin(uint8_t address) {
+		return begin(address, _sda, _scl, _freq);
+	}
+
+	virtual bool setPins(int8_t sda, int8_t scl) = 0;
+
+	virtual bool begin(int8_t sda, int8_t scl, uint32_t frequency = 0)					= 0;
+	virtual bool begin(uint8_t address, int8_t sda, int8_t scl, uint32_t frequency = 0) = 0;
+	virtual bool end()																	= 0;
+
+	virtual bool setClock(uint32_t freq) = 0;
+
+	virtual void beginTransmission(uint8_t address) = 0;
+	virtual uint8_t endTransmission(bool stopBit)	= 0;
+
+	virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit) = 0;
+
+	virtual size_t write(const uint8_t *data, size_t len) = 0;
+
+	virtual int available() = 0;
+	virtual int read()		= 0;
+	virtual int peek()		= 0;
+	virtual void flush()	= 0;
+
+	uint32_t getClock() {
+		return _freq;
+	}
+
+	uint8_t endTransmission() {
+		return endTransmission(true);
+	}
+
+	size_t requestFrom(uint8_t address, size_t len) {
+		return requestFrom(address, len, true);
+	}
+
+	virtual size_t write(uint8_t data) {
+		return write(&data, 1);
+	}
+
+	void onReceive(void (*cb)(int)) {
+		onReceiveCallback = cb;
+	}
+
+	void onRequest(void (*cb)(void)) {
+		onRequestCallback = cb;
+	}
+};

arduino/libretuya/core/LibreTuyaAPI.cpp

@@ -0,0 +1,22 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-04-29. */
+
+#include "LibreTuyaAPI.h"
+
+String ipToString(const IPAddress &ip) {
+	char szRet[16];
+	sprintf(szRet, "%hhu.%hhu.%hhu.%hhu", ip[0], ip[1], ip[2], ip[3]);
+	return String(szRet);
+}
+
+static void lt_random_bytes(uint8_t *buf, size_t len) {
+	int *data = (int *)buf;
+	size_t i;
+	for (i = 0; len >= sizeof(int); len -= sizeof(int)) {
+		data[i++] = rand();
+	}
+	if (len) {
+		int rem				= rand();
+		unsigned char *pRem = (unsigned char *)&rem;
+		memcpy(buf + i * sizeof(int), pRem, len);
+	}
+}

arduino/libretuya/core/LibreTuyaAPI.h

@@ -24,6 +24,7 @@ extern "C" {
 #endif // __cplusplus
 
 #include "lt_logger.h"
+#include "lt_posix_api.h"
 
 #ifdef __cplusplus
 } // extern "C"
@@ -43,9 +44,32 @@ extern "C" {
 #define PGM_VOID_P			const void *
 
 // C functions
-extern char *strdup(const char *);
+void lt_rand_bytes(uint8_t *buf, size_t len);
 
 // C++ only functions
 #ifdef __cplusplus
 String ipToString(const IPAddress &ip);
 #endif
+
+// Main class
+#ifdef __cplusplus
+/**
+ * @brief Main LibreTuya API class.
+ *
+ * This class contains all functions common amongst all platforms.
+ * Implementations of these methods may vary between platforms.
+ *
+ * The class is accessible using the `LT` global object (defined by the platform).
+ */
+class LibreTuya {
+
+	/* Common methods*/
+
+  public:
+	/* Platform-defined methods */
+
+  public:
+};
+
+extern LibreTuya LT;
+#endif

arduino/libretuya/core/LibreTuyaConfig.h

@@ -44,6 +44,11 @@
 #define LT_LOGLEVEL LT_LEVEL_INFO
 #endif
 
+// Free heap size debugging
+#ifndef LT_LOG_HEAP
+#define LT_LOG_HEAP 0
+#endif
+
 // Per-module debugging
 #ifndef LT_DEBUG_WIFI
 #define LT_DEBUG_WIFI 0

arduino/libretuya/core/lt_logger.h

@@ -51,6 +51,12 @@ void lt_log(const uint8_t level, const char *format, ...);
 #define LT_F(...)
 #endif
 
+#if LT_LOG_HEAP
+#define LT_HEAP_I() LT_I("Free heap: %u", LT_HEAP_FUNC());
+#else
+#define LT_HEAP_I()
+#endif
+
 // ESP32 compat
 #define log_printf(...)		LT_I(__VA_ARGS__)
 #define log_v(...)			LT_V(__VA_ARGS__)

arduino/libretuya/libraries/HTTPClient/HTTPClient.cpp

@@ -29,7 +29,7 @@
 
 #ifdef HTTPCLIENT_1_1_COMPATIBLE
 #include <WiFi.h>
-// #include <WiFiClientSecure.h>
+#include <WiFiClientSecure.h>
 #endif
 
 // #include <StreamString.h>
@@ -63,7 +63,7 @@ class TLSTraits : public TransportTraits {
 	TLSTraits(const char *CAcert, const char *clicert = nullptr, const char *clikey = nullptr)
 		: _cacert(CAcert), _clicert(clicert), _clikey(clikey) {}
 
-	/* std::unique_ptr<WiFiClient> create() override {
+	std::unique_ptr<WiFiClient> create() override {
 		return std::unique_ptr<WiFiClient>(new WiFiClientSecure());
 	}
 
@@ -77,7 +77,7 @@ class TLSTraits : public TransportTraits {
 			wcs.setPrivateKey(_clikey);
 		}
 		return true;
-	} */
+	}
 
   protected:
 	const char *_cacert;

arduino/libretuya/libraries/HTTPClient/HTTPClient.h

@@ -33,7 +33,7 @@
 
 #include <Arduino.h>
 #include <WiFiClient.h>
-// #include <WiFiClientSecure.h>
+#include <WiFiClientSecure.h>
 #include <memory>
 
 /// Cookie jar support

arduino/libretuya/libraries/NetUtils/ssl/MbedTLSClient.cpp

@@ -19,9 +19,13 @@ extern "C" {
 } // extern "C"
 #endif
 
-MbedTLSClient::MbedTLSClient() : WiFiClient() {}
+MbedTLSClient::MbedTLSClient() : WiFiClient() {
+	init(); // ensure the context is zero filled
+}
 
-MbedTLSClient::MbedTLSClient(int sock) : WiFiClient(sock) {}
+MbedTLSClient::MbedTLSClient(int sock) : WiFiClient(sock) {
+	init(); // ensure the context is zero filled
+}
 
 void MbedTLSClient::stop() {
 	WiFiClient::stop();
@@ -46,46 +50,37 @@ void MbedTLSClient::init() {
 }
 
 int MbedTLSClient::connect(IPAddress ip, uint16_t port, int32_t timeout) {
-	return connect(ipToString(ip).c_str(), port, timeout) == 0;
+	return connect(ipToString(ip).c_str(), port, timeout);
 }
 
 int MbedTLSClient::connect(const char *host, uint16_t port, int32_t timeout) {
 	if (_pskIdentStr && _pskStr)
-		return connect(host, port, NULL, NULL, NULL, _pskIdentStr, _pskStr, _alpnProtocols) == 0;
-	return connect(host, port, _caCertStr, _clientCertStr, _clientKeyStr, NULL, NULL, _alpnProtocols) == 0;
+		return connect(host, port, timeout, NULL, NULL, NULL, _pskIdentStr, _pskStr) == 0;
+	return connect(host, port, timeout, _caCertStr, _clientCertStr, _clientKeyStr, NULL, NULL) == 0;
 }
 
 int MbedTLSClient::connect(
 	IPAddress ip, uint16_t port, const char *rootCABuf, const char *clientCert, const char *clientKey
 ) {
-	return connect(ipToString(ip).c_str(), port, rootCABuf, clientCert, clientKey, NULL, NULL, _alpnProtocols) == 0;
+	return connect(ipToString(ip).c_str(), port, 0, rootCABuf, clientCert, clientKey, NULL, NULL) == 0;
 }
 
 int MbedTLSClient::connect(
 	const char *host, uint16_t port, const char *rootCABuf, const char *clientCert, const char *clientKey
 ) {
-	return connect(host, port, rootCABuf, clientCert, clientKey, NULL, NULL, _alpnProtocols) == 0;
+	return connect(host, port, 0, rootCABuf, clientCert, clientKey, NULL, NULL) == 0;
 }
 
 int MbedTLSClient::connect(IPAddress ip, uint16_t port, const char *pskIdent, const char *psk) {
-	return connect(ipToString(ip).c_str(), port, NULL, NULL, NULL, pskIdent, psk, _alpnProtocols) == 0;
+	return connect(ipToString(ip).c_str(), port, 0, NULL, NULL, NULL, pskIdent, psk) == 0;
 }
 
 int MbedTLSClient::connect(const char *host, uint16_t port, const char *pskIdent, const char *psk) {
-	return connect(host, port, NULL, NULL, NULL, pskIdent, psk, _alpnProtocols) == 0;
+	return connect(host, port, 0, NULL, NULL, NULL, pskIdent, psk) == 0;
 }
 
 static int ssl_random(void *data, unsigned char *output, size_t len) {
-	int *buf = (int *)output;
-	size_t i;
-	for (i = 0; len >= sizeof(int); len -= sizeof(int)) {
-		buf[i++] = rand();
-	}
-	if (len) {
-		int rem				= rand();
-		unsigned char *pRem = (unsigned char *)&rem;
-		memcpy(output + i * sizeof(int), pRem, len);
-	}
+	lt_rand_bytes((uint8_t *)output, len);
 	return 0;
 }
 
@@ -96,23 +91,26 @@ void debug_cb(void *ctx, int level, const char *file, int line, const char *str)
 int MbedTLSClient::connect(
 	const char *host,
 	uint16_t port,
+	int32_t timeout,
 	const char *rootCABuf,
 	const char *clientCert,
 	const char *clientKey,
 	const char *pskIdent,
-	const char *psk,
-	const char **alpnProtocols
+	const char *psk
 ) {
 	LT_D_SSL("Free heap before TLS: TODO");
 
 	if (!rootCABuf && !pskIdent && !psk && !_insecure && !_useRootCA)
 		return -1;
 
+	if (timeout <= 0)
+		timeout = _timeout; // use default when -1 passed as timeout
+
 	IPAddress addr = WiFi.hostByName(host);
 	if (!(uint32_t)addr)
 		return -1;
 
-	int ret = WiFiClient::connect(addr, port, _timeout);
+	int ret = WiFiClient::connect(addr, port, timeout);
 	if (ret < 0) {
 		LT_E("SSL socket failed");
 		return ret;
@@ -135,8 +133,8 @@ int MbedTLSClient::connect(
 	LT_RET_NZ(ret);
 
 #ifdef MBEDTLS_SSL_ALPN
-	if (alpnProtocols) {
-		ret = mbedtls_ssl_conf_alpn_protocols(&_sslCfg, alpnProtocols);
+	if (_alpnProtocols) {
+		ret = mbedtls_ssl_conf_alpn_protocols(&_sslCfg, _alpnProtocols);
 		LT_RET_NZ(ret);
 	}
 #endif
@@ -208,10 +206,11 @@ int MbedTLSClient::connect(
 
 	_sockTls = fd();
 	mbedtls_ssl_set_bio(&_sslCtx, &_sockTls, mbedtls_net_send, mbedtls_net_recv, NULL);
+	mbedtls_net_set_nonblock((mbedtls_net_context *)&_sockTls);
 
 	LT_V_SSL("SSL handshake");
 	if (_handshakeTimeout == 0)
-		_handshakeTimeout = _timeout * 1000;
+		_handshakeTimeout = timeout;
 	unsigned long start = millis();
 	while (ret = mbedtls_ssl_handshake(&_sslCtx)) {
 		if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {

arduino/libretuya/libraries/NetUtils/ssl/MbedTLSClient.h

@@ -42,12 +42,12 @@ class MbedTLSClient : public WiFiClient, public IWiFiClientSecure {
 	int connect(
 		const char *host,
 		uint16_t port,
+		int32_t timeout,
 		const char *rootCABuf,
 		const char *clientCert,
 		const char *clientKey,
 		const char *pskIdent,
-		const char *psk,
-		const char **alpnProtocols
+		const char *psk
 	);
 
   public:

arduino/libretuya/libraries/mDNS/ESPmDNS.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-23. */
+
+#pragma once
+
+#include "mDNS.h"

arduino/libretuya/libraries/mDNS/LwIPmDNS.cpp

@@ -0,0 +1,151 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-23. */
+
+#ifdef LT_HAS_LWIP2
+
+#include "mDNS.h"
+
+extern "C" {
+#include <lwip/apps/mdns.h>
+#include <lwip/netif.h>
+}
+
+extern u8_t mdns_netif_client_id;
+
+struct mdns_domain {
+	/* Encoded domain name */
+	u8_t name[256];
+	/* Total length of domain name, including zero */
+	u16_t length;
+	/* Set if compression of this domain is not allowed */
+	u8_t skip_compression;
+};
+
+/** Description of a service */
+struct mdns_service {
+	/** TXT record to answer with */
+	struct mdns_domain txtdata;
+	/** Name of service, like 'myweb' */
+	char name[MDNS_LABEL_MAXLEN + 1];
+	/** Type of service, like '_http' */
+	char service[MDNS_LABEL_MAXLEN + 1];
+	/** Callback function and userdata
+	 * to update txtdata buffer */
+	service_get_txt_fn_t txt_fn;
+	void *txt_userdata;
+	/** TTL in seconds of SRV/TXT replies */
+	u32_t dns_ttl;
+	/** Protocol, TCP or UDP */
+	u16_t proto;
+	/** Port of the service */
+	u16_t port;
+};
+
+/** Description of a host/netif */
+struct mdns_host {
+	/** Hostname */
+	char name[MDNS_LABEL_MAXLEN + 1];
+	/** Pointer to services */
+	struct mdns_service *services[MDNS_MAX_SERVICES];
+	/** TTL in seconds of A/AAAA/PTR replies */
+	u32_t dns_ttl;
+};
+
+static String mdnsInstanceName = "default_instance";
+
+mDNS::mDNS() {}
+
+mDNS::~mDNS() {}
+
+bool mDNS::begin(const char *hostname) {
+	mdns_resp_init();
+	struct netif *netif = netif_list;
+	while (netif != NULL) {
+		if (netif_is_up(netif) && mdns_resp_add_netif(netif, hostname, 255) != ERR_OK) {
+			return false;
+		}
+		netif = netif->next;
+	}
+	return true;
+}
+
+void mDNS::end() {
+	struct netif *netif = netif_list;
+	while (netif != NULL) {
+		if (netif_is_up(netif))
+			mdns_resp_remove_netif(netif);
+		netif = netif->next;
+	}
+}
+
+void mDNS::setInstanceName(String name) {
+	mdnsInstanceName = name;
+}
+
+bool mDNS::addService(char *service, char *proto, uint16_t port) {
+	char _service[strlen(service) + 2];
+	char _proto[strlen(proto) + 2];
+	_service[0] = '_';
+	_proto[0]	= '_';
+	// prepend names with _
+	strcpy(_service + 1, service + (service[0] == '_'));
+	strcpy(_proto + 1, proto + (proto[0] == '_'));
+
+	mdns_sd_proto protocol = DNSSD_PROTO_UDP;
+	if (strncmp(_proto + 1, "tcp", 3) == 0)
+		protocol = DNSSD_PROTO_TCP;
+
+	struct netif *netif = netif_list;
+	while (netif != NULL) {
+		if (netif_is_up(netif)) {
+			mdns_resp_add_service(netif, mdnsInstanceName.c_str(), service, protocol, port, 255, NULL, NULL);
+		}
+		netif = netif->next;
+	}
+}
+
+bool mDNS::addServiceTxt(char *name, char *proto, char *key, char *value) {
+	char _name[strlen(name) + 2];
+	char _proto[strlen(proto) + 2];
+	_name[0]  = '_';
+	_proto[0] = '_';
+	// prepend names with _
+	strcpy(_name + 1, name + (name[0] == '_'));
+	strcpy(_proto + 1, proto + (proto[0] == '_'));
+
+	mdns_sd_proto protocol = DNSSD_PROTO_UDP;
+	if (strncmp(_proto + 1, "tcp", 3) == 0)
+		protocol = DNSSD_PROTO_TCP;
+
+	struct netif *netif = netif_list;
+	struct mdns_host *mdns;
+	struct mdns_service *service;
+
+	uint8_t txt_len = strlen(key) + strlen(value) + 1;
+	char *txt		= (char *)malloc(txt_len + 1);
+	sprintf(txt, "%s=%s", key, value);
+
+	while (netif != NULL) {
+		if (netif_is_up(netif)) {
+			mdns = (struct mdns_host *)netif_get_client_data(netif, mdns_netif_client_id);
+
+			for (uint8_t i = 0; i < MDNS_MAX_SERVICES; i++) {
+				service = mdns->services[i];
+				if (service == NULL)
+					continue;
+				if (strcmp(service->service, _name) || service->proto != protocol)
+					continue;
+				if (mdns_resp_add_service_txtitem(service, txt, txt_len) != ERR_OK) {
+					free(txt);
+					return false;
+				}
+			}
+		}
+		netif = netif->next;
+	}
+	free(txt);
+	return true;
+}
+
+MDNSResponder MDNS;
+
+#endif

arduino/libretuya/libraries/mDNS/mDNS.h

@@ -0,0 +1,119 @@
+/*
+ESP8266 Multicast DNS (port of CC3000 Multicast DNS library)
+Version 1.1
+Copyright (c) 2013 Tony DiCola (tony@tonydicola.com)
+ESP8266 port (c) 2015 Ivan Grokhotkov (ivan@esp8266.com)
+MDNS-SD Suport 2015 Hristo Gochkov (hristo@espressif.com)
+Extended MDNS-SD support 2016 Lars Englund (lars.englund@gmail.com)
+Rewritten for ESP32 by Hristo Gochkov (hristo@espressif.com)
+
+This is a simple implementation of multicast DNS query support for an Arduino
+running on ESP32 chip.
+
+Usage:
+- Include the ESP32 Multicast DNS library in the sketch.
+- Call the begin method in the sketch's setup and provide a domain name (without
+  the '.local' suffix, i.e. just provide 'foo' to resolve 'foo.local'), and the
+  Adafruit CC3000 class instance.  Optionally provide a time to live (in seconds)
+  for the DNS record--the default is 1 hour.
+- Call the update method in each iteration of the sketch's loop function.
+
+License (MIT license):
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, 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:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 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 DEALINGS IN
+  THE SOFTWARE.
+
+*/
+
+#pragma once
+
+#include <Arduino.h>
+#include <api/IPv6Address.h>
+
+class mDNS {
+  public:
+	mDNS();
+	~mDNS();
+
+	bool begin(const char *hostname);
+	void end();
+
+	void setInstanceName(String name);
+	bool addService(char *service, char *proto, uint16_t port);
+	bool addServiceTxt(char *name, char *proto, char *key, char *value);
+	// void enableArduino(uint16_t port = 3232, bool auth = false);
+	// void disableArduino();
+	// void enableWorkstation(esp_interface_t interface = ESP_IF_WIFI_STA);
+	// void disableWorkstation();
+
+	IPAddress queryHost(char *host, uint32_t timeout = 2000);
+	int queryService(char *service, char *proto);
+
+	String hostname(int idx);
+	IPAddress IP(int idx);
+	IPv6Address IPv6(int idx);
+	uint16_t port(int idx);
+	int numTxt(int idx);
+	bool hasTxt(int idx, const char *key);
+	String txt(int idx, const char *key);
+	String txt(int idx, int txtIdx);
+	String txtKey(int idx, int txtIdx);
+
+	void setInstanceName(const char *name) {
+		setInstanceName(String(name));
+	}
+
+	void setInstanceName(char *name) {
+		setInstanceName(String(name));
+	}
+
+	bool addService(const char *service, const char *proto, uint16_t port) {
+		return addService((char *)service, (char *)proto, port);
+	}
+
+	bool addService(String service, String proto, uint16_t port) {
+		return addService(service.c_str(), proto.c_str(), port);
+	}
+
+	void addServiceTxt(const char *name, const char *proto, const char *key, const char *value) {
+		addServiceTxt((char *)name, (char *)proto, (char *)key, (char *)value);
+	}
+
+	void addServiceTxt(String name, String proto, String key, String value) {
+		addServiceTxt(name.c_str(), proto.c_str(), key.c_str(), value.c_str());
+	}
+
+	IPAddress queryHost(const char *host, uint32_t timeout = 2000) {
+		return queryHost((char *)host, timeout);
+	}
+
+	IPAddress queryHost(String host, uint32_t timeout = 2000) {
+		return queryHost(host.c_str(), timeout);
+	}
+
+	int queryService(const char *service, const char *proto) {
+		return queryService((char *)service, (char *)proto);
+	}
+
+	int queryService(String service, String proto) {
+		return queryService(service.c_str(), proto.c_str());
+	}
+};
+
+typedef mDNS MDNSResponder;
+
+extern MDNSResponder MDNS;

arduino/libretuya/posix/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: Never

arduino/libretuya/posix/lt_posix_api.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-16. */
+
+extern char *strdup(const char *);
+extern int strcasecmp(const char *s1, const char *s2);
+extern int strncasecmp(const char *s1, const char *s2, size_t n);

arduino/libretuya/posix/strcasecmp.c

@@ -0,0 +1,97 @@
+/*	$OpenBSD: strcasecmp.c,v 1.6 2005/08/08 08:05:37 espie Exp $	*/
+/*
+ * Copyright (c) 1987, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <string.h>
+typedef unsigned char u_char;
+/*
+ * This array is designed for mapping upper and lower case letter
+ * together for a case independent comparison.  The mappings are
+ * based upon ascii character sequences.
+ */
+static const u_char charmap[] = {
+	'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+	'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+	'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+	'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+	'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+	'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+	'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+	'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+	'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+	'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+	'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+	'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+	'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+	'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+	'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+	'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+	'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+	'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+	'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+	'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+	'\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+	'\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+	'\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+	'\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+	'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+};
+int
+strcasecmp(const char *s1, const char *s2)
+{
+	const u_char *cm = charmap;
+	const u_char *us1 = (const u_char *)s1;
+	const u_char *us2 = (const u_char *)s2;
+	while (cm[*us1] == cm[*us2++])
+		if (*us1++ == '\0')
+			return (0);
+	return (cm[*us1] - cm[*--us2]);
+}
+int
+strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	if (n != 0) {
+		const u_char *cm = charmap;
+		const u_char *us1 = (const u_char *)s1;
+		const u_char *us2 = (const u_char *)s2;
+		do {
+			if (cm[*us1] != cm[*us2++])
+				return (cm[*us1] - cm[*--us2]);
+			if (*us1++ == '\0')
+				break;
+		} while (--n != 0);
+	}
+	return (0);
+}

arduino/libretuya/posix/strdup.c

@@ -0,0 +1,11 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-16. */
+
+#include <stddef.h>
+
+__attribute__((weak)) char *strdup(const char *s) {
+	size_t len = strlen(s) + 1;
+	void *newp = malloc(len);
+	if (newp == NULL)
+		return NULL;
+	return (char *)memcpy(newp, s, len);
+}

arduino/realtek-ambz/cores/arduino/Arduino.h

@@ -8,7 +8,7 @@
 
 #define PinMode PinModeArduino // this conflicts with SDK enum
 #include <api/ArduinoAPI.h>
-#include <api/LibreTuyaAPI.h>
+#include <core/LibreTuyaAPI.h>
 #undef PinMode
 
 #ifdef __cplusplus

arduino/realtek-ambz/cores/arduino/sdk_extern.h

@@ -6,13 +6,27 @@
 #include <stddef.h>
 #include <stdint.h>
 
+// disable typedef in basic_types.h
 #define boolean boolean_rtl
+
+#include <strproc.h> // define string macros first
+#undef isdigit		 // then remove them, as they conflict
+#undef islower		 // with ctype.h macros
+#undef isprint
+#undef isspace
+#undef isxdigit
+#undef strtol
+#undef strtoul
+
 #include <ameba_soc.h>
 #include <gpio_api.h>
+#include <main.h>
 #include <rand.h>
 #include <rt_lib_rom.h>
 #include <rtl_lib.h>
 #include <wait_api.h>
+
+// remove previously defined workaround
 #undef boolean
 
 // stdio.h
@@ -35,3 +49,5 @@ extern void wait_us(int us);
 extern int LOGUART_SetBaud(uint32_t BaudRate);	  // from fixups/log_uart.c
 extern void DumpForOneBytes(void *addr, int cnt); // cnt max 0x70!
 extern void SystemCoreClockUpdate(void);
+
+extern int _sscanf_patch(const char *buf, const char *fmt, ...);

arduino/realtek-ambz/cores/arduino/sdk_mem.h

@@ -17,3 +17,5 @@ extern void vPortFree(void *pv);
 #define calloc	pvPortCalloc
 #define realloc pvPortReAlloc
 #define free	vPortFree
+
+#define LT_HEAP_FUNC xPortGetFreeHeapSize

arduino/realtek-ambz/cores/arduino/wiring.c

@@ -31,7 +31,7 @@ static __inline uint32_t __get_ipsr__(void) {
 	return (__regIPSR);
 }
 
-void init(void) {
+__attribute__((weak)) void init(void) {
 	// nop
 }
 

arduino/realtek-ambz/libraries/Flash/Flash.cpp

@@ -4,15 +4,12 @@
 
 #include <Arduino.h>
 
-#ifdef __cplusplus
 extern "C" {
-#endif // __cplusplus
-
 #include <flash_api.h>
+}
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
+// Global Flash object.
+FlashClass Flash;
 
 FlashClass::FlashClass() {
 	flash = NULL;
@@ -67,5 +64,3 @@ bool FlashClass::writeBlock(uint32_t offset, uint8_t *data, size_t size) {
 	initialize();
 	return flash_stream_write(flash, offset, size, data);
 }
-
-FlashClass Flash;

arduino/realtek-ambz/libraries/WiFi/WiFi.h

@@ -18,6 +18,7 @@ extern "C" {
 #endif
 
 #include "WiFiClient.h"
+#include "WiFiClientSecure.h"
 #include "WiFiServer.h"
 
 class WiFiClass : public IWiFiClass,
@@ -72,6 +73,8 @@ class WiFiClass : public IWiFiClass,
 	static uint8_t calculateSubnetCIDR(IPAddress subnetMask);
 	static String macToString(uint8_t *mac);
 
+	static void handleRtwEvent(uint16_t event, char *data, int len, int flags);
+
   public:
 	// IWiFiSTAClass
 	WiFiStatus begin(

arduino/realtek-ambz/libraries/WiFi/WiFiAP.cpp

@@ -7,6 +7,8 @@ bool WiFiClass::softAP(const char *ssid, const char *passphrase, int channel, bo
 	if (!enableAP(true))
 		return false;
 
+	LT_HEAP_I();
+
 	vTaskDelay(20);
 
 	if (!ssid || *ssid == 0x00 || strlen(ssid) > 32) {

arduino/realtek-ambz/libraries/WiFi/WiFiClient.cpp

@@ -68,6 +68,9 @@ int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout) {
 		return -1;
 	}
 
+	if (timeout <= 0)
+		timeout = _timeout; // use default when -1 passed as timeout
+
 	lwip_fcntl(sock, F_SETFL, lwip_fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
 
 	struct sockaddr_in addr;
@@ -80,7 +83,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout) {
 	FD_ZERO(&fdset);
 	FD_SET(sock, &fdset);
 	tv.tv_sec  = 0;
-	tv.tv_usec = timeout * 1000;
+	tv.tv_usec = timeout * 1000; // millis -> micros
 
 	int res = lwip_connect(sock, (struct sockaddr *)&addr, sizeof(addr));
 	if (res < 0 && errno != EINPROGRESS) {

arduino/realtek-ambz/libraries/WiFi/WiFiEvents.cpp

@@ -0,0 +1,204 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-16. */
+
+#include "WiFi.h"
+#include "WiFiPriv.h"
+
+#include <vector>
+
+#define WIFI_EVENT_MAX_ROW 3
+
+static xQueueHandle wifiEventQueueHandle = NULL;
+static xTaskHandle wifiEventTaskHandle	 = NULL;
+
+// C code to support SDK-defined events (in wifi_conf.c)
+extern "C" {
+// SDK events
+static event_list_elem_t event_callback_list[WIFI_EVENT_MAX][WIFI_EVENT_MAX_ROW];
+
+typedef struct {
+	rtw_event_indicate_t event;
+	char *buf;
+	int buf_len;
+	int flags;
+} rtw_event_t;
+
+// reset callbacks
+void init_event_callback_list() {
+	memset(event_callback_list, 0, sizeof(event_callback_list));
+}
+
+// dummy
+int wifi_manager_init() {
+	return 0;
+}
+
+void wifi_reg_event_handler(unsigned int event_cmds, rtw_event_handler_t handler_func, void *handler_user_data) {
+	int i = 0, j = 0;
+	if (event_cmds < WIFI_EVENT_MAX) {
+		for (i = 0; i < WIFI_EVENT_MAX_ROW; i++) {
+			if (event_callback_list[event_cmds][i].handler == NULL) {
+				for (j = 0; j < WIFI_EVENT_MAX_ROW; j++) {
+					if (event_callback_list[event_cmds][j].handler == handler_func) {
+						return;
+					}
+				}
+				event_callback_list[event_cmds][i].handler			 = handler_func;
+				event_callback_list[event_cmds][i].handler_user_data = handler_user_data;
+				return;
+			}
+		}
+	}
+}
+
+void wifi_unreg_event_handler(unsigned int event_cmds, rtw_event_handler_t handler_func) {
+	int i;
+	if (event_cmds < WIFI_EVENT_MAX) {
+		for (i = 0; i < WIFI_EVENT_MAX_ROW; i++) {
+			if (event_callback_list[event_cmds][i].handler == handler_func) {
+				event_callback_list[event_cmds][i].handler			 = NULL;
+				event_callback_list[event_cmds][i].handler_user_data = NULL;
+				return;
+			}
+		}
+	}
+}
+} // extern "C"
+
+// function called by wext_wlan_indicate
+void wifi_indication(rtw_event_indicate_t event, char *buf, int buf_len, int flags) {
+	LT_HEAP_I();
+	if (event >= WIFI_EVENT_MAX)
+		return;
+	if (wifiEventQueueHandle && wifiEventTaskHandle) {
+		rtw_event_t *ev = (rtw_event_t *)malloc(sizeof(rtw_event_t));
+		if (buf_len > 0) {
+			// copy data to allow freeing from calling scopes
+			char *bufCopy = (char *)malloc(buf_len);
+			memcpy(bufCopy, buf, buf_len);
+			ev->buf = bufCopy;
+		} else {
+			ev->buf = NULL;
+		}
+		ev->event	= event;
+		ev->buf_len = buf_len;
+		ev->flags	= flags;
+		xQueueSend(wifiEventQueueHandle, &ev, portMAX_DELAY);
+	} else {
+		WiFiClass::handleRtwEvent(event, buf, buf_len, flags);
+	}
+}
+
+static void wifiEventTask(void *arg) {
+	rtw_event_t *data = NULL;
+	for (;;) {
+		if (xQueueReceive(wifiEventQueueHandle, &data, portMAX_DELAY) == pdTRUE) {
+			WiFiClass::handleRtwEvent(data->event, data->buf, data->buf_len, data->flags);
+			if (data->buf) {
+				// free memory allocated in wifi_indication
+				free(data->buf);
+			}
+			free(data);
+		}
+	}
+}
+
+void startWifiTask() {
+	if (!wifiEventQueueHandle) {
+		LT_HEAP_I();
+		wifiEventQueueHandle = xQueueCreate(32, sizeof(Event_t *));
+		LT_HEAP_I();
+	}
+	if (!wifiEventTaskHandle) {
+		LT_HEAP_I();
+		xTaskCreate(wifiEventTask, "wifievent", 512, NULL, 4, &wifiEventTaskHandle);
+		LT_HEAP_I();
+	}
+}
+
+void WiFiClass::handleRtwEvent(uint16_t event, char *data, int len, int flags) {
+	if (flags == -2) {
+		// already an Arduino event, just pass it
+		EventId eventId		 = (EventId)len;
+		EventInfo *eventInfo = (EventInfo *)data;
+		postEvent(eventId, *eventInfo);
+		free(eventInfo);
+		return;
+	}
+
+	// send to SDK listeners
+	for (uint8_t i = 0; i < WIFI_EVENT_MAX_ROW; i++) {
+		rtw_event_handler_t handler = event_callback_list[event][i].handler;
+		if (!handler)
+			continue;
+		handler(data, len, flags, event_callback_list[event][i].handler_user_data);
+	}
+
+	EventId eventId;
+	EventInfo eventInfo;
+	String ssid;
+
+	memset(&eventInfo, 0, sizeof(EventInfo));
+
+	switch (event) {
+		case WIFI_EVENT_CONNECT:
+			eventId = ARDUINO_EVENT_WIFI_STA_START;
+			break;
+
+		case WIFI_EVENT_DISCONNECT:
+		case WIFI_EVENT_RECONNECTION_FAIL:
+			eventId									 = ARDUINO_EVENT_WIFI_STA_DISCONNECTED;
+			eventInfo.wifi_sta_disconnected.ssid_len = 0;
+			eventInfo.wifi_sta_disconnected.reason	 = WIFI_REASON_UNSPECIFIED;
+			if (event == WIFI_EVENT_RECONNECTION_FAIL)
+				eventInfo.wifi_sta_disconnected.reason = WIFI_REASON_CONNECTION_FAIL;
+			break;
+
+		case WIFI_EVENT_FOURWAY_HANDSHAKE_DONE:
+			eventId								  = ARDUINO_EVENT_WIFI_STA_CONNECTED;
+			ssid								  = WiFi.SSID();
+			eventInfo.wifi_sta_connected.ssid_len = ssid.length();
+			eventInfo.wifi_sta_connected.channel  = WiFi.channel();
+			eventInfo.wifi_sta_connected.authmode = WiFi.getEncryption();
+			memcpy(eventInfo.wifi_sta_connected.ssid, ssid.c_str(), eventInfo.wifi_sta_connected.ssid_len + 1);
+			memcpy(eventInfo.wifi_sta_connected.bssid, WiFi.BSSID(), 6);
+			break;
+
+		case WIFI_EVENT_SCAN_DONE:
+			eventId							 = ARDUINO_EVENT_WIFI_SCAN_DONE;
+			eventInfo.wifi_scan_done.status	 = 0;
+			eventInfo.wifi_scan_done.number	 = WiFi._netCount;
+			eventInfo.wifi_scan_done.scan_id = 0;
+			break;
+
+		case WIFI_EVENT_STA_ASSOC:
+			// data(124) has MAC at 0x0A
+			if (len != 124)
+				return;
+			eventId = ARDUINO_EVENT_WIFI_AP_STACONNECTED;
+			memcpy(eventInfo.wifi_ap_staconnected.mac, (const char *)data[10], 6);
+			break;
+
+		case WIFI_EVENT_STA_DISASSOC:
+			// data(6) is MAC
+			eventId = ARDUINO_EVENT_WIFI_AP_STADISCONNECTED;
+			memcpy(eventInfo.wifi_ap_stadisconnected.mac, (const char *)data, 6);
+			break;
+
+		// case WIFI_EVENT_SCAN_RESULT_REPORT:
+		// case WIFI_EVENT_SEND_ACTION_DONE:
+		// case WIFI_EVENT_RX_MGNT:
+		// case WIFI_EVENT_STA_WPS_START:
+		// case WIFI_EVENT_WPS_FINISH:
+		// case WIFI_EVENT_EAPOL_START:
+		// case WIFI_EVENT_EAPOL_RECVD:
+		// case WIFI_EVENT_NO_NETWORK:
+		// case WIFI_EVENT_BEACON_AFTER_DHCP:
+		// case WIFI_EVENT_IP_CHANGED:
+		// case WIFI_EVENT_ICV_ERROR:
+		// case WIFI_EVENT_CHALLENGE_FAIL:
+		default:
+			return;
+	}
+
+	postEvent(eventId, eventInfo);
+}

arduino/realtek-ambz/libraries/WiFi/WiFiGeneric.cpp

@@ -9,20 +9,24 @@ int32_t WiFiClass::channel() {
 	return channel;
 }
 
+extern void startWifiTask();
+
 bool WiFiClass::mode(WiFiMode mode) {
 	WiFiMode currentMode = getMode();
 	LT_D_WG("Mode changing %u -> %u", currentMode, mode);
 	if (mode == currentMode)
 		return true;
+	LT_HEAP_I();
+	startWifiTask();
 
 	if (!currentMode && mode && !_initialized) {
 		// initialize wifi first
 		LT_I("Initializing LwIP");
 		LwIP_Init();
 		reset_wifi_struct();
-		// wifi_manager_init(); // these are events!
 		_initialized = true;
 	}
+	LT_HEAP_I();
 	if (currentMode) {
 		// stop wifi to change mode
 		LT_D_WG("Stopping WiFi to change mode");
@@ -37,6 +41,7 @@ bool WiFiClass::mode(WiFiMode mode) {
 		LT_E("Error while changing mode(%u)", mode);
 		return false;
 	}
+	LT_HEAP_I();
 	return true;
 }
 

arduino/realtek-ambz/libraries/WiFi/WiFiPriv.h

@@ -9,8 +9,6 @@ extern "C" {
 // these are defined in PIO builder (for IDE to understand)
 #define LWIP_TIMEVAL_PRIVATE 0
 #define LWIP_NETIF_HOSTNAME	 1
-// this should define all errno values, as well as the extern int
-#define LWIP_PROVIDE_ERRNO	 1
 #define LWIP_SO_RCVBUF		 1
 
 #define MAX_SOCK_NUM				4
@@ -20,13 +18,6 @@ extern "C" {
 #define WIFI_CLIENT_SELECT_TIMEOUT	1000
 #define WIFI_CLIENT_FLUSH_BUF_SIZE	1024
 
-// I think I don't understand how that works.
-// For some reason, LwIP uses a different (extern) errno,
-// while this macro refers to a function __errno, which
-// reads a totally different variable.
-#undef errno
-#include <lwip/arch.h>
-
 // disable #defines removing lwip_ prefix
 #undef LWIP_COMPAT_SOCKETS
 #define LWIP_COMPAT_SOCKETS 0

arduino/realtek-ambz/libraries/WiFi/WiFiSTA.cpp

@@ -12,6 +12,8 @@ WiFiClass::begin(const char *ssid, const char *passphrase, int32_t channel, cons
 	if (!enableSTA(true))
 		return WL_CONNECT_FAILED;
 
+	LT_HEAP_I();
+
 	if (!ssid || *ssid == 0x00 || strlen(ssid) > 32) {
 		LT_W("SSID not specified or too long");
 		return WL_CONNECT_FAILED;
@@ -47,18 +49,26 @@ WiFiClass::begin(const char *ssid, const char *passphrase, int32_t channel, cons
 bool WiFiClass::config(IPAddress localIP, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2) {
 	if (!enableSTA(true))
 		return false;
-	struct netif *ifs = NETIF_RTW_STA;
-	struct ip_addr ipaddr, netmask, gw, d1, d2;
-	ipaddr.addr	 = localIP;
-	netmask.addr = subnet;
-	gw.addr		 = gateway;
-	d1.addr		 = dns1;
-	d2.addr		 = dns2;
-	netif_set_addr(ifs, &ipaddr, &netmask, &gw);
+
+	struct ip_addr d1, d2;
+	d1.addr = dns1;
+	d2.addr = dns2;
 	if (dns1[0])
 		dns_setserver(0, &d1);
 	if (dns2[0])
 		dns_setserver(0, &d2);
+
+	if (!localIP[0]) {
+		LwIP_DHCP(0, DHCP_START);
+		return true;
+	}
+	struct netif *ifs = NETIF_RTW_STA;
+	struct ip_addr ipaddr, netmask, gw;
+	ipaddr.addr	 = localIP;
+	netmask.addr = subnet;
+	gw.addr		 = gateway;
+	netif_set_addr(ifs, &ipaddr, &netmask, &gw);
+	LwIP_DHCP(0, DHCP_STOP);
 	return true;
 }
 
@@ -94,8 +104,21 @@ bool WiFiClass::reconnect(const uint8_t *bssid) {
 
 	if (ret == RTW_SUCCESS) {
 		dhcpRet = LwIP_DHCP(0, DHCP_START);
-		if (dhcpRet == DHCP_ADDRESS_ASSIGNED)
+		if (dhcpRet == DHCP_ADDRESS_ASSIGNED) {
+			LT_HEAP_I();
+			EventInfo *eventInfo				   = (EventInfo *)zalloc(sizeof(EventInfo));
+			eventInfo->got_ip.if_index			   = 0;
+			eventInfo->got_ip.esp_netif			   = NULL;
+			eventInfo->got_ip.ip_info.ip.addr	   = localIP();
+			eventInfo->got_ip.ip_info.gw.addr	   = gatewayIP();
+			eventInfo->got_ip.ip_info.netmask.addr = subnetMask();
+			eventInfo->got_ip.ip_changed		   = true;
+			// pass the event through the queue
+			wifi_indication(WIFI_EVENT_CONNECT, (char *)eventInfo, ARDUINO_EVENT_WIFI_STA_GOT_IP, -2);
+			// free memory as wifi_indication creates a copy
+			free(eventInfo);
 			return true;
+		}
 		LT_E("DHCP failed; dhcpRet=%d", dhcpRet);
 		wifi_disconnect();
 		return false;

arduino/realtek-ambz/libraries/Wire/Wire.cpp

@@ -0,0 +1,192 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-08. */
+
+#include "Wire.h"
+
+#include <Arduino.h>
+
+extern "C" {
+#include <i2c_api.h>
+extern int i2c_write_timeout(i2c_t *obj, int address, char *data, int length, int stop, int timeout_ms);
+}
+
+#ifdef PIN_WIRE0_SDA
+// Wire object associated to I2C0 interface.
+TwoWire Wire(PIN_WIRE0_SDA, PIN_WIRE0_SCL);
+#endif
+
+#if defined(PIN_WIRE0_SDA) && defined(PIN_WIRE1_SDA)
+// Wire object associated to I2C1 interface.
+TwoWire Wire1(PIN_WIRE1_SDA, PIN_WIRE1_SCL);
+#endif
+
+#if !defined(PIN_WIRE0_SDA) && defined(PIN_WIRE1_SDA)
+// Wire object associated to I2C1 interface. The board doesn't support I2C0.
+TwoWire Wire(PIN_WIRE1_SDA, PIN_WIRE1_SCL);
+#endif
+
+TwoWire::TwoWire() {
+	_timeout = 50;
+}
+
+TwoWire::TwoWire(int8_t sda, int8_t scl) {
+	_timeout = 50;
+	_sda	 = sda;
+	_scl	 = scl;
+}
+
+TwoWire::~TwoWire() {}
+
+bool TwoWire::setPins(int8_t sda, int8_t scl) {
+	// return true when changing pins on initialized I2C
+	if (_inSetPins)
+		return true;
+	// check if pins are provided
+	if (sda == -1 || scl == -1)
+		return false;
+	// set private pins
+	_sda = sda;
+	_scl = scl;
+	sda	 = g_APinDescription[sda].pinname;
+	scl	 = g_APinDescription[scl].pinname;
+
+	// check if pins are valid
+	if ((sda == PA_4 || sda == PA_19 || sda == PA_30) && (scl == PA_1 || scl == PA_22 || scl == PA_29)) {
+		// I2C index 0
+		_idx = 0;
+	} else if ((sda == PA_27 || sda == PA_2 || sda == PA_23) && (scl == PA_28 || scl == PA_3 || scl == PA_18)) {
+		// I2C index 1
+		_idx = 1;
+	} else {
+		return false;
+	}
+
+	// restart I2C if changing pins
+	// this will never be called from begin()
+	if (_i2c) {
+		_inSetPins = true;
+		end();
+		begin();
+		_inSetPins = false;
+	}
+	return true;
+}
+
+bool TwoWire::begin(int8_t sda, int8_t scl, uint32_t frequency) {
+	if (_i2c)
+		return true;
+	// set private i2c pins
+	if (!setPins(sda, scl))
+		return false;
+	// use default frequency
+	if (!frequency)
+		frequency = WIRE_DEFAULT_FREQ;
+
+	_i2c = new i2c_t;
+	i2c_init(_i2c, (PinName)g_APinDescription[_sda].pinname, (PinName)g_APinDescription[_scl].pinname);
+	i2c_frequency(_i2c, frequency);
+	_freq = frequency;
+	return true;
+}
+
+bool TwoWire::begin(uint8_t address, int8_t sda, int8_t scl, uint32_t frequency) {
+	if (_i2c)
+		return true;
+	// init master bus first, return if failed (wrong pins)
+	if (!begin(sda, scl, frequency))
+		return false;
+
+	i2c_slave_address(_i2c, _idx, address, 0xff);
+	i2c_slave_mode(_i2c, true);
+	return true;
+}
+
+bool TwoWire::end() {
+	i2c_reset(_i2c);
+	delete _i2c;
+	_i2c = NULL;
+}
+
+bool TwoWire::setClock(uint32_t freq) {
+	if (_i2c) {
+		i2c_frequency(_i2c, freq);
+	}
+	_freq = freq;
+}
+
+void TwoWire::beginTransmission(uint8_t address) {
+	_txAddr = address;
+	_txBuf.clear();
+}
+
+// Errors:
+//  0 : Success
+//  1 : Data too long
+//  2 : NACK on transmit of address
+//  3 : NACK on transmit of data
+//  4 : Other error
+uint8_t TwoWire::endTransmission(bool stopBit) {
+	if (!_i2c || !_txAddr)
+		return 4;
+	char *buf = (char *)malloc(_txBuf.available());
+	uint8_t i = 0;
+	while (_txBuf.available()) {
+		buf[i++] = _txBuf.read_char();
+	}
+	int len = i2c_write_timeout(_i2c, _txAddr, buf, i, stopBit, _timeout);
+	free(buf);
+	_txAddr = 0;
+	if (len == -1)
+		return 2; // slave not available (if tx length == 0)
+	if (len != i)
+		return 3; // less bytes written
+	return 0;
+}
+
+size_t TwoWire::requestFrom(uint8_t address, size_t len, bool stopBit) {
+	if (!len)
+		return 0;
+
+	if (len > SERIAL_BUFFER_SIZE)
+		len = SERIAL_BUFFER_SIZE;
+
+	_rxBuf.clear();
+
+	char *buf = (char *)malloc(_txBuf.available());
+	i2c_read(_i2c, address, buf, len, stopBit);
+	uint8_t i = 0;
+	while (len) {
+		_rxBuf.store_char(buf[i++]);
+		len--;
+	}
+	free(buf);
+	return len;
+}
+
+size_t TwoWire::write(uint8_t data) {
+	if (!_txAddr || _txBuf.isFull())
+		return 0;
+	_txBuf.store_char(data);
+	return 1;
+}
+
+size_t TwoWire::write(const uint8_t *data, size_t len) {
+	for (size_t i = 0; i < len; i++) {
+		if (!write(data[i]))
+			return i;
+	}
+	return len;
+}
+
+int TwoWire::available() {
+	return _rxBuf.available();
+}
+
+int TwoWire::read() {
+	return _rxBuf.read_char();
+}
+
+int TwoWire::peek() {
+	return _rxBuf.peek();
+}
+
+void TwoWire::flush() {}

arduino/realtek-ambz/libraries/Wire/Wire.h

@@ -0,0 +1,75 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-08. */
+
+#pragma once
+
+#include <api/RingBuffer.h>
+#include <api/Wire.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+// #include <i2c_api.h>
+#ifdef __cplusplus
+}
+#endif
+
+#if !defined(PIN_WIRE0_SDA) && defined(PIN_WIRE1_SDA)
+#define Wire1 Wire
+#endif
+
+#define WIRE_HAS_END	  1
+#define WIRE_DEFAULT_FREQ 100000
+
+struct i2c_s;
+typedef struct i2c_s i2c_t;
+
+using arduino::RingBuffer;
+
+class TwoWire : public ITwoWire {
+  private:
+	i2c_t *_i2c	 = NULL;
+	uint8_t _idx = 0;
+
+	RingBuffer _rxBuf;
+	RingBuffer _txBuf;
+	uint8_t _txAddr = 0;
+	bool _inSetPins = false;
+
+  public:
+	TwoWire();
+	TwoWire(int8_t sda, int8_t scl);
+	~TwoWire();
+
+	bool setPins(int8_t sda, int8_t scl);
+
+	bool begin(int8_t sda, int8_t scl, uint32_t frequency = 0);
+	bool begin(uint8_t address, int8_t sda, int8_t scl, uint32_t frequency = 0);
+	bool end();
+
+	bool setClock(uint32_t freq);
+
+	void beginTransmission(uint8_t address);
+	uint8_t endTransmission(bool stopBit);
+
+	size_t requestFrom(uint8_t address, size_t len, bool stopBit);
+	size_t write(uint8_t data);
+	size_t write(const uint8_t *data, size_t len);
+
+	int available();
+	int read();
+	int peek();
+	void flush();
+
+	using ITwoWire::begin;
+	using ITwoWire::endTransmission;
+	using ITwoWire::requestFrom;
+	using ITwoWire::write;
+	using Print::write;
+};
+
+#ifdef PIN_WIRE0_SDA
+extern TwoWire Wire;
+#endif
+#ifdef PIN_WIRE1_SDA
+extern TwoWire Wire1;
+#endif

boards/_base/realtek-ambz-2mb.json

@@ -0,0 +1,21 @@
+{
+	"build": {
+		"ldscript_sdk": "rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld",
+		"ldscript_arduino": "rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld",
+		"amb_boot_all": "boot_all_77F7.bin"
+	},
+	"flash": {
+		"boot_xip": "0x000000+0x4000",
+		"boot_ram": "0x004000+0x4000",
+		"system": "0x009000+0x1000",
+		"calibration": "0x00A000+0x1000",
+		"ota1": "0x00B000+0xC5000",
+		"ota2": "0x0D0000+0xC5000",
+		"userdata": "0x195000+0x6A000",
+		"rdp": "0x1FF000+0x1000"
+	},
+	"upload": {
+		"flash_size": 2097152,
+		"maximum_size": 806912
+	}
+}

boards/_base/realtek-ambz-tuya3-alt.json

@@ -0,0 +1,151 @@
+{
+	"pcb": {
+		"templates": [
+			"esp12s",
+			"esp12s-shield",
+			"tuya-16x24",
+			"tuya-16x24-rf1"
+		],
+		"vars": {
+			"MASK_PRESET": "mask_black",
+			"TRACE_COLOR": "#505050",
+			"SILK_COLOR": "white",
+			"PINTYPE_VERT": "pin_vert_2mm_cast_nohole"
+		},
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"pinout": {
+			"1": {
+				"NC": null
+			},
+			"2": {
+				"IC": 27,
+				"IO": "I",
+				"ADC": 2,
+				"ARD": "A1"
+			},
+			"3": {
+				"IC": 12,
+				"IO": "I",
+				"CTRL": "CEN"
+			},
+			"4": {
+				"IC": 2,
+				"GPIO": "PA29",
+				"ARD": "D5",
+				"UART": "2_RX",
+				"I2C": "0_SCL",
+				"PWM": 4
+			},
+			"5": {
+				"IC": 13,
+				"GPIO": "PA14",
+				"ARD": "D2",
+				"PWM": 0,
+				"SWD": "CLK"
+			},
+			"6": {
+				"IC": 14,
+				"GPIO": "PA15",
+				"ARD": "D3",
+				"PWM": 1,
+				"SWD": "DIO"
+			},
+			"7": {
+				"IC": 31,
+				"GPIO": "PA22",
+				"ARD": "D0",
+				"UART": "0_RTS",
+				"SPI": [
+					"0_MISO",
+					"1_MISO"
+				],
+				"I2C": "0_SCL",
+				"SD": "D0",
+				"PWM": 5,
+				"I2S": "0_WS",
+				"WAKE": 2
+			},
+			"8": {
+				"PWR": 3.3
+			},
+			"9": {
+				"GND": null
+			},
+			"10": {
+				"IC": 16,
+				"GPIO": "PA00",
+				"ARD": "D4",
+				"PWM": 2
+			},
+			"11": {
+				"IC": 1,
+				"GPIO": "PA30",
+				"ARD": "D6",
+				"UART": "2_TX",
+				"I2C": "0_SDA",
+				"PWM": 4,
+				"RTC": "OUT"
+			},
+			"12": {
+				"IC": 30,
+				"GPIO": "PA19",
+				"ARD": [
+					"D1",
+					"A0"
+				],
+				"ADC": 1,
+				"UART": "0_CTS",
+				"SPI": [
+					"0_CS",
+					"1_CS"
+				],
+				"I2C": "0_SDA",
+				"SD": "D3",
+				"TMR": "5_TRIG",
+				"I2S": "0_TX"
+			},
+			"13": {
+				"IC": 28,
+				"GPIO": "PA05",
+				"ARD": "D7",
+				"PWM": 4,
+				"WAKE": 1
+			},
+			"14": {
+				"IC": 17,
+				"GPIO": "PA12",
+				"ARD": "D8",
+				"PWM": 3
+			},
+			"15": {
+				"IC": 29,
+				"GPIO": "PA18",
+				"ARD": "D9",
+				"UART": "0_RX",
+				"SPI": [
+					"0_SCK",
+					"1_SCK"
+				],
+				"I2C": "1_SCL",
+				"SD": "D2",
+				"TMR": "4_TRIG",
+				"I2S": "0_MCK",
+				"WAKE": 0
+			},
+			"16": {
+				"IC": 32,
+				"GPIO": "PA23",
+				"ARD": "D10",
+				"UART": "0_TX",
+				"SPI": [
+					"0_MOSI",
+					"1_MOSI"
+				],
+				"I2C": "1_SDA",
+				"SD": "D1",
+				"PWM": 0,
+				"WAKE": 3
+			}
+		}
+	}
+}

boards/_base/realtek-ambz-tuya3.json

@@ -0,0 +1,151 @@
+{
+	"pcb": {
+		"templates": [
+			"esp12s",
+			"esp12s-shield",
+			"tuya-16x24",
+			"tuya-16x24-rf1"
+		],
+		"vars": {
+			"MASK_PRESET": "mask_black",
+			"TRACE_COLOR": "#505050",
+			"SILK_COLOR": "white",
+			"PINTYPE_VERT": "pin_vert_2mm_cast_nohole"
+		},
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"pinout": {
+			"1": {
+				"NC": null
+			},
+			"2": {
+				"IC": 31,
+				"GPIO": "PA22",
+				"ARD": "D0",
+				"UART": "0_RTS",
+				"SPI": [
+					"0_MISO",
+					"1_MISO"
+				],
+				"I2C": "0_SCL",
+				"SD": "D0",
+				"PWM": 5,
+				"I2S": "0_WS",
+				"WAKE": 2
+			},
+			"3": {
+				"IC": 12,
+				"IO": "I",
+				"CTRL": "CEN"
+			},
+			"4": {
+				"IC": 30,
+				"GPIO": "PA19",
+				"ARD": [
+					"D1",
+					"A0"
+				],
+				"ADC": 1,
+				"UART": "0_CTS",
+				"SPI": [
+					"0_CS",
+					"1_CS"
+				],
+				"I2C": "0_SDA",
+				"SD": "D3",
+				"TMR": "5_TRIG",
+				"I2S": "0_TX"
+			},
+			"5": {
+				"IC": 13,
+				"GPIO": "PA14",
+				"ARD": "D2",
+				"PWM": 0,
+				"SWD": "CLK"
+			},
+			"6": {
+				"IC": 14,
+				"GPIO": "PA15",
+				"ARD": "D3",
+				"PWM": 1,
+				"SWD": "DIO"
+			},
+			"7": {
+				"IC": 16,
+				"GPIO": "PA00",
+				"ARD": "D4",
+				"PWM": 2
+			},
+			"8": {
+				"PWR": 3.3
+			},
+			"9": {
+				"GND": null
+			},
+			"10": {
+				"IC": 27,
+				"IO": "I",
+				"ADC": 2,
+				"ARD": "A1"
+			},
+			"11": {
+				"IC": 2,
+				"GPIO": "PA29",
+				"ARD": "D5",
+				"UART": "2_RX",
+				"I2C": "0_SCL",
+				"PWM": 4
+			},
+			"12": {
+				"IC": 1,
+				"GPIO": "PA30",
+				"ARD": "D6",
+				"UART": "2_TX",
+				"I2C": "0_SDA",
+				"PWM": 4,
+				"RTC": "OUT"
+			},
+			"13": {
+				"IC": 28,
+				"GPIO": "PA05",
+				"ARD": "D7",
+				"PWM": 4,
+				"WAKE": 1
+			},
+			"14": {
+				"IC": 17,
+				"GPIO": "PA12",
+				"ARD": "D8",
+				"PWM": 3
+			},
+			"15": {
+				"IC": 29,
+				"GPIO": "PA18",
+				"ARD": "D9",
+				"UART": "0_RX",
+				"SPI": [
+					"0_SCK",
+					"1_SCK"
+				],
+				"I2C": "1_SCL",
+				"SD": "D2",
+				"TMR": "4_TRIG",
+				"I2S": "0_MCK",
+				"WAKE": 0
+			},
+			"16": {
+				"IC": 32,
+				"GPIO": "PA23",
+				"ARD": "D10",
+				"UART": "0_TX",
+				"SPI": [
+					"0_MOSI",
+					"1_MOSI"
+				],
+				"I2C": "1_SDA",
+				"SD": "D1",
+				"PWM": 0,
+				"WAKE": 3
+			}
+		}
+	}
+}

boards/_base/realtek-ambz.json

@@ -0,0 +1,50 @@
+{
+	"build": {
+		"f_cpu": "125000000L",
+		"amb_flash_addr": "0x08000000"
+	},
+	"connectivity": [
+		"wifi"
+	],
+	"debug": {
+		"protocol": "openocd",
+		"protocols": [
+			"openocd"
+		],
+		"openocd_config": "amebaz.cfg",
+		"gdb_init": [
+			"mem 0x8000000 0x8200000 ro"
+		]
+	},
+	"frameworks": [
+		"realtek-ambz-sdk",
+		"realtek-ambz-arduino"
+	],
+	"upload": {
+		"maximum_ram_size": 262144,
+		"require_upload_port": true,
+		"speed": 1500000,
+		"protocol": "uart",
+		"protocols": [
+			"uart"
+		]
+	},
+	"doc": {
+		"params": {
+			"manufacturer": "Realtek",
+			"series": "AmebaZ",
+			"voltage": "3.0V - 3.6V",
+			"extra": {
+				"Wi-Fi": "802.11 b/g/n"
+			}
+		},
+		"links": {
+			"Debugging": "../../docs/platform/realtek/debugging.md",
+			"Flashing (Tuya manual)": "https://developer.tuya.com/en/docs/iot/burn-and-authorize-wr-series-modules?id=Ka789pjc581u8"
+		},
+		"extra": [
+			"RDP is most likely not used in Tuya firmwares, as the System Data partition contains an incorrect offset 0xFF000 for RDP, which is in the middle of OTA2 image.",
+			"Additionally, Tuya firmware uses an encrypted KV or file storage, which resides at the end of flash memory. This seems to overlap system RDP area."
+		]
+	}
+}

boards/wr3.json

@@ -1,53 +1,22 @@
 {
+	"_base": [
+		"realtek-ambz",
+		"realtek-ambz-2mb",
+		"realtek-ambz-tuya3"
+	],
 	"build": {
 		"mcu": "rtl8710bn",
 		"family": "rtl8710",
-		"variant": "wr3",
-		"ldscript_sdk": "rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld",
-		"ldscript_arduino": "rlx8711B-symbol-v02-img2_xip1_2M_cpp.ld",
-		"f_cpu": "125000000L",
-		"amb_flash_addr": "0x08000000",
-		"amb_boot_all": "boot_all_77F7.bin"
-	},
-	"connectivity": [
-		"wifi"
-	],
-	"debug": {
-		"protocol": "openocd",
-		"protocols": [
-			"openocd"
-		],
-		"openocd_config": "amebaz.cfg",
-		"gdb_init": [
-			"mem 0x8000000 0x8200000 ro"
-		]
-	},
-	"flash": {
-		"boot_xip": "0x000000+0x4000",
-		"boot_ram": "0x004000+0x4000",
-		"system": "0x009000+0x1000",
-		"calibration": "0x00A000+0x1000",
-		"ota1": "0x00B000+0xC5000",
-		"ota2": "0x0D0000+0xC5000",
-		"userdata": "0x195000+0x6A000",
-		"rdp": "0x1FF000+0x1000"
-	},
-	"frameworks": [
-		"realtek-ambz-sdk",
-		"realtek-ambz-arduino"
-	],
-	"upload": {
-		"flash_size": "2MB",
-		"maximum_size": 806912,
-		"maximum_ram_size": 262144,
-		"require_upload_port": true,
-		"speed": 1500000,
-		"protocol": "uart",
-		"protocols": [
-			"uart"
-		]
+		"variant": "wr3"
 	},
 	"name": "WR3 Wi-Fi Module",
 	"url": "https://developer.tuya.com/en/docs/iot/wr3-module-datasheet?id=K9g3ainzbj9z1",
-	"vendor": "Tuya Inc."
+	"vendor": "Tuya Inc.",
+	"pcb": {
+		"symbol": "WR3",
+		"vars": {
+			"MASK_PRESET": "mask_black",
+			"TRACE_COLOR": "#505050"
+		}
+	}
 }

boards/wr3/README.md

@@ -1,44 +1,45 @@
 # WR3 Wi-Fi Module
 
-[Product page](https://developer.tuya.com/en/docs/iot/wifiwr1module?id=K9605tc0k90t3)
+*by Tuya Inc.*
+
+[Product page](https://developer.tuya.com/en/docs/iot/wr3-module-datasheet?id=K9g3ainzbj9z1)
 
 - [Debugging](../../docs/platform/realtek/debugging.md)
+- [Flashing (Tuya manual)](https://developer.tuya.com/en/docs/iot/burn-and-authorize-wr-series-modules?id=Ka789pjc581u8)
 
 Parameter    | Value
--------------|-------------------------
+-------------|----------------------------------
 MCU          | RTL8710BN
 Manufacturer | Realtek
 Series       | AmebaZ
-Max. clock   | 125 MHz
+Frequency    | 125 MHz
 Flash size   | 2 MiB
 RAM size     | 256 KiB
 Voltage      | 3.0V - 3.6V
-I/O          | 7x GPIO, 2x UART, 1x ADC
+I/O          | 11x GPIO, 6x PWM, 2x UART, 2x ADC
 Wi-Fi        | 802.11 b/g/n
 
 ## Pinout
 
-![image](pinout.png)
+![Pinout](pinout_wr3.svg)
 
-## Arduino core pin map
+## Arduino Core pin mapping
 
-No. | Pin   | Alt. function | PWM
-----|-------|---------------|-----
-D0  | PA_22 |               | PWM5
-D1  | PA_19 |               |
-D2  | PA_14 | SWCLK         | PWM0
-D3  | PA_15 | SWDAT         | PWM1
-D4  | PA_0  |               | PWM2
-D5  | PA_20 |               |
-D6  | PA_29 | UART_Log_RXD  | PWM4
-D7  | PA_30 | UART_Log_TXD  | PWM3
-D8  | PA_5  |               | PWM4
-D9  | PA_12 |               | PWM3
-D10 | PA_18 | UART0_RXD     |
-D11 | PA_23 | UART0_TXD     | PWM0
-A0  | PA_19 |               |
-A1  | -     |               |
-A2  | PA_20 |               |
+No. | Pin        | UART      | I²C      | SPI                  | PWM  | Other
+----|------------|-----------|----------|----------------------|------|------
+D0  | PA22       | UART0_RTS | I2C0_SCL | SPI0_MISO, SPI1_MISO | PWM5 |
+D1  | PA19       | UART0_CTS | I2C0_SDA | SPI0_CS, SPI1_CS     |      |
+D2  | PA14       |           |          |                      | PWM0 | SWCLK
+D3  | PA15       |           |          |                      | PWM1 | SWDIO
+D4  | PA00       |           |          |                      | PWM2 |
+D5  | PA29       | UART2_RX  | I2C0_SCL |                      | PWM4 |
+D6  | PA30       | UART2_TX  | I2C0_SDA |                      | PWM4 |
+D7  | PA05       |           |          |                      | PWM4 |
+D8  | PA12       |           |          |                      | PWM3 |
+D9  | PA18       | UART0_RX  | I2C1_SCL | SPI0_SCK, SPI1_SCK   |      |
+D10 | PA23       | UART0_TX  | I2C1_SDA | SPI0_MOSI, SPI1_MOSI | PWM0 |
+A0  | PA19, ADC1
+A1  | ADC2
 
 ## Flash memory map
 
@@ -58,7 +59,6 @@ OTA2 Image  | 0x0D0000 | 788 KiB / 0xC5000 | 0x195000
 User Data   | 0x195000 | 424 KiB / 0x6A000 | 0x1FF000
 RDP         | 0x1FF000 | 4 KiB / 0x1000    | 0x200000
 
-RDP is most likely not used in Tuya firmwares, as the System Data partition contains
-an incorrect offset 0xFF000 for RDP, which is in the middle of OTA2 image.
+RDP is most likely not used in Tuya firmwares, as the System Data partition contains an incorrect offset 0xFF000 for RDP, which is in the middle of OTA2 image.
 
 Additionally, Tuya firmware uses an encrypted KV or file storage, which resides at the end of flash memory. This seems to overlap system RDP area.

boards/wr3/pinout_wr3.svg

@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="full" height="500" version="1.1" viewBox="0,0,85.33333333333333,41.666666666666664" width="1024">
+    <defs/>
+    <rect fill="white" height="41.666666666666664" stroke="black" stroke-width="0.1" width="85.33333333333333" x="0" y="0"/>
+    <linearGradient gradientUnits="objectBoundingBox" id="id1" x1="1.0" x2="0.0" y1="0.0" y2="1.0">
+        <stop offset="0%" stop-color="#4d4d4d"/>
+        <stop offset="100%" stop-color="#0f0f0f"/>
+    </linearGradient>
+    <rect fill="url(#id1) none" height="23.9" stroke="#b5a739" stroke-width="0.1" width="15.9" x="34.36666666666666" y="8.883333333333333"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin1.trace" width="0.7" x="34.31666666666666" y="16.583333333333332"/>
+    <circle cx="34.31666666666666" cy="17.18333333333333" fill="#fff" id="esp12s.front.left.pin1.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin2.trace" width="0.7" x="34.31666666666666" y="18.583333333333332"/>
+    <circle cx="34.31666666666666" cy="19.18333333333333" fill="#fff" id="esp12s.front.left.pin2.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin3.trace" width="0.7" x="34.31666666666666" y="20.583333333333332"/>
+    <circle cx="34.31666666666666" cy="21.18333333333333" fill="#fff" id="esp12s.front.left.pin3.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin4.trace" width="0.7" x="34.31666666666666" y="22.583333333333332"/>
+    <circle cx="34.31666666666666" cy="23.18333333333333" fill="#fff" id="esp12s.front.left.pin4.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin5.trace" width="0.7" x="34.31666666666666" y="24.583333333333332"/>
+    <circle cx="34.31666666666666" cy="25.183333333333334" fill="#fff" id="esp12s.front.left.pin5.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin6.trace" width="0.7" x="34.31666666666666" y="26.583333333333332"/>
+    <circle cx="34.31666666666666" cy="27.183333333333334" fill="#fff" id="esp12s.front.left.pin6.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin7.trace" width="0.7" x="34.31666666666666" y="28.583333333333332"/>
+    <circle cx="34.31666666666666" cy="29.183333333333334" fill="#fff" id="esp12s.front.left.pin7.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.left.pin8.trace" width="0.7" x="34.31666666666666" y="30.583333333333332"/>
+    <circle cx="34.31666666666666" cy="31.183333333333334" fill="#fff" id="esp12s.front.left.pin8.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin1.trace" width="0.7" x="49.61666666666666" y="16.583333333333332"/>
+    <circle cx="50.31666666666666" cy="17.18333333333333" fill="#fff" id="esp12s.front.right.pin1.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin2.trace" width="0.7" x="49.61666666666666" y="18.583333333333332"/>
+    <circle cx="50.31666666666666" cy="19.18333333333333" fill="#fff" id="esp12s.front.right.pin2.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin3.trace" width="0.7" x="49.61666666666666" y="20.583333333333332"/>
+    <circle cx="50.31666666666666" cy="21.18333333333333" fill="#fff" id="esp12s.front.right.pin3.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin4.trace" width="0.7" x="49.61666666666666" y="22.583333333333332"/>
+    <circle cx="50.31666666666666" cy="23.18333333333333" fill="#fff" id="esp12s.front.right.pin4.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin5.trace" width="0.7" x="49.61666666666666" y="24.583333333333332"/>
+    <circle cx="50.31666666666666" cy="25.183333333333334" fill="#fff" id="esp12s.front.right.pin5.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin6.trace" width="0.7" x="49.61666666666666" y="26.583333333333332"/>
+    <circle cx="50.31666666666666" cy="27.183333333333334" fill="#fff" id="esp12s.front.right.pin6.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin7.trace" width="0.7" x="49.61666666666666" y="28.583333333333332"/>
+    <circle cx="50.31666666666666" cy="29.183333333333334" fill="#fff" id="esp12s.front.right.pin7.cast" r="0.35"/>
+    <rect fill="#e5b472" height="1.2" id="esp12s.front.right.pin8.trace" width="0.7" x="49.61666666666666" y="30.583333333333332"/>
+    <circle cx="50.31666666666666" cy="31.183333333333334" fill="#fff" id="esp12s.front.right.pin8.cast" r="0.35"/>
+    <linearGradient gradientUnits="objectBoundingBox" id="id2" x1="1.0" x2="0.0" y1="0.0" y2="1.0">
+        <stop offset="0%" stop-color="whitesmoke"/>
+        <stop offset="100%" stop-color="#999"/>
+    </linearGradient>
+    <rect fill="url(#id2) none" height="16.8" rx="0.5" ry="0.5" width="13.6" x="35.516666666666666" y="15.783333333333331"/>
+    <rect fill="#fff" height="0.15" width="15.0" x="34.81666666666666" y="15.033333333333331"/>
+    <text fill="#fff" font-family="Consolas" font-size="1.0" x="41.31666666666666" y="14.333333333333332">WR3</text>
+    <rect fill="#505050" height="5.2" width="0.5" x="35.416666666666664" y="9.633333333333333"/>
+    <rect fill="#505050" height="0.5" width="4.6" x="35.416666666666664" y="9.633333333333333"/>
+    <rect fill="#505050" height="5.2" width="0.5" x="37.61666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="3.0" width="0.5" x="39.516666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="0.5" width="3.0" x="39.516666666666666" y="12.133333333333333"/>
+    <rect fill="#505050" height="3.0" width="0.5" x="42.016666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="0.5" width="2.7" x="42.016666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="3.0" width="0.5" x="44.21666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="0.5" width="3.0" x="44.21666666666666" y="12.133333333333333"/>
+    <rect fill="#505050" height="3.0" width="0.5" x="46.71666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="0.5" width="2.5" x="46.71666666666666" y="9.633333333333333"/>
+    <rect fill="#505050" height="4.4" width="0.5" x="48.71666666666666" y="9.633333333333333"/>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="17.08333333333333"/>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="19.08333333333333"/>
+    <g transform="translate(27.431026020611558,18.38333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="19.18333333333333">PA22</text>
+    <g transform="translate(24.43102602061156,18.38333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="25.616666666666664" y="19.18333333333333">D0</text>
+    <g transform="translate(20.83102602061156,18.38333333333333)">
+        <rect fill="#f95" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="22.316666666666663" y="19.18333333333333">SCL0</text>
+    <g transform="translate(17.231026020611562,18.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="18.716666666666665" y="19.18333333333333">MISO0</text>
+    <g transform="translate(13.631026020611563,18.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="15.116666666666664" y="19.18333333333333">MISO1</text>
+    <g transform="translate(10.031026020611561,18.38333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="11.516666666666662" y="19.18333333333333">PWM5</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="21.08333333333333"/>
+    <g transform="translate(27.431026020611558,20.38333333333333)">
+        <rect fill="#ed602e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="21.18333333333333">CEN</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="23.08333333333333"/>
+    <g transform="translate(27.431026020611558,22.38333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="23.18333333333333">PA19</text>
+    <g transform="translate(23.83102602061156,22.38333333333333)">
+        <rect fill="#8ad039" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="25.316666666666663" y="23.18333333333333">ADC1</text>
+    <g transform="translate(20.83102602061156,22.38333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="22.016666666666662" y="23.18333333333333">D1</text>
+    <g transform="translate(17.83102602061156,22.38333333333333)">
+        <rect fill="#16a352" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="19.016666666666662" y="23.18333333333333">A0</text>
+    <g transform="translate(14.23102602061156,22.38333333333333)">
+        <rect fill="#f95" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="15.716666666666661" y="23.18333333333333">SDA0</text>
+    <g transform="translate(10.631026020611559,22.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="12.11666666666666" y="23.18333333333333">CS0</text>
+    <g transform="translate(7.031026020611558,22.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="8.516666666666659" y="23.18333333333333">CS1</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="25.083333333333332"/>
+    <g transform="translate(27.431026020611558,24.383333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="25.183333333333334">PA14</text>
+    <g transform="translate(24.43102602061156,24.383333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="25.616666666666664" y="25.183333333333334">D2</text>
+    <g transform="translate(20.83102602061156,24.383333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="22.316666666666663" y="25.183333333333334">PWM0</text>
+    <g transform="translate(17.231026020611562,24.383333333333333)">
+        <rect fill="#ffe680" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="18.716666666666665" y="25.183333333333334">SWCLK</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="27.083333333333332"/>
+    <g transform="translate(27.431026020611558,26.383333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="27.183333333333334">PA15</text>
+    <g transform="translate(24.43102602061156,26.383333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="25.616666666666664" y="27.183333333333334">D3</text>
+    <g transform="translate(20.83102602061156,26.383333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="22.316666666666663" y="27.183333333333334">PWM1</text>
+    <g transform="translate(17.231026020611562,26.383333333333333)">
+        <rect fill="#ffe680" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="18.716666666666665" y="27.183333333333334">SWDIO</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="29.083333333333332"/>
+    <g transform="translate(27.431026020611558,28.383333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="29.183333333333334">PA00</text>
+    <g transform="translate(24.43102602061156,28.383333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="25.616666666666664" y="29.183333333333334">D4</text>
+    <g transform="translate(20.83102602061156,28.383333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="22.316666666666663" y="29.183333333333334">PWM2</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="31.21666666666666" y="31.083333333333332"/>
+    <g transform="translate(27.431026020611558,30.383333333333333)">
+        <rect fill="#cd3c24" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="28.91666666666666" y="31.183333333333334">3V3</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="31.083333333333332"/>
+    <g transform="translate(54.231026020611566,30.383333333333333)">
+        <rect fill="#000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="31.183333333333334">GND</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="29.083333333333332"/>
+    <g transform="translate(54.231026020611566,28.383333333333333)">
+        <rect fill="#8ad039" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="29.183333333333334">ADC2</text>
+    <g transform="translate(57.83102602061157,28.383333333333333)">
+        <rect fill="#16a352" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="29.183333333333334">A1</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="27.083333333333332"/>
+    <g transform="translate(54.231026020611566,26.383333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="27.183333333333334">PA29</text>
+    <g transform="translate(57.83102602061157,26.383333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="27.183333333333334">D5</text>
+    <g transform="translate(60.83102602061157,26.383333333333333)">
+        <rect fill="#dcd4ee" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="62.31666666666667" y="27.183333333333334">RX2</text>
+    <g transform="translate(64.43102602061157,26.383333333333333)">
+        <rect fill="#f95" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="65.91666666666667" y="27.183333333333334">SCL0</text>
+    <g transform="translate(68.03102602061156,26.383333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="69.51666666666667" y="27.183333333333334">PWM4</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="25.083333333333332"/>
+    <g transform="translate(54.231026020611566,24.383333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="25.183333333333334">PA30</text>
+    <g transform="translate(57.83102602061157,24.383333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="25.183333333333334">D6</text>
+    <g transform="translate(60.83102602061157,24.383333333333333)">
+        <rect fill="#dcd4ee" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="62.31666666666667" y="25.183333333333334">TX2</text>
+    <g transform="translate(64.43102602061157,24.383333333333333)">
+        <rect fill="#f95" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="65.91666666666667" y="25.183333333333334">SDA0</text>
+    <g transform="translate(68.03102602061156,24.383333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="69.51666666666667" y="25.183333333333334">PWM4</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="23.08333333333333"/>
+    <g transform="translate(54.231026020611566,22.38333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="23.18333333333333">PA05</text>
+    <g transform="translate(57.83102602061157,22.38333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="23.18333333333333">D7</text>
+    <g transform="translate(60.83102602061157,22.38333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="62.31666666666667" y="23.18333333333333">PWM4</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="21.08333333333333"/>
+    <g transform="translate(54.231026020611566,20.38333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="21.18333333333333">PA12</text>
+    <g transform="translate(57.83102602061157,20.38333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="21.18333333333333">D8</text>
+    <g transform="translate(60.83102602061157,20.38333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="62.31666666666667" y="21.18333333333333">PWM3</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="19.08333333333333"/>
+    <g transform="translate(54.231026020611566,18.38333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="19.18333333333333">PA18</text>
+    <g transform="translate(57.83102602061157,18.38333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="19.18333333333333">D9</text>
+    <g transform="translate(60.83102602061157,18.38333333333333)">
+        <rect fill="#dcd4ee" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="62.31666666666667" y="19.18333333333333">RX0</text>
+    <g transform="translate(64.43102602061157,18.38333333333333)">
+        <rect fill="#f95" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="65.91666666666667" y="19.18333333333333">SCL1</text>
+    <g transform="translate(68.03102602061156,18.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="69.51666666666667" y="19.18333333333333">SCK0</text>
+    <g transform="translate(71.63102602061156,18.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="73.11666666666666" y="19.18333333333333">SCK1</text>
+    <rect fill="#4e4c4c" height="0.2" width="2.6" x="50.81666666666666" y="17.08333333333333"/>
+    <g transform="translate(54.231026020611566,16.38333333333333)">
+        <rect fill="#800000" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="55.71666666666667" y="17.18333333333333">PA23</text>
+    <g transform="translate(57.83102602061157,16.38333333333333)">
+        <rect fill="#99188d" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="2.8" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="white" font-family="Consolas" font-size="1.2" text-anchor="middle" x="59.016666666666666" y="17.18333333333333">D10</text>
+    <g transform="translate(60.83102602061157,16.38333333333333)">
+        <rect fill="#dcd4ee" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="62.31666666666667" y="17.18333333333333">TX0</text>
+    <g transform="translate(64.43102602061157,16.38333333333333)">
+        <rect fill="#f95" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="65.91666666666667" y="17.18333333333333">SDA1</text>
+    <g transform="translate(68.03102602061156,16.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="69.51666666666667" y="17.18333333333333">MOSI0</text>
+    <g transform="translate(71.63102602061156,16.38333333333333)">
+        <rect fill="#e9ba33" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="73.11666666666666" y="17.18333333333333">MOSI1</text>
+    <g transform="translate(75.23102602061157,16.38333333333333)">
+        <rect fill="#afa35e" height="1.6" rx="0.3" ry="0.3" transform="skewX(-15)" width="3.4" x="0" y="0"/>
+    </g>
+    <text dominant-baseline="central" fill="#423F42" font-family="Consolas" font-size="1.2" text-anchor="middle" x="76.71666666666667" y="17.18333333333333">PWM0</text>
+</svg>

boards/wr3/variant.cpp

@@ -19,8 +19,6 @@ PinDescription g_APinDescription[PINS_COUNT] = {
 	{PA_15, NOT_INITIAL, PIO_GPIO | PIO_GPIO_IRQ | PIO_PWM,	NOT_INITIAL},
 	// D4: PWM2, ext_32K
 	{PA_0,  NOT_INITIAL, PIO_GPIO | PIO_GPIO_IRQ | PIO_PWM,	NOT_INITIAL},
-	// D5: SD_CMD, I2S_SD_RX, ADC3
-	{PA_20, NOT_INITIAL, PIO_GPIO | PIO_GPIO_IRQ,			NOT_INITIAL},
 	// D6: UART2_log_RXD, I2C0_SCL, PWM4
 	{PA_29, NOT_INITIAL, PIO_GPIO | PIO_GPIO_IRQ | PIO_PWM,	NOT_INITIAL},
 	// D7: UART2_log_TXD, I2C0_SDA, PWM3, RTC_OUT
@@ -33,6 +31,8 @@ PinDescription g_APinDescription[PINS_COUNT] = {
 	{PA_18, NOT_INITIAL, PIO_GPIO | PIO_GPIO_IRQ,			NOT_INITIAL},
 	// D11: UART0_TXD, SPI1_MOSI, SPI0_MOSI, I2C1_SDA, SD_D1, PWM0, WAKEUP_3
 	{PA_23, NOT_INITIAL, PIO_GPIO | PIO_GPIO_IRQ | PIO_PWM,	NOT_INITIAL},
+	// A1: VBAT_MEAS, ADC2
+	{AD_2, 	NOT_INITIAL, PIO_ADC,							NOT_INITIAL},
 };
 // clang-format on
 

boards/wr3/variant.h

@@ -8,10 +8,10 @@
 // ----
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT		   (12u)
-#define NUM_DIGITAL_PINS   (12u)
-#define NUM_ANALOG_INPUTS  (2u)
-#define NUM_ANALOG_OUTPUTS (0u)
+#define PINS_COUNT		   12
+#define NUM_DIGITAL_PINS   11
+#define NUM_ANALOG_INPUTS  2
+#define NUM_ANALOG_OUTPUTS 0
 
 // Low-level pin register query macros
 // -----------------------------------
@@ -21,14 +21,14 @@
 
 // LEDs
 // ----
-#define PIN_LED		(4u)
-#define LED_BUILTIN PIN_LED
+#define PIN_LED		4u		// PA_0
+#define LED_BUILTIN PIN_LED // PA_0
 
 // Analog pins
 // -----------
-#define PIN_A0 (1u) // PA_19
-#define PIN_A1 (0u) // dummy, this is NOT usable
-#define PIN_A2 (5u) // PA_20
+#define PIN_A0 1u  // PA_19
+#define PIN_A1 11u // VBAT_MEAS
+#define PIN_A2 0u  // dummy, this is NOT usable
 
 static const uint8_t A0 = PIN_A0;
 static const uint8_t A1 = PIN_A1;
@@ -40,22 +40,27 @@ static const uint8_t A2 = PIN_A2;
 
 // Wire Interfaces
 // ---------------
-#define WIRE_INTERFACES_COUNT 0
+#define WIRE_INTERFACES_COUNT 2
+#define PIN_WIRE0_SDA		  1u  // PA_19
+#define PIN_WIRE0_SCL		  0u  // PA_22
+#define PIN_WIRE1_SDA		  10u // PA_23
+#define PIN_WIRE1_SCL		  9u  // PA_18
 
 // Serial ports
 // ------------
-#ifdef __cplusplus
-#include "LOGUARTClass.h"
-extern LOGUARTClass Serial;
 // LOGUARTClass
-#define PIN_SERIAL2_RX PA_29
-#define PIN_SERIAL2_TX PA_30
+#define PIN_SERIAL2_RX 5u // PA_29
+#define PIN_SERIAL2_TX 6u // PA_30
 // UARTClassOne
-#define PIN_SERIAL0_RX PA_18
-#define PIN_SERIAL0_TX PA_23
-#endif // __cplusplus
+#define PIN_SERIAL0_RX 9u  // PA_18
+#define PIN_SERIAL0_TX 10u // PA_23
 
 #define SERIAL_PORT_USBVIRTUAL	  Serial
 #define SERIAL_PORT_MONITOR		  Serial
 #define SERIAL_PORT_HARDWARE	  Serial
 #define SERIAL_PORT_HARDWARE_OPEN Serial
+
+#ifdef __cplusplus
+#include "LOGUARTClass.h"
+extern LOGUARTClass Serial;
+#endif // __cplusplus

builder/arduino-common.py

@@ -8,9 +8,9 @@ env = DefaultEnvironment()
 platform = env.PioPlatform()
 
 API_DIR = platform.get_package_dir("framework-arduino-api")
-LT_API_DIR = join(platform.get_dir(), "arduino", "libretuya")
+LT_ARDUINO_DIR = join(platform.get_dir(), "arduino", "libretuya")
 assert isdir(API_DIR)
-assert isdir(LT_API_DIR)
+assert isdir(LT_ARDUINO_DIR)
 
 # Sources - ArduinoCore-API
 env.AddLibrary(
@@ -33,16 +33,20 @@ env.AddLibrary(
 # Sources - LibreTuya API
 env.AddLibrary(
     name="libretuya_api",
-    base_dir=LT_API_DIR,
+    base_dir=LT_ARDUINO_DIR,
     srcs=[
         "+<api/*.c*>",
         "+<common/*.c*>",
+        "+<core/*.c*>",
         "+<libraries/**/*.c*>",
+        "+<posix/*.c>",
     ],
     includes=[
         "!<.>",
         "!<compat>",
+        "!<core>",
         "!<libraries/*>",
+        "!<posix>",
     ],
 )
 

builder/frameworks/arduino.py

@@ -0,0 +1,14 @@
+# Copyright (c) Kuba Szczodrzyński 2022-05-16.
+
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+board = env.BoardConfig()
+platform = env.PioPlatform()
+
+# support passing "arduino" as framework
+frameworks = board.get("frameworks")
+framework = next(fw for fw in frameworks if "arduino" in fw)
+builder = platform.frameworks[framework]["script"]
+builder = builder.rpartition("/")[2]
+env.SConscript(builder, exports="env")

builder/frameworks/realtek-ambz-arduino.py

@@ -6,7 +6,13 @@ from SCons.Script import DefaultEnvironment
 
 env = DefaultEnvironment()
 
+# SDK options
 env.Replace(AMBZ_NO_POLARSSL=True)
+env.Replace(
+    LIB_AMBZ_SDK_SKIP=[
+        "component/common/api/wifi/wifi_ind.c",
+    ]
+)
 
 env.SConscript("realtek-ambz-sdk.py", exports="env")
 env.SConscript("../arduino-common.py", exports="env")
@@ -45,10 +51,10 @@ env.Append(
         # so it's either -fpermissive or this:
         ("bool", "bool"),
         # enable LwIPRxBuffer
-        "LT_HAS_LWIP",
+        ("LT_HAS_LWIP", "1"),
+        # enable LwIPmDNS
+        ("LT_HAS_LWIP2", "1"),
         ("LT_PRINTF_BROKEN", "1"),  # printf does not handle %.3f properly
-        "MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED",  # enable PSK in mbedTLS
-        # "MBEDTLS_DEBUG_C",
     ],
     LINKFLAGS=[
         "--specs=nosys.specs",
@@ -94,32 +100,6 @@ env.AddLibrary(
     ],
 )
 
-# Sources - mbedTLS
-env.AddLibrary(
-    name="ambz_mbedtls",
-    base_dir="$SDK_DIR",
-    srcs=[
-        # mbedTLS from SDK
-        "+<component/common/network/ssl/mbedtls-2.4.0/library/*.c>",
-        # skip ssl_tls.c for a fixup
-        "-<component/common/network/ssl/mbedtls-2.4.0/library/ssl_tls.c>",
-    ],
-    includes=[
-        "+<component/common/network/ssl/mbedtls-2.4.0/include>",
-        # remove polarssl
-        "-<component/common/network/ssl/polarssl-1.3.8/include>",
-    ],
-)
-
-# Sources - platform fixups
-env.AddLibrary(
-    name="ambz_arduino_fixups",
-    base_dir="$FIXUPS_DIR",
-    srcs=[
-        "+<ssl_tls.c>",  # rtl sdk defines S1 and S2 which conflicts here
-    ],
-)
-
 # Sources - Arduino libraries
 env.AddLibrary(
     name="ambz_arduino_libs",

builder/frameworks/realtek-ambz-sdk.py

@@ -58,13 +58,19 @@ env.Append(
         "M3",
         "CONFIG_PLATFORM_8711B",
         ("F_CPU", "166000000L"),
+        # LwIP options
         ("LWIP_TIMEVAL_PRIVATE", "0"),
         ("LWIP_NETIF_HOSTNAME", "1"),  # to support hostname changing
-        ("LWIP_PROVIDE_ERRNO", "1"),  # for extern int errno and codes
         ("LWIP_SO_RCVBUF", "1"),  # for ioctl(FIONREAD)
+        ("ip_addr", "ip4_addr"),  # LwIP 2.0.x compatibility
+        ("ip_addr_t", "ip4_addr_t"),  # LwIP 2.0.x compatibility
+        ("IN_ADDR_T_DEFINED", "1"),
+        ("in_addr_t", "u32_t"),
         ("INT_MAX", "2147483647"),  # for RECV_BUFSIZE_DEFAULT
         ("ERRNO", "1"),  # for LwIP
         ("vprintf", "rtl_vprintf"),
+        "MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED",  # enable PSK in mbedTLS
+        # "MBEDTLS_DEBUG_C",
     ],
     LINKFLAGS=[
         "-mcpu=cortex-m4",
@@ -115,42 +121,7 @@ env.AddLibrary(
         "+<component/common/api/wifi/wifi_simple_config.c>",
         "+<component/common/api/wifi/wifi_util.c>",
         "+<component/common/api/lwip_netconf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/api_lib.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/api_msg.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/err.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/netbuf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/netdb.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/netifapi.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/sockets.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/tcpip.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/autoip.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/icmp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/igmp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/inet.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/inet_chksum.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip_addr.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip_frag.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/def.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/dhcp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/dns.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/init.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/lwip_timers.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/mem.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/memp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/netif.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/pbuf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/raw.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/stats.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/sys.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/tcp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/tcp_in.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/tcp_out.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/udp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/netif/etharp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos/ethernetif.c>",
         "+<component/common/drivers/wlan/realtek/src/osdep/lwip_intf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos/sys_arch.c>",
         "+<component/common/network/dhcp/dhcps.c>",
         "+<component/common/network/sntp/sntp.c>",
         "+<component/common/network/ssl/ssl_ram_map/ssl_ram_map.c>",
@@ -218,12 +189,7 @@ env.AddLibrary(
         "+<component/common/drivers/wlan/realtek/wlan_ram_map/rom>",
         "+<component/common/file_system>",
         "+<component/common/network>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/include>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/include/lwip>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/include/ipv4>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek>",
-        "+<component/common/network/ssl/polarssl-1.3.8/include>",
+        "+<component/common/network/ssl/mbedtls-2.4.0/include>",
         "+<component/common/network/ssl/ssl_ram_map/rom>",
         "+<component/common/utilities>",
         "+<component/soc/realtek/8711b/app/monitor/include>",
@@ -243,57 +209,24 @@ env.AddLibrary(
     ],
 )
 
-# Sources - PolarSSL library
-if "AMBZ_NO_POLARSSL" not in env or not env["AMBZ_NO_POLARSSL"]:
-    env.AddLibrary(
-        name="ambz_polarssl",
-        base_dir="$SDK_DIR",
-        srcs=[
-            "+<component/common/network/ssl/polarssl-1.3.8/library/aesni.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/blowfish.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/camellia.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ccm.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/certs.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/cipher.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/cipher_wrap.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/debug.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ecp_ram.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/entropy.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/entropy_poll.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/error.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/gcm.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/havege.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/md2.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/md4.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/memory_buffer_alloc.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/net.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/padlock.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/pbkdf2.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/pkcs11.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/pkcs12.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/pkcs5.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/pkparse.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/platform.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ripemd160.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ssl_cache.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ssl_ciphersuites.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ssl_cli.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ssl_srv.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/ssl_tls.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/threading.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/timing.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/version.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/version_features.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509_create.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509_crl.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509_crt.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509_csr.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509write_crt.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/x509write_csr.c>",
-            "+<component/common/network/ssl/polarssl-1.3.8/library/xtea.c>",
-        ],
-    )
+# Sources - lwIP 2.0.0
+env.AddLibraryLwIP(version="2.0.0", port="amb1")
+
+# Sources - mbedTLS
+env.AddLibrary(
+    name="ambz_mbedtls",
+    base_dir="$SDK_DIR",
+    srcs=[
+        # mbedTLS from SDK
+        "+<component/common/network/ssl/mbedtls-2.4.0/library/*.c>",
+        # replace these with fixups
+        "-<component/common/network/ssl/mbedtls-2.4.0/library/net_sockets.c>",
+        "-<component/common/network/ssl/mbedtls-2.4.0/library/ssl_tls.c>",
+    ],
+    includes=[
+        "+<component/common/network/ssl/mbedtls-2.4.0/include>",
+    ],
+)
 
 # Sources - platform fixups
 env.AddLibrary(
@@ -303,6 +236,8 @@ env.AddLibrary(
         "+<app_start_patch.c>",
         "+<cmsis_ipsr.c>",
         "+<log_uart.c>",
+        "+<net_sockets.c>",  # fix non-blocking sockets (Realtek disabled this for unknown reason)
+        "+<ssl_tls.c>",  # rtl sdk defines S1 and S2 which conflicts here
         "+<wifi_mode.c>",
     ],
 )

builder/libs/lwip.py

@@ -0,0 +1,49 @@
+# Copyright (c) Kuba Szczodrzyński 2022-05-18.
+
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+platform = env.PioPlatform()
+
+
+def env_add_lwip(
+    env,
+    version: str,
+    port: str,
+):
+    # version = env["LIB_LWIP_VERSION"] if "LIB_LWIP_VERSION" in env else version_default
+    package_dir = platform.get_package_dir(f"library-lwip@{version}-{port}")
+    port_srcs = []
+    port_includes = []
+
+    if port in ["amb1"]:
+        port_srcs = [
+            "+<port/realtek/freertos/ethernetif.c>",
+            "+<port/realtek/freertos/sys_arch.c>",
+        ]
+        port_includes = [
+            "+<port/realtek>",
+            "+<port/realtek/freertos>",
+        ]
+
+    env.AddLibrary(
+        name=f"lwip{version}_{port}",
+        base_dir=package_dir,
+        srcs=[
+            "+<src/api/*.c>",
+            "+<src/core/*.c>",
+            "+<src/core/ipv4/*.c>",
+            "+<src/netif/ethernet.c>",  # 2.0.x
+            "+<src/netif/etharp.c>",  # 1.4.x
+            "+<src/apps/mdns/mdns.c>",
+            *port_srcs,
+        ],
+        includes=[
+            "+<src/include>",
+            "+<src/include/ipv4>",
+            *port_includes,
+        ],
+    )
+
+
+env.AddMethod(env_add_lwip, "AddLibraryLwIP")

builder/main.py

@@ -7,6 +7,8 @@ board = env.BoardConfig()
 
 # Utilities
 env.SConscript("utils.py", exports="env")
+# Vendor-specific library ports
+env.SConscript("libs/lwip.py", exports="env")
 
 # Firmware name
 if env.get("PROGNAME", "program") == "program":

builder/utils.py

@@ -41,6 +41,7 @@ def env_add_defaults(env, platform_name: str, sdk_name: str):
         CPPPATH=[
             "$BOARD_DIR",
             "$FIXUPS_DIR",
+            "$FIXUPS_DIR/inc",
         ],
         LIBPATH=[
             "$LD_DIR",
@@ -72,6 +73,13 @@ def env_add_library(
             expr = join(base_dir, src[2:-1])
 
         sources.append(src[0] + "<" + expr + ">")
+
+    # allow removing sources from parent builders
+    key = f"LIB_{name.upper()}_SKIP"
+    if key in env:
+        for expr in env[key]:
+            sources.append("-<" + expr + ">")
+
     # queue library for further env clone and build
     env.Prepend(LIBQUEUE=[[join("$BUILD_DIR", name), base_dir, sources]])
 

docs/README.md

@@ -0,0 +1,7 @@
+# Documentation
+
+This documentation is best suited for rendering with MkDocs. Some elements may not display correctly in the GitHub markdown reader.
+
+Please visit [https://kuba2k2.github.io/libretuya/](https://kuba2k2.github.io/libretuya) for the full experience.
+
+If you still want to read the docs on GitHub, visit [SUMMARY.md](../SUMMARY.md).

docs/config.md

@@ -40,3 +40,4 @@ Platforms should generally call i.e. WiFiClient debugging for client-related cod
 ## Platform options
 
 - LT_HAS_LWIP - whether platform SDK has LwIP. This causes `LwIPRxBuffer.cpp` to be compiled for platform libraries to use.
+- LT_HAS_LWIP2 - whether platform has LwIP v2.0.0 or newer. This causes `LwIPmDNS.cpp` to be compiled.

docs/libs-built-in.md

@@ -3,20 +3,35 @@
 
 ## base64
 - [Source](https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/base64.cpp): ESP32 Arduino Core
-- [API](../arduino/libretuya/libraries/base64/base64.h)
+- [Reference](../ltapi/classbase64.md)
 
 Helper base64 encoder used in some libs taken from ESP32.
 
 ## HTTPClient
 - [Source](https://github.com/espressif/arduino-esp32/tree/master/libraries/HTTPClient): ESP32 Arduino Core
-- [API](../arduino/libretuya/libraries/HTTPClient/HTTPClient.h)
+- [Reference](../ltapi/class_h_t_t_p_client.md)
 - [Examples](https://github.com/espressif/arduino-esp32/tree/master/libraries/HTTPClient/examples)
 
-HTTP(S) client. Some reference may be found here: [https://links2004.github.io/Arduino/dd/d8d/class_h_t_t_p_client.html](https://links2004.github.io/Arduino/dd/d8d/class_h_t_t_p_client.html).
+HTTP(S) client.
+
+## NetUtils
+
+Utilities and common classes related to network.
+
+- [ssl/MbedTLSClient.cpp](../ltapi/class_mbed_t_l_s_client.md) ([source](https://github.com/espressif/arduino-esp32/tree/master/libraries/WiFiClientSecure/src): ESP32 WiFiClientSecure)
+- [IPv6Address.cpp](../ltapi/classarduino_1_1_i_pv6_address.md) ([source](https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/IPv6Address.cpp): ESP32 IPv6Address)
+- [LwIPRxBuffer.cpp](../ltapi/class_lw_i_p_rx_buffer.md) ([source](https://github.com/espressif/arduino-esp32/blob/master/libraries/WiFi/src/WiFiClient.cpp): ESP32 WiFiClient)
+
+## WebServer
+- [Source](https://github.com/espressif/arduino-esp32/tree/master/libraries/WebServer/src): ESP32 Arduino Core
+- [Reference](../ltapi/class_web_server.md)
+- Examples:
+    - [HelloServer](https://github.com/espressif/arduino-esp32/blob/master/libraries/WebServer/examples/HelloServer/HelloServer.ino)
+    - [MultiHomedServers](https://github.com/espressif/arduino-esp32/blob/master/libraries/WebServer/examples/MultiHomedServers/MultiHomedServers.ino)
 
 ## WiFiMulti
 - [Source](https://github.com/espressif/arduino-esp32/tree/master/libraries/WiFi/src): ESP32 Arduino Core
-- [API](../arduino/libretuya/libraries/WiFiMulti/WiFiMulti.h)
+- [Reference](../ltapi/class_wi_fi_multi.md)
 - [Docs](https://docs.espressif.com/projects/arduino-esp32/en/latest/api/wifi.html#wifimulti)
 - Examples:
     - [WiFiMulti](https://github.com/espressif/arduino-esp32/blob/master/libraries/WiFi/examples/WiFiMulti/WiFiMulti.ino)

docs/reference/lt-api.md

@@ -0,0 +1,41 @@
+# LibreTuya API
+
+## Class functions
+
+{%
+   include-markdown "../../ltapi/class_libre_tuya.md"
+   start="(class_libre_tuya.md)\n"
+   end="[More...]"
+%}
+
+{%
+   include-markdown "../../ltapi/class_libre_tuya.md"
+   start="# Detailed Description\n"
+   end="## Public Functions Documentation\n"
+%}
+
+{%
+   include-markdown "../../ltapi/class_libre_tuya.md"
+   start="## Public Functions\n"
+   end="# Detailed Description\n"
+%}
+
+## Static
+
+### Public Attributes
+
+{%
+   include-markdown "../../ltapi/_libre_tuya_a_p_i_8h.md"
+   start="## Public Attributes\n"
+   end="## Public Attributes Documentation\n"
+   heading-offset=1
+%}
+
+## Logger
+
+{%
+   include-markdown "../../ltapi/lt__logger_8h.md"
+   start="## Public Functions\n"
+   end="## Public Functions Documentation\n"
+   heading-offset=1
+%}

docs/requirements.txt

@@ -1 +1,5 @@
 mkdocs-same-dir
+mkdocs-literate-nav
+mkdocs-section-index
+mkdocs-include-markdown-plugin
+-e git+https://github.com/kuba2k2/mkdoxy#egg=mkdoxy

mkdocs.yml

@@ -1,26 +1,32 @@
 site_name: LibreTuya
 docs_dir: .
+
 site_url: https://kuba2k2.github.io/libretuya/
 repo_url: https://github.com/kuba2k2/libretuya
+
 theme:
   name: material
+
 plugins:
   - same-dir
+  - mkdoxy:
+      projects:
+        # project names must be alphanumeric, else snippets won't work
+        ltapi:
+          src-dirs: arduino/libretuya/
+          doxy-cfg:
+            PREDEFINED: __cplusplus
+            CASE_SENSE_NAMES: NO
+        ltambz:
+          src-dirs: arduino/realtek-ambz/
+          doxy-cfg:
+            PREDEFINED: __cplusplus
+            CASE_SENSE_NAMES: NO
+      save-api: .
+  - literate-nav:
+      nav_file: SUMMARY.md
+  - section-index
+  - include-markdown
+
 markdown_extensions:
   - md_in_html
-
-nav:
-  - "Home": "README.md"
-  - "Configuration": "docs/config.md"
-  - "Libraries":
-      - "Built-in": "docs/libs-built-in.md"
-      - "Third party": "docs/libs-3rd-party.md"
-  - "Platforms":
-      - "Realtek AmebaZ Series":
-          - "Boards":
-              - "WR3": "boards/wr3/README.md"
-          - "C library":
-              - "Built-in functions": "docs/platform/realtek-ambz/stdlib.md"
-              - "Memory management": "docs/platform/realtek-ambz/memory-management.md"
-          - "Debugging": "docs/platform/realtek/debugging.md"
-          - "Exception decoder": "docs/platform/realtek/exception-decoder.md"

platform.json

@@ -6,8 +6,12 @@
     "type": "git",
     "url": "https://github.com/kuba2k2/platformio-libretuya"
   },
-  "version": "0.3.0",
+  "version": "0.4.0",
   "frameworks": {
+    "arduino": {
+      "title": "Generic Arduino framework",
+      "script": "builder/frameworks/arduino.py"
+    },
     "realtek-ambz-sdk": {
       "tilte": "Realtek AmebaZ - SDK",
       "package": "framework-realtek-amb1",
@@ -26,6 +30,11 @@
       "version": "https://github.com/ambiot/amb1_sdk",
       "manifest": {
         "description": "SDK for Ameba1"
+      },
+      "libraries": {
+        "lwip": [
+          "v2.0.0-amb1"
+        ]
       }
     },
     "framework-arduino-api": {
@@ -36,6 +45,14 @@
         "description": "Hardware independent layer of the Arduino cores"
       }
     },
+    "library-lwip": {
+      "type": "framework",
+      "optional": true,
+      "base_url": "https://github.com/libretuya/lwip",
+      "manifest": {
+        "description": "lwIP - A Lightweight TCPIP stack"
+      }
+    },
     "toolchain-gccarmnoneeabi": {
       "type": "toolchain",
       "optionalVersions": [

platform.py

@@ -1,7 +1,10 @@
 # Copyright (c) Kuba Szczodrzyński 2022-04-20.
 
-from os.path import dirname
+import json
+from os.path import dirname, join
+from typing import Dict
 
+from platformio import util
 from platformio.debug.config.base import DebugConfigBase
 from platformio.debug.exception import DebugInvalidOptionsError
 from platformio.managers.platform import PlatformBase
@@ -35,6 +38,9 @@ def load_manifest(self, src):
     manifest: dict = libretuya_packages[spec.name]
     # find additional manifest info
     manifest = manifest.get("manifest", manifest_default)
+    # extract tag version
+    if "#" in spec.url:
+        manifest["version"] = spec.url.rpartition("#")[2].lstrip("v")
     # put info from spec
     manifest.update(
         {
@@ -49,6 +55,8 @@ def load_manifest(self, src):
     cache_key = "load_manifest-%s" % path
     self.memcache_set(cache_key, manifest)
     # result = ManifestParserFactory.new(json.dumps(manifest), ManifestFileType.PACKAGE_JSON).as_dict()
+    with open(join(path, self.manifest_names[0]), "w") as f:
+        json.dump(manifest, f)
     return manifest
 
 
@@ -67,6 +75,8 @@ def find_pkg_root(self, path: str, spec: PackageSpec):
 
 
 class LibretuyaPlatform(PlatformBase):
+    boards_base: Dict[str, dict] = {}
+
     def configure_default_packages(self, options, targets):
         framework = options.get("pioframework")[0]
         # patch find_pkg root to ignore missing manifests and save PackageSpec
@@ -78,10 +88,39 @@ class LibretuyaPlatform(PlatformBase):
             BasePackageManager._load_manifest = BasePackageManager.load_manifest
             BasePackageManager.load_manifest = load_manifest
 
+        # allow using "arduino" as framework
+        if framework == "arduino":
+            board = self.get_boards(options.get("board"))
+            frameworks = board.get("frameworks")
+            framework = next(fw for fw in frameworks if framework in fw)
+            options.get("pioframework")[0] = framework
+
         # set specific compiler versions
         if framework.startswith("realtek-ambz"):
             self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.50401.0"
 
+        # use appropriate vendor library versions
+        sdk_package_name = self.frameworks[framework]["package"]
+        sdk_package = self.packages[sdk_package_name]
+        sdk_libraries = sdk_package["libraries"] if "libraries" in sdk_package else {}
+        packages_new = {}
+        for name, package in self.packages.items():
+            if not name.startswith("library-"):
+                continue
+            name = name[8:]  # strip "library-"
+            if name not in sdk_libraries:
+                continue
+            lib_version = sdk_libraries[name][-1]  # get latest version tag
+            package = dict(**package)  # clone the base package
+            package["version"] = (
+                package["base_url"] + "#" + lib_version
+            )  # use the specific version
+            package["optional"] = False  # make it required
+            lib_version = lib_version.lstrip("v")  # strip "v" in target name
+            name = f"library-{name}@{lib_version}"
+            packages_new[name] = package  # put the package under a new name
+        self.packages.update(packages_new)
+
         # make ArduinoCore-API required
         if "arduino" in framework:
             self.packages["framework-arduino-api"]["optional"] = False
@@ -97,13 +136,40 @@ class LibretuyaPlatform(PlatformBase):
         if not result:
             return result
         if id_:
-            return self._add_default_debug_tools(result)
+            return self.update_board(result)
         else:
             for key, value in result.items():
-                result[key] = self._add_default_debug_tools(value)
+                result[key] = self.update_board(value)
         return result
 
-    def _add_default_debug_tools(self, board: PlatformBoardConfig):
+    def update_board(self, board: PlatformBoardConfig):
+
+        if "_base" in board:
+            base = board.get("_base")
+            if not isinstance(base, list):
+                base = [base]
+
+            result = None
+            for base_name in base:
+                if base_name not in self.boards_base:
+                    file = join(
+                        dirname(__file__), "boards", "_base", f"{base_name}.json"
+                    )
+                    with open(file, encoding="utf-8") as f:
+                        self.boards_base[base_name] = json.load(f)
+
+                if not result:
+                    result = self.boards_base[base_name]
+                else:
+                    util.merge_dicts(result, self.boards_base[base_name])
+            util.merge_dicts(result, board._manifest)
+            board._manifest = result
+
+        # add "arduino" framework
+        has_arduino = any("arduino" in fw for fw in board.manifest["frameworks"])
+        if has_arduino:
+            board.manifest["frameworks"].append("arduino")
+
         # inspired by platform-ststm32/platform.py
         debug = board.manifest.get("debug", {})
         if not debug:

platform/realtek-ambz/fixups/inc/FreeRTOSConfig.h

@@ -0,0 +1,207 @@
+/*
+    FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
+
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *
+     *    Complete, revised, and edited pdf reference manuals are also       *
+     *    available.                                                         *
+     *                                                                       *
+     *    Purchasing FreeRTOS documentation will not only help you, by       *
+     *    ensuring you get running as quickly as possible and with an        *
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
+     *    the FreeRTOS project to continue with its mission of providing     *
+     *    professional grade, cross platform, de facto standard solutions    *
+     *    for microcontrollers - completely free of charge!                  *
+     *                                                                       *
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
+     *                                                                       *
+     *    Thank you for using FreeRTOS, and thank you for your support!      *
+     *                                                                       *
+    ***************************************************************************
+
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    >>>NOTE<<< The modification to the GPL is included to allow you to
+    distribute a combined work that includes FreeRTOS without being obliged to
+    provide the source code for proprietary components outside of the FreeRTOS
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details. You should have received a copy of the GNU General Public
+    License and the FreeRTOS license exception along with FreeRTOS; if not it
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained
+    by writing to Richard Barry, contact details for whom are available on the
+    FreeRTOS WEB site.
+
+    1 tab == 4 spaces!
+    
+    ***************************************************************************
+     *                                                                       *
+     *    Having a problem?  Start by reading the FAQ "My application does   *
+     *    not run, what could be wrong?"                                     *
+     *                                                                       *
+     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *                                                                       *
+    ***************************************************************************
+
+    
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
+    and contact details.  
+    
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool.
+
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
+    the code with commercial support, indemnification, and middleware, under 
+    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
+    provide a safety engineered and independently SIL3 certified version under 
+    the SafeRTOS brand: http://www.SafeRTOS.com.
+*/
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+#if defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__) 
+#include <stdint.h> 
+extern uint32_t SystemCoreClock; 
+#endif 
+#include "platform_autoconf.h"
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
+ *
+ * See http://www.freertos.org/a00110.html.
+ *----------------------------------------------------------*/
+
+#define configUSE_PREEMPTION			1
+#define configUSE_IDLE_HOOK				1
+#define configUSE_TICK_HOOK				0
+#define configCPU_CLOCK_HZ				( SystemCoreClock )
+#define configTICK_RATE_HZ				( ( uint32_t ) 1000 )
+#define configSYSTICK_CLOCK_HZ			32768
+#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 512 )
+#ifdef CONFIG_WIFI_EN
+#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 160 * 1024 ) )
+#else
+#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 20 * 1024 ) )
+#endif
+#define configMAX_TASK_NAME_LEN			( 10 )
+#define configUSE_TRACE_FACILITY		0
+#define configUSE_16_BIT_TICKS			0
+#define configIDLE_SHOULD_YIELD			0
+#define configUSE_CO_ROUTINES 			1
+#define configUSE_MUTEXES				1
+#define configUSE_TIMERS                1
+
+#define configMAX_PRIORITIES			( 11 )
+#define PRIORITIE_OFFSET				( 4 )
+
+#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+
+#define configUSE_COUNTING_SEMAPHORES 	1
+#define configUSE_ALTERNATIVE_API 		0
+#define configCHECK_FOR_STACK_OVERFLOW	2
+#define configUSE_RECURSIVE_MUTEXES		1
+#define configQUEUE_REGISTRY_SIZE		0
+#define configGENERATE_RUN_TIME_STATS	0
+#if configGENERATE_RUN_TIME_STATS
+#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() //( ulHighFrequencyTimerTicks = 0UL )
+#define portGET_RUN_TIME_COUNTER_VALUE() xTickCount //ulHighFrequencyTimerTicks
+#undef	configUSE_TRACE_FACILITY
+#define configUSE_TRACE_FACILITY			1
+#define portCONFIGURE_STATS_PEROID_VALUE	1000 //unit Ticks
+#endif
+
+#define configTIMER_TASK_PRIORITY       ( 1 )
+#define configTIMER_QUEUE_LENGTH        ( 10 )
+#define configTIMER_TASK_STACK_DEPTH    ( 512 )     //USE_MIN_STACK_SIZE modify from 512 to 256
+
+#if (__IASMARM__ != 1)
+
+extern void freertos_pre_sleep_processing(unsigned int *expected_idle_time);
+extern void freertos_post_sleep_processing(unsigned int *expected_idle_time);
+extern int  freertos_ready_to_sleep();
+
+/* Enable tickless power saving. */
+#define configUSE_TICKLESS_IDLE                 1
+
+/* In wlan usage, this value is suggested to use value less than 80 milliseconds */
+#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP   2
+
+/* It's magic trick that let us can use our own sleep function */
+#define configPRE_SLEEP_PROCESSING( x )         ( freertos_pre_sleep_processing(&x) )
+
+#define configPOST_SLEEP_PROCESSING( x )        ( freertos_post_sleep_processing(&x) )
+
+/* It's magic trick that let us can enable/disable tickless dynamically */
+#define traceLOW_POWER_IDLE_BEGIN();            do { \
+                                                        if (!freertos_ready_to_sleep()) { \
+                                                            mtCOVERAGE_TEST_MARKER(); \
+                                                            break; \
+                                                        }
+
+                                                        // portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime );
+
+#define traceLOW_POWER_IDLE_END();              } while (0);
+
+/* It's FreeRTOS related feature but it's not included in FreeRTOS design. */
+#define configUSE_WAKELOCK_PMU                  1
+
+#endif // #if (__IASMARM__ != 1)
+
+/* Set the following definitions to 1 to include the API function, or zero
+to exclude the API function. */
+#define INCLUDE_vTaskPrioritySet		1
+#define INCLUDE_uxTaskPriorityGet		1
+#define INCLUDE_vTaskDelete				1
+#define INCLUDE_vTaskCleanUpResources	0
+#define INCLUDE_vTaskSuspend			1
+#define INCLUDE_vTaskDelayUntil			1
+#define INCLUDE_vTaskDelay				1
+#define INCLUDE_pcTaskGetTaskName       1
+#define INCLUDE_xTimerPendFunctionCall 	1
+
+/* Cortex-M specific definitions. */
+#ifdef __NVIC_PRIO_BITS
+	/* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
+	#define configPRIO_BITS       		__NVIC_PRIO_BITS
+#else
+	#define configPRIO_BITS       		4        /* 15 priority levels */
+#endif
+
+
+/* The lowest interrupt priority that can be used in a call to a "set priority"
+function. */
+#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY			0x0f
+
+/* The highest interrupt priority that can be used by any interrupt service
+routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT CALL
+INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
+PRIORITY THAN THIS! (higher priorities are lower numeric values. */
+#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY	5
+
+
+/* Interrupt priorities used by the kernel port layer itself.  These are generic
+to all Cortex-M ports, and do not rely on any particular library functions. */
+#define configKERNEL_INTERRUPT_PRIORITY 		( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
+See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY 	( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+
+//#define RTK_MODE_TIMER
+
+
+#endif /* FREERTOS_CONFIG_H */

platform/realtek-ambz/fixups/inc/autoconf.h

@@ -0,0 +1,508 @@
+#ifndef WLANCONFIG_H
+#define WLANCONFIG_H
+
+/*
+ * Include user defined options first. Anything not defined in these files
+ * will be set to standard values. Override anything you dont like!
+ */
+ #if defined(CONFIG_PLATFORM_8195A) || defined(CONFIG_PLATFORM_8711B) || defined(CONFIG_HARDWARE_8188F)
+#include "platform_opts.h"
+#endif
+
+#if defined(CONFIG_PLATFORM_8195A) || defined(CONFIG_PLATFORM_8711B)
+#define CONFIG_PLATFORM_AMEBA_X
+#endif
+
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+#define PLATFORM_FREERTOS 	1
+#define CONFIG_GSPI_HCI
+#else
+#define CONFIG_LX_HCI
+#endif
+
+#ifndef CONFIG_INIC_EN
+#define CONFIG_INIC_EN 0 //For iNIC project
+#endif
+
+#if CONFIG_INIC_EN
+#define CONFIG_LWIP_LAYER    0
+#endif
+
+#define CONFIG_LITTLE_ENDIAN
+#define CONFIG_80211N_HT 
+//#define CONFIG_RECV_REORDERING_CTRL
+#define RTW_NOTCH_FILTER 0
+#define CONFIG_EMBEDDED_FWIMG
+#define CONFIG_PHY_SETTING_WITH_ODM
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+#define CONFIG_ODM_REFRESH_RAMASK
+#define HAL_MAC_ENABLE 1
+#define HAL_BB_ENABLE 1
+#define HAL_RF_ENABLE 1
+#endif
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+/* Patch when dynamic mechanism is not ready */
+//#define CONFIG_DM_PATCH
+#endif
+
+//#define CONFIG_DEBUG
+//#define CONFIG_DEBUG_RTL871X
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+	#define CONFIG_MEM_MONITOR	MEM_MONITOR_SIMPLE
+	#define WLAN_INTF_DBG		0 
+	//#define CONFIG_DEBUG_DYNAMIC
+	//#define DBG_TX 1
+	//#define DBG_XMIT_BUF 1
+	//#define DBG_XMIT_BUF_EXT 1
+	#define DBG_TX_DROP_FRAME
+#else
+	#define CONFIG_MEM_MONITOR	MEM_MONITOR_LEAK
+	//#define CONFIG_TRACE_SKB
+	//#define WLAN_INTF_DBG
+#endif // CONFIG_PLATFORM_AMEBA_X
+
+//#define CONFIG_DONT_CARE_TP
+//#define CONFIG_HIGH_TP
+//#define CONFIG_MEMORY_ACCESS_ALIGNED
+#define CONFIG_POWER_SAVING
+#ifdef CONFIG_POWER_SAVING
+	#define CONFIG_IPS
+	#define CONFIG_LPS
+	//#define CONFIG_LPS_LCLK
+	#define CONFIG_LPS_32K
+	#define TDMA_POWER_SAVING
+	#define CONFIG_WAIT_PS_ACK
+#endif
+
+#define BAD_MIC_COUNTERMEASURE 1
+#define DEFRAGMENTATION 1
+
+#define WIFI_LOGO_CERTIFICATION 0
+#if WIFI_LOGO_CERTIFICATION
+    #define RX_AGGREGATION 1
+	#define RX_AMSDU 1
+#else
+    #define RX_AGGREGATION 0
+	#define RX_AMSDU 0
+#endif
+
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+	#if !defined(CONFIG_PLATFORM_8711B)
+		#define CONFIG_USE_TCM_HEAP 1					/* USE TCM HEAP */
+	#endif
+	#define CONFIG_RECV_TASKLET_THREAD
+	#define CONFIG_XMIT_TASKLET_THREAD
+#else
+	#define CONFIG_XMIT_THREAD_MODE
+#endif // CONFIG_PLATFORM_AMEBA_X
+//#define CONFIG_RECV_THREAD_MODE				/* Wlan IRQ Polling  Mode*/
+//#define CONFIG_ISR_THREAD_MODE_POLLING		/* Wlan IRQ Polling  Mode*/
+
+//1 Chris
+#ifndef CONFIG_SDIO_HCI
+#define CONFIG_ISR_THREAD_MODE_INTERRUPT	/* Wlan IRQ Interrupt  Mode*/
+#endif
+
+#if defined(CONFIG_ISR_THREAD_MODE_POLLING) && defined(CONFIG_ISR_THREAD_MODE_INTERRUPT)
+#error "CONFIG_ISR_THREAD_MODE_POLLING and CONFIG_ISR_THREAD_MODE_INTERRUPT are mutually exclusive. "
+#endif
+
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+/* CRC DMEM optimized mode consume 1k less SRM memory consumption */
+#define CRC_IMPLEMENTATION_MODE CRC_IMPLEMENTATION_DMEM_OPTIMIZED
+#endif
+
+/* AES DMEM optimized mode comsume 10k less memory compare to 
+     IMEM optimized mode AES_IMPLEMENTATION_IMEM_OPTIMIZED */
+#define AES_IMPLEMENTATION_MODE AES_IMPLEMENTATION_DMEM_OPTIMIZED
+
+#define USE_SKB_AS_XMITBUF	1
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+#define USE_XMIT_EXTBUFF	1
+#else
+#define USE_XMIT_EXTBUFF	0
+#endif
+#define USE_MUTEX_FOR_SPINLOCK	1
+
+// remove function to reduce code
+#define NOT_SUPPORT_5G
+#define NOT_SUPPORT_RF_MULTIPATH
+#define NOT_SUPPORT_VHT
+#define NOT_SUPPORT_40M
+#define NOT_SUPPORT_80M
+#ifndef CONFIG_PLATFORM_8711B
+#define NOT_SUPPORT_BBSWING
+#endif
+#define NOT_SUPPORT_OLD_CHANNEL_PLAN
+#define NOT_SUPPORT_BT
+
+#define CONFIG_WIFI_SPEC	0
+#define CONFIG_FAKE_EFUSE	0
+#if CONFIG_FAKE_EFUSE
+	#define FAKE_CHIPID		CHIPID_8710BN
+#endif
+
+#define CONFIG_AUTO_RECONNECT 1
+#define ENABLE_HWPDN_PIN
+#define SUPPORT_SCAN_BUF	1
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+#define BE_I_CUT			1
+#endif
+
+/* For WPA2 */
+#define CONFIG_INCLUDE_WPA_PSK
+#ifdef CONFIG_INCLUDE_WPA_PSK
+#define CONFIG_MULTIPLE_WPA_STA
+//#define CONFIG_WPA2_PREAUTH
+#define PSK_SUPPORT_TKIP	1
+#endif
+//#define AP_PSK_SUPPORT_TKIP
+
+/* For promiscuous mode */
+#define CONFIG_PROMISC
+
+#define PROMISC_DENY_PAIRWISE	0
+
+/* For Simple Link */
+#ifndef CONFIG_INCLUDE_SIMPLE_CONFIG
+//#define CONFIG_INCLUDE_SIMPLE_CONFIG 1
+#endif
+
+// for probe request with custom vendor specific IE
+#define CONFIG_CUSTOM_IE
+
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+/* For multicast */
+#define CONFIG_MULTICAST
+#endif
+
+/* For STA+AP Concurrent MODE */
+#define CONFIG_CONCURRENT_MODE
+#ifdef CONFIG_CONCURRENT_MODE
+  #if defined(CONFIG_PLATFORM_8195A)
+    #define CONFIG_RUNTIME_PORT_SWITCH
+  #endif
+  #if defined(CONFIG_HARDWARE_8188F)
+  #define NET_IF_NUM 2
+  #else
+  #define NET_IF_NUM ((CONFIG_ETHERNET) + (CONFIG_WLAN) + 1)
+  #endif
+#else
+  #if defined(CONFIG_HARDWARE_8188F)
+  #define NET_IF_NUM 1
+  #else
+  #define NET_IF_NUM ((CONFIG_ETHERNET) + (CONFIG_WLAN))
+  #endif
+#endif
+
+
+/****************** For EAP auth configurations *******************/
+#define CONFIG_TLS	0
+#define CONFIG_PEAP	0
+#define CONFIG_TTLS	0
+
+// DO NOT change the below config of EAP
+#ifdef PRE_CONFIG_EAP
+#undef CONFIG_TLS
+#define CONFIG_TLS	1
+#undef CONFIG_PEAP
+#define CONFIG_PEAP	1
+#undef CONFIG_TTLS
+#define CONFIG_TTLS	1
+#endif
+
+// enable 1X code in lib_wlan as default (increase 380 bytes)
+#define CONFIG_EAP
+
+#if CONFIG_TLS || CONFIG_PEAP || CONFIG_TTLS
+#define EAP_REMOVE_UNUSED_CODE 1
+#endif	     
+	     
+#define EAP_SSL_VERIFY_SERVER
+
+#if CONFIG_TLS
+#define EAP_SSL_VERIFY_CLIENT
+#endif
+
+#if CONFIG_TTLS
+#define EAP_MSCHAPv2
+#define EAP_TTLS_MSCHAPv2
+//#define EAP_TTLS_EAP
+//#define EAP_TTLS_MSCHAP
+//#define EAP_TTLS_PAP
+//#define EAP_TTLS_CHAP
+#endif
+/****************** End of EAP configurations *******************/
+
+/* For WPS and P2P */
+#define CONFIG_WPS
+#if 0
+#define CONFIG_WPS_AP
+#define CONFIG_P2P_NEW
+#if (!defined(SUPPORT_SCAN_BUF)||!defined(CONFIG_WPS_AP)) && defined(CONFIG_P2P_NEW)
+#error "If CONFIG_P2P_NEW, need to SUPPORT_SCAN_BUF"
+#endif
+#endif
+
+#define CONFIG_NEW_SIGNAL_STAT_PROCESS
+#define CONFIG_SKIP_SIGNAL_SCALE_MAPPING
+
+/* For AP_MODE */
+#define CONFIG_AP_MODE
+extern unsigned char g_user_ap_sta_num;
+#define USER_AP_STA_NUM g_user_ap_sta_num
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+#define AP_STA_NUM	3	//2014/10/27 modify to 3
+#define USE_DEDICATED_BCN_TX	0
+#if USE_DEDICATED_BCN_TX
+#error "WLAN driver for Ameba should not enable USE_DEDICATED_BCN_TX"
+#endif
+#else
+extern unsigned int g_ap_sta_num;
+#define AP_STA_NUM 3//g_ap_sta_num
+#endif
+#ifdef CONFIG_AP_MODE
+#if defined(CONFIG_PLATFORM_8195A)  
+	 //softap sent qos null0 polling client alive or not
+	#define CONFIG_AP_POLLING_CLIENT_ALIVE 
+#endif
+	#define CONFIG_NATIVEAP_MLME
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+	#define CONFIG_INTERRUPT_BASED_TXBCN
+#endif
+	#ifdef CONFIG_INTERRUPT_BASED_TXBCN
+		//#define CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
+		#define CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR
+	#endif
+//	#define CONFIG_GK_REKEY
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+	#define USE_DEDICATED_BCN_TX	1
+#endif
+#if CONFIG_INIC_EN
+//	#define REPORT_STA_EVENT //useless
+#endif
+#else
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+	#define USE_DEDICATED_BCN_TX	0
+#endif
+#endif
+
+#if defined(CONFIG_AP_MODE) && defined(CONFIG_GK_REKEY) && !defined(CONFIG_MULTIPLE_WPA_STA)
+#error "If CONFIG_GK_REKEY when CONFIG_AP_MODE, need to CONFIG_MULTIPLE_WPA_STA"
+#endif
+
+#if !defined(CONFIG_PLATFORM_AMEBA_X)
+#if !defined(CONFIG_AP_MODE) && defined(CONFIG_CONCURRENT_MODE)
+#error "If CONFIG_CONCURRENT_MODEE, need to CONFIG_AP_MODE"
+#endif
+#endif
+
+/* For efuse or flash config */
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+	#define CONFIG_RW_PHYSICAL_EFUSE			0	// Mask efuse user blocks
+	#define CONFIG_HIDE_PROTECT_EFUSE			1
+	#define CONFIG_ADAPTOR_INFO_CACHING_FLASH	1
+	#define CHECK_FLASH_VALID_MASK				1
+	#define CHECK_EFUSE_VALID_MASK				1
+	/* For K-free */
+//	#if !defined(CONFIG_PLATFORM_8711B)
+		#define CONFIG_RF_GAIN_OFFSET
+//	#endif
+#endif	// CONFIG_PLATFORM_AMEBA_X
+
+/* For MP_MODE */
+//#define CONFIG_MP_INCLUDED
+#ifdef CONFIG_MP_INCLUDED
+	#define MP_DRIVER		1
+	#define CONFIG_MP_IWPRIV_SUPPORT
+//	#define HAL_EFUSE_MEMORY
+	#if defined(CONFIG_PLATFORM_AMEBA_X)
+		#define MP_REG_TEST
+	#endif
+#else
+	#define MP_DRIVER		0
+	#if defined(CONFIG_PLATFORM_8195A)
+		//Control wifi mcu function
+		#define CONFIG_LITTLE_WIFI_MCU_FUNCTION_THREAD
+		#define CONFIG_ODM_REFRESH_RAMASK
+		//#define CONFIG_ANTENNA_DIVERSITY
+		//#define CONFIG_BT_COEXIST
+	#endif
+#endif // #ifdef CONFIG_MP_INCLUDED
+
+#ifdef CONFIG_BT_COEXIST
+	#undef NOT_SUPPORT_BT
+	#define CONFIG_BT_MAILBOX
+	//#define CONFIG_BT_TWO_ANTENNA
+#endif
+
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+	#if defined(CONFIG_PLATFORM_8195A)
+		#undef CONFIG_RTL8195A
+		#define CONFIG_RTL8195A
+	#endif
+	#if defined(CONFIG_PLATFORM_8711B)
+		#ifndef CONFIG_RTL8711B 
+			#define CONFIG_RTL8711B
+		#endif
+		#undef CONFIG_ADAPTOR_INFO_CACHING_FLASH
+		#define CONFIG_ADAPTOR_INFO_CACHING_FLASH 0
+		//#undef CONFIG_EAP
+		//#undef CONFIG_IPS
+		#define CONFIG_8710B_MOVE_TO_ROM
+		#define CONFIG_EFUSE_SEPARATE
+		#define CONFIG_MOVE_PSK_TO_ROM
+		#define CONFIG_WOWLAN
+		#define CONFIG_TRAFFIC_PROTECT
+		#ifdef CONFIG_LPS
+		#define REKEY_LEAVE_LPS
+		#endif
+	#endif
+#elif defined(CONFIG_HARDWARE_8188F)
+#define CONFIG_RTL8188F
+#else
+#define CONFIG_RTL8188E
+#endif
+#define RTL8192C_SUPPORT 0
+#define RTL8192CE_SUPPORT 0
+#define RTL8192CU_SUPPORT 0
+#define RTL8192D_SUPPORT 0
+#define RTL8192DE_SUPPORT 0
+#define RTL8192DU_SUPPORT 0
+#define RTL8723A_SUPPORT 0
+#define RTL8723AU_SUPPORT 0
+#define RTL8723AS_SUPPORT 0
+#define RTL8192E_SUPPORT 0
+#define RTL8812A_SUPPORT 0
+#define RTL8821A_SUPPORT 0
+#define RTL8723B_SUPPORT 0
+#define RTL8195A_SUPPORT 0
+#define RTL8188E_SUPPORT 0
+#define RTL8188F_SUPPORT 0
+#define RTL8711B_SUPPORT 0
+#if defined(CONFIG_PLATFORM_8195A)
+#undef RTL8195A_SUPPORT
+#define RTL8195A_SUPPORT 1
+#elif defined(CONFIG_PLATFORM_8711B)
+#undef RTL8711B_SUPPORT
+#define RTL8711B_SUPPORT 1
+#elif defined(CONFIG_HARDWARE_8188F)
+#undef	RTL8188F_SUPPORT
+#define RTL8188F_SUPPORT 1
+#else
+#undef RTL8188E_SUPPORT
+#define RTL8188E_SUPPORT 1
+#endif
+
+#define TEST_CHIP_SUPPORT 0
+
+#define RTL8188E_FOR_TEST_CHIP 0
+#define RTL8188E_FPGA_TRUE_PHY_VERIFICATION 0
+
+// for Debug message
+#define DBG 0
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+#if(DBG == 0)
+	#define ROM_E_RTW_MSG 1
+	#define ROM_F_RTW_MSG 1
+	/* For DM debug*/
+	// BB
+	#define DBG_RX_INFO 1
+	#define DBG_DM_DIG 1			// DebugComponents: bit0
+	#define DBG_DM_RA_MASK 1		// DebugComponents: bit1
+	#define DBG_DM_ANT_DIV 1		// DebugComponents: bit6
+	#define DBG_TX_RATE 1			// DebugComponents: bit9
+	#define DBG_DM_RA 1				// DebugComponents: bit9
+	#define DBG_DM_ADAPTIVITY 1		// DebugComponents: bit17
+	// RF
+	#define DBG_PWR_TRACKING 1		// DebugComponents: bit24
+	#define DBG_RF_IQK 1			// DebugComponents: bit26
+	// Common
+	#define DBG_PWR_INDEX 1			// DebugComponents: bit30
+#endif
+#endif
+
+/* For DM support */
+#if defined(CONFIG_RTL8188F)
+#define RATE_ADAPTIVE_SUPPORT 0
+#elif defined(CONFIG_PLATFORM_8711B)
+#define RATE_ADAPTIVE_SUPPORT 0
+#define CONFIG_ODM_REFRESH_RAMASK
+#else
+#define RATE_ADAPTIVE_SUPPORT 1
+#endif
+// adaptivity
+#define RTW_ADAPTIVITY_EN_DISABLE			0
+#define RTW_ADAPTIVITY_EN_ENABLE			1
+#define CONFIG_RTW_ADAPTIVITY_EN			RTW_ADAPTIVITY_EN_DISABLE
+#define RTW_ADAPTIVITY_MODE_NORMAL			0
+#define RTW_ADAPTIVITY_MODE_CARRIER_SENSE	1
+#define CONFIG_RTW_ADAPTIVITY_MODE			RTW_ADAPTIVITY_MODE_CARRIER_SENSE
+#define CONFIG_RTW_ADAPTIVITY_DML			0
+
+
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+	#define CONFIG_POWER_TRAINING_WIL 0 // in RA
+#else
+	#define POWER_BY_RATE_SUPPORT 0
+#endif
+
+#if defined(CONFIG_PLATFORM_AMEBA_X)
+#define RTL8195A_FOR_TEST_CHIP 0
+
+//#define CONFIG_WIFI_TEST 1
+//#define CONFIG_MAC_LOOPBACK_DRIVER 1
+//#define CONFIG_WLAN_HAL_TEST 1
+//#define SKB_PRE_ALLOCATE_TX 1
+#define SKB_PRE_ALLOCATE_RX	0
+#define TX_CHECK_DSEC_ALWAYS 1
+#define CONFIG_DBG_DISABLE_RDU_INTERRUPT
+//#define CONFIG_WLAN_HAL_RX_TASK
+#if (SKB_PRE_ALLOCATE_RX == 1)
+	#define EXCHANGE_LXBUS_RX_SKB 0
+#endif
+#ifdef CONFIG_FPGA
+	//Enable mac loopback for test mode (Ameba)
+	#define CONFIG_TWO_MAC_DRIVER // for test mode
+#endif
+
+#ifdef ENABLE_MAC_LB_FOR_TEST_MODE
+	#define CONFIG_SUDO_PHY_SETTING
+	#define INT_HANDLE_IN_ISR 1
+	#define CONFIG_LWIP_LAYER 0
+	#define CONFIG_WLAN_HAL_TEST
+	#define CONFIG_WLAN_HAL_RX_TASK
+	#define CONFIG_MAC_LOOPBACK_DRIVER_RTL8711B 1
+	#define HAL_MAC_ENABLE 1
+	#define CONFIG_TWO_MAC_TEST_MODE 
+	#define DISABLE_BB_RF 1
+#else
+	//#define CONFIG_TWO_MAC_DRIVER //for mornal driver; two mac
+	#ifdef CONFIG_TWO_MAC_DRIVER
+		#define CONFIG_SUDO_PHY_SETTING
+		#define HAL_MAC_ENABLE 1
+		#define DISABLE_BB_RF 1
+	#else
+		#define HAL_MAC_ENABLE 1
+		#define HAL_BB_ENABLE 1
+		#define HAL_RF_ENABLE 1
+		#define DISABLE_BB_RF 0
+	#endif
+	//#define INT_HANDLE_IN_ISR 1
+#endif
+#endif // CONFIG_PLATFORM_AMEBA_X
+
+#ifndef CONFIG_LWIP_LAYER
+#define CONFIG_LWIP_LAYER 1
+#endif
+#define CONFIG_MAC_ADDRESS 0
+//fast reconnection
+//#define CONFIG_FAST_RECONNECTION 1
+#if defined(CONFIG_INIC_EN)&&(CONFIG_INIC_EN==1)
+#define CONFIG_RECV_REORDERING_CTRL //enable reordering for iNIC high throughput
+#undef RX_AGGREGATION
+#define RX_AGGREGATION 1
+#undef NOT_SUPPORT_40M
+#undef CONFIG_CONCURRENT_MODE
+#endif
+#endif //WLANCONFIG_H

platform/realtek-ambz/fixups/inc/err.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-22. */
+
+#pragma once
+
+#include <lwip/err.h>

platform/realtek-ambz/fixups/inc/lwip/lwip_timers.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-22. */
+
+#pragma once
+
+#include <lwip/timeouts.h>

platform/realtek-ambz/fixups/inc/lwipopts.h

@@ -0,0 +1,331 @@
+// CHANGES:
+// - 2022-05-08 undefine LWIP_PROVIDE_ERRNO
+// - 2022-05-23 enable LWIP_MDNS_RESPONDER
+// - 2022-05-23 set LWIP_NUM_NETIF_CLIENT_DATA to 1
+// - 2022-05-23 set MEMP_NUM_UDP_PCB to 7
+
+
+/**
+  ******************************************************************************
+  * @file    lwipopts.h
+  * @author  MCD Application Team
+  * @version V1.1.0
+  * @date    07-October-2011
+  * @brief   lwIP Options Configuration.
+  *          This file is based on Utilities\lwip_v1.3.2\src\include\lwip\opt.h 
+  *          and contains the lwIP configuration for the STM32F2x7 demonstration.
+  ******************************************************************************
+  * @attention
+  *
+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+  *
+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
+  ******************************************************************************
+  */
+
+#ifndef __LWIPOPTS_H__
+#define __LWIPOPTS_H__
+
+#include <platform/platform_stdlib.h>
+#include "platform_opts.h"
+#define WIFI_LOGO_CERTIFICATION_CONFIG 0    //for ping 10k test buffer setting
+
+/**
+ * SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
+ * critical regions during buffer allocation, deallocation and memory
+ * allocation and deallocation.
+ */
+#define SYS_LIGHTWEIGHT_PROT    1
+
+/* Define LWIP_COMPAT_MUTEX if the port has no mutexes and binary semaphores
+ should be used instead */
+#define LWIP_COMPAT_MUTEX         1
+#define LWIP_COMPAT_MUTEX_ALLOWED 1
+
+#define LWIP_TCPIP_TIMEOUT      1
+
+#define ETHARP_TRUST_IP_MAC     0
+#define IP_REASSEMBLY           1
+#define IP_FRAG                 1
+#define ARP_QUEUEING            0
+
+/**
+ * NO_SYS==1: Provides VERY minimal functionality. Otherwise,
+ * use lwIP facilities.
+ */
+#define NO_SYS                  0
+
+#ifndef CONFIG_DYNAMIC_TICKLESS
+#define CONFIG_DYNAMIC_TICKLESS 0
+#endif
+
+/* ---------- Memory options ---------- */
+/* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
+   lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2
+   byte alignment -> define MEM_ALIGNMENT to 2. */
+#define MEM_ALIGNMENT           4
+
+/* MEM_SIZE: the size of the heap memory. If the application will send
+a lot of data that needs to be copied, this should be set high. */
+#if WIFI_LOGO_CERTIFICATION_CONFIG
+    #define MEM_SIZE                (10*1024) //for ping 10k test
+#elif CONFIG_ETHERNET
+	#define MEM_SIZE				(6*1024)  //for iperf test
+#else
+    #define MEM_SIZE                (5*1024)
+#endif
+
+/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
+   sends a lot of data out of ROM (or other static memory), this
+   should be set high. */
+#define MEMP_NUM_PBUF           100
+/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
+   per active UDP "connection". */
+#define MEMP_NUM_UDP_PCB        7
+/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
+   connections. */
+#define MEMP_NUM_TCP_PCB        10
+/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
+   connections. */
+#define MEMP_NUM_TCP_PCB_LISTEN 5
+/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
+   segments. */
+#define MEMP_NUM_TCP_SEG        20
+/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
+   timeouts. */
+#define MEMP_NUM_SYS_TIMEOUT    10
+
+
+/* ---------- Pbuf options ---------- */
+/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
+#if WIFI_LOGO_CERTIFICATION_CONFIG
+    #define PBUF_POOL_SIZE          30 //for ping 10k test
+#else
+    #define PBUF_POOL_SIZE          20
+#endif
+
+/* IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.*/
+#if WIFI_LOGO_CERTIFICATION_CONFIG
+    #define IP_REASS_MAX_PBUFS              30 //for ping 10k test
+#else
+    #define IP_REASS_MAX_PBUFS              10
+#endif
+
+/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
+#define PBUF_POOL_BUFSIZE       500
+
+
+/* ---------- TCP options ---------- */
+#define LWIP_TCP                1
+#define TCP_TTL                 255
+
+/* Controls if TCP should queue segments that arrive out of
+   order. Define to 0 if your device is low on memory. */
+#define TCP_QUEUE_OOSEQ         1
+
+/* TCP Maximum segment size. */
+#define TCP_MSS                 (1500 - 40)	  /* TCP_MSS = (Ethernet MTU - IP header size - TCP header size) */
+
+/* TCP sender buffer space (bytes). */
+#define TCP_SND_BUF             (5*TCP_MSS)
+
+/*  TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least
+  as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. */
+
+#define TCP_SND_QUEUELEN        (4* TCP_SND_BUF/TCP_MSS)
+
+/* TCP receive window. */
+#define TCP_WND                 (2*TCP_MSS)
+
+
+/* ---------- ICMP options ---------- */
+#define LWIP_ICMP                       1
+
+/* ---------- ARP options ----------- */
+#define LWIP_ARP                        1
+
+/* ---------- DHCP options ---------- */
+/* Define LWIP_DHCP to 1 if you want DHCP configuration of
+   interfaces. DHCP is not implemented in lwIP 0.5.1, however, so
+   turning this on does currently not work. */
+#define LWIP_DHCP               1
+
+
+/* ---------- UDP options ---------- */
+#define LWIP_UDP                1
+#define UDP_TTL                 255
+/* ---------- DNS options ---------- */
+#define LWIP_DNS                        1
+
+/* ---------- UPNP options --------- */
+#define LWIP_UPNP		0
+
+/* Support Multicast */
+#define LWIP_IGMP                   1
+#define LWIP_RAND()                 rand()
+#define LWIP_SRAND()                srand(sys_now())
+
+/* Support TCP Keepalive */
+#define LWIP_TCP_KEEPALIVE				1
+
+/*LWIP_UART_ADAPTER==1: Enable LWIP_UART_ADAPTER when CONFIG_GAGENT is enabled, 
+   because some GAGENT functions denpond on the following macro definitions.*/
+#define LWIP_UART_ADAPTER                   0
+
+#if LWIP_UART_ADAPTER || CONFIG_ETHERNET
+#undef  LWIP_SO_SNDTIMEO        
+#define LWIP_SO_SNDTIMEO                		1
+
+#undef  SO_REUSE        
+#define SO_REUSE                        			1
+
+#undef MEMP_NUM_NETCONN                	
+#define MEMP_NUM_NETCONN                	10
+
+#undef TCP_WND                
+#define TCP_WND                                       (4*TCP_MSS)
+
+#define TCP_KEEPIDLE_DEFAULT			10000UL
+#define TCP_KEEPINTVL_DEFAULT			1000UL
+#define TCP_KEEPCNT_DEFAULT			10U
+#endif
+
+#if CONFIG_EXAMPLE_UART_ATCMD || CONFIG_EXAMPLE_SPI_ATCMD 
+#undef  LWIP_SO_SNDTIMEO        
+#define LWIP_SO_SNDTIMEO                		1
+
+#undef  SO_REUSE        
+#define SO_REUSE                        			1
+
+#undef SO_REUSE_RXTOALL
+#define SO_REUSE_RXTOALL				1
+
+#undef MEMP_NUM_NETCONN                	
+#define MEMP_NUM_NETCONN                	10
+
+#undef MEMP_NUM_TCP_PCB
+#define MEMP_NUM_TCP_PCB				(MEMP_NUM_NETCONN)
+
+#undef MEMP_NUM_UDP_PCB
+#define MEMP_NUM_UDP_PCB				(MEMP_NUM_NETCONN)
+
+#undef TCP_WND                
+#define TCP_WND                                       	(4*TCP_MSS)
+
+#define TCP_KEEPIDLE_DEFAULT			10000UL
+#define TCP_KEEPINTVL_DEFAULT			1000UL
+#define TCP_KEEPCNT_DEFAULT			10U
+
+#define ERRNO   1
+
+#endif
+
+/* ---------- Statistics options ---------- */
+#define LWIP_STATS 0
+
+
+/*
+   --------------------------------------
+   ---------- Checksum options ----------
+   --------------------------------------
+*/
+
+/* 
+The STM32F2x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums by hardware:
+ - To use this feature let the following define uncommented.
+ - To disable it and process by CPU comment the  the checksum.
+*/
+//Do checksum by lwip - WLAN nic does not support Checksum offload
+//#define CHECKSUM_BY_HARDWARE 
+
+
+#ifdef CHECKSUM_BY_HARDWARE
+  /* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/
+  #define CHECKSUM_GEN_IP                 0
+  /* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/
+  #define CHECKSUM_GEN_UDP                0
+  /* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/
+  #define CHECKSUM_GEN_TCP                0 
+  /* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/
+  #define CHECKSUM_CHECK_IP               0
+  /* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/
+  #define CHECKSUM_CHECK_UDP              0
+  /* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/
+  #define CHECKSUM_CHECK_TCP              0
+#else
+  /* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/
+  #define CHECKSUM_GEN_IP                 1
+  /* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/
+  #define CHECKSUM_GEN_UDP                1
+  /* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/
+  #define CHECKSUM_GEN_TCP                1
+  /* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/
+  #define CHECKSUM_CHECK_IP               1
+  /* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/
+  #define CHECKSUM_CHECK_UDP              1
+  /* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/
+  #define CHECKSUM_CHECK_TCP              1
+#endif
+
+
+/*
+   ----------------------------------------------
+   ---------- Sequential layer options ----------
+   ----------------------------------------------
+*/
+/**
+ * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
+ */
+#define LWIP_NETCONN                    1
+
+/*
+   ------------------------------------
+   ---------- Socket options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
+ */
+#define LWIP_SOCKET                     1	
+
+/*
+   -----------------------------------
+   ---------- DEBUG options ----------
+   -----------------------------------
+*/
+
+#define LWIP_DEBUG                      0
+
+
+/*
+   ---------------------------------
+   ---------- OS options ----------
+   ---------------------------------
+*/
+
+#define TCPIP_THREAD_STACKSIZE          1000
+#define TCPIP_MBOX_SIZE                 6
+#define DEFAULT_UDP_RECVMBOX_SIZE       6
+#define DEFAULT_TCP_RECVMBOX_SIZE       6
+#define DEFAULT_RAW_RECVMBOX_SIZE		6
+#define DEFAULT_ACCEPTMBOX_SIZE         6
+#define DEFAULT_THREAD_STACKSIZE        500
+#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES - 2)
+
+/* Added by Realtek */
+#ifndef DNS_IGNORE_REPLY_ERR
+#define DNS_IGNORE_REPLY_ERR   1
+#endif /* DNS_IGNORE_REPLY_ERR */
+
+// for mDNS support
+#define LWIP_MDNS_RESPONDER 1
+#define LWIP_NUM_NETIF_CLIENT_DATA 1
+
+#endif /* __LWIPOPTS_H__ */
+
+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

platform/realtek-ambz/fixups/inc/main.h

@@ -0,0 +1,122 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#include <autoconf.h>
+
+#ifndef CONFIG_WLAN
+#define CONFIG_WLAN	1
+#endif
+
+/* Header file declaration*/
+void wlan_network();
+
+/* Interactive Mode */
+#define SERIAL_DEBUG_RX 1
+
+/* WLAN and Netork */
+#define STA_MODE_SSID	"ap"    /* Set SSID here */
+#define AP_MODE_SSID		"wlan_ap_ssid"    /* Set SSID here */
+#define AP_DEFAULT_CH	6
+#define WLAN0_NAME		"wlan0"
+#define WLAN1_NAME      	"wlan1"
+#define WPA_PASSPHRASE	"1234567890" /* Max 32 cahracters */
+#define WEP40_KEY		{0x12, 0x34, 0x56, 0x78, 0x90}
+
+#define ATVER_1 1 // For First AT command
+#define ATVER_2 2 // For UART Module AT command
+
+#if CONFIG_EXAMPLE_UART_ATCMD
+#define ATCMD_VER ATVER_2
+#else
+#define ATCMD_VER ATVER_1
+#endif
+
+#if ATCMD_VER == ATVER_2
+#undef CONFIG_EXAMPLE_WLAN_FAST_CONNECT
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT	1
+
+extern unsigned char sta_ip[4], sta_netmask[4], sta_gw[4];
+extern unsigned char ap_ip[4], ap_netmask[4], ap_gw[4];
+
+/*Static IP ADDRESS*/
+#define IP_ADDR0   sta_ip[0]
+#define IP_ADDR1   sta_ip[1]
+#define IP_ADDR2   sta_ip[2]
+#define IP_ADDR3   sta_ip[3]
+
+/*NETMASK*/
+#define NETMASK_ADDR0   sta_netmask[0]
+#define NETMASK_ADDR1   sta_netmask[1]
+#define NETMASK_ADDR2   sta_netmask[2]
+#define NETMASK_ADDR3   sta_netmask[3]
+
+/*Gateway Address*/
+#define GW_ADDR0   sta_gw[0]
+#define GW_ADDR1   sta_gw[1]
+#define GW_ADDR2   sta_gw[2]
+#define GW_ADDR3   sta_gw[3]
+
+/*******************************************/
+
+/*Static IP ADDRESS*/
+#define AP_IP_ADDR0   ap_ip[0]
+#define AP_IP_ADDR1   ap_ip[1]
+#define AP_IP_ADDR2   ap_ip[2]
+#define AP_IP_ADDR3   ap_ip[3]
+
+/*NETMASK*/
+#define AP_NETMASK_ADDR0   ap_netmask[0]
+#define AP_NETMASK_ADDR1   ap_netmask[1]
+#define AP_NETMASK_ADDR2   ap_netmask[2]
+#define AP_NETMASK_ADDR3   ap_netmask[3]
+
+/*Gateway Address*/
+#define AP_GW_ADDR0   ap_gw[0]
+#define AP_GW_ADDR1   ap_gw[1]
+#define AP_GW_ADDR2   ap_gw[2]
+#define AP_GW_ADDR3   ap_gw[3]
+
+#else
+
+/*Static IP ADDRESS*/
+#define IP_ADDR0   192
+#define IP_ADDR1   168
+#define IP_ADDR2   1
+#define IP_ADDR3   80
+
+/*NETMASK*/
+#define NETMASK_ADDR0   255
+#define NETMASK_ADDR1   255
+#define NETMASK_ADDR2   255
+#define NETMASK_ADDR3   0
+
+/*Gateway Address*/
+#define GW_ADDR0   192
+#define GW_ADDR1   168
+#define GW_ADDR2   1
+#define GW_ADDR3   1
+
+/*******************************************/
+
+/*Static IP ADDRESS*/
+#define AP_IP_ADDR0   192
+#define AP_IP_ADDR1   168
+#define AP_IP_ADDR2   43
+#define AP_IP_ADDR3   1
+   
+/*NETMASK*/
+#define AP_NETMASK_ADDR0   255
+#define AP_NETMASK_ADDR1   255
+#define AP_NETMASK_ADDR2   255
+#define AP_NETMASK_ADDR3   0
+
+/*Gateway Address*/
+#define AP_GW_ADDR0   192
+#define AP_GW_ADDR1   168
+#define AP_GW_ADDR2   43
+#define AP_GW_ADDR3   1  
+
+#endif //#if ATCMD_VER == ATVER_2
+
+
+#endif

platform/realtek-ambz/fixups/inc/platform_autoconf.h

@@ -0,0 +1,241 @@
+/*
+ * Automatically generated by make menuconfig: don't edit
+ */
+#define AUTOCONF_INCLUDED
+
+/*
+ * < MENUCONFIG FOR CHIP CONFIG
+ */
+
+/*
+ * < CONFIG CHIP
+ */
+#define CONFIG_RTL8711B 1
+#undef  ARM_CORE_CM3
+#define ARM_CORE_CM4 1
+#define CONFIG_CHIP_A_CUT 1
+#undef  CONFIG_FPGA
+
+/*
+ * < CONFIG CPU CLK 
+ */
+#define CONFIG_CPU_CLK 1
+#define CONFIG_CPU_125MHZ 1
+#undef  CONFIG_CPU_62_5MHZ
+#undef  CONFIG_CPU_31_25MHZ
+#undef  CONFIG_CPU_15_625MHZ
+#undef  CONFIG_CPU_7_8125MHZ
+#undef  CONFIG_CPU_4MHZ
+#undef  CONFIG_FPGA_CLK
+#define PLATFORM_CLOCK (125000000)
+#define CPU_CLOCK_SEL_VALUE (0)
+
+/*
+ * < CONFIG OSC8M CLK 
+ */
+#define CONFIG_OSC8M_CLK 1
+#define CONFIG_OSC8M_8388608HZ 1
+#undef  CONFIG_OSC8M_8192000HZ
+#undef  CONFIG_OSC8M_8000000HZ
+#undef  CONFIG_OSC8M_16777216HZ
+#define OSC8M_CLOCK (8388608)
+
+/*
+ * < CONFIG TEST MODE 
+ */
+#undef  CONFIG_MP
+#undef  CONFIG_CP
+#undef  CONFIG_FT
+#undef  CONFIG_EQC
+#undef  CONFIG_RTL_SIM
+#undef  CONFIG_POST_SIM
+
+/*
+ * < CONFIG OS 
+ */
+#define CONFIG_KERNEL 1
+#define PLATFORM_FREERTOS 1
+#undef  PLATFORM_UCOSII
+#undef  PLATFORM_ECOS
+#undef  CONFIG_TASK_SCHEDUL_DIS
+#define TASK_SCHEDULER_DISABLED (0)
+
+/*
+ * < CONFIG GTIMER 
+ */
+#define CONFIG_TIMER_EN 1
+#define CONFIG_TIMER_MODULE 1
+
+/*
+ * < CONFIG WDG 
+ */
+#define CONFIG_WDG 1
+#define CONFIG_WDG_MODULE 1
+
+/*
+ * < CONFIG GDMA 
+ */
+#define CONFIG_GDMA_EN 1
+#define CONFIG_GDMA_MODULE 1
+
+/*
+ * < CONFIG GPIO 
+ */
+#define CONFIG_GPIO_EN 1
+#define CONFIG_GPIO_MODULE 1
+
+/*
+ * < CONFIG SPI 
+ */
+#define CONFIG_SPI_COM_EN 1
+#define CONFIG_SPI_COM_MODULE 1
+
+/*
+ * < CONFIG UART 
+ */
+#define CONFIG_UART_EN 1
+#define CONFIG_UART_MODULE 1
+
+/*
+ * < CONFIG I2C 
+ */
+#define CONFIG_I2C_EN 1
+#define CONFIG_I2C_MODULE 1
+
+/*
+ * < CONFIG I2S 
+ */
+#define CONFIG_I2S_EN 1
+#define CONFIG_I2S_MODULE 1
+
+/*
+ * < CONFIG SOC PS 
+ */
+#define CONFIG_SOC_PS_EN 1
+#define CONFIG_SOC_PS_MODULE 1
+
+/*
+ * < CONFIG CRYPTO 
+ */
+#define CONFIG_CRYPTO_EN 1
+#define CONFIG_CRYPTO_MODULE 1
+
+/*
+ * < CONFIG PWM 
+ */
+#define CONFIG_PWM_EN 1
+
+/*
+ * < CONFIG EFUSE 
+ */
+#define CONFIG_EFUSE_EN 1
+#define CONFIG_EFUSE_MODULE 1
+
+/*
+ * < CONFIG SPIC 
+ */
+#define CONFIG_SPIC_EN 1
+#define CONFIG_SPIC_MODULE 1
+#define CONFIG_SPIC_PHASE_CALIBATION 1
+#undef  CONFIG_SPIC_4BYTES_ADDRESS
+
+/*
+ * < CONFIG ADC 
+ */
+#define CONFIG_ADC_EN 1
+#define CONFIG_ADC_MODULE 1
+
+/*
+ * < CONFIG SDIO Device 
+ */
+#define CONFIG_SDIO_DEVICE_EN 1
+#define CONFIG_SDIO_DEVICE_NORMAL 1
+#define CONFIG_SDIO_DEVICE_MODULE 1
+
+/*
+ * < CONFIG USB 
+ */
+#define CONFIG_USB_EN 1
+#define CONFIG_USB_MODULE 1
+
+/*
+ * < CONFIG RDP 
+ */
+#define CONFIG_RDP_ENABLE 1
+
+/*
+ * < CONFIG PINMUX 
+ */
+#undef  CONFIG_PINMAP_ENABLE
+
+/*
+ * < CONFIG PER TEST 
+ */
+#undef  CONFIG_PER_TEST
+
+/*
+ * < CONFIG WIFI 
+ */
+#define CONFIG_WIFI_EN 1
+#define CONFIG_WIFI_NORMAL 1
+#undef  CONFIG_WIFI_TEST
+#define CONFIG_WIFI_MODULE 1
+
+/*
+ * < CONFIG NETWORK 
+ */
+#define CONFIG_NETWORK 1
+
+/*
+ * < CONFIG INIC 
+ */
+#undef  CONFIG_INIC_EN
+
+/*
+ * < CONFIG USB_NIC 
+ */
+#undef  CONFIG_USB_DONGLE_NIC_EN
+
+/*
+ * < RTK STD lib 
+ */
+#define CONFIG_RTLIB_EN 1
+#define CONFIG_RTLIB_MODULE 1
+#undef  CONFIG_RTLIB_VERIFY
+
+/*
+ * < Add MBED SDK 
+ */
+#undef  CONFIG_MBED_ENABLED
+
+/*
+ * < Build App Demo 
+ */
+#undef  CONFIG_APP_DEMO
+
+/*
+ * < Dhrystone 
+ */
+#undef  CONFIG_DHRYSTONE_TEST
+
+/*
+ * < SSL 
+ */
+#undef  CONFIG_SSL_ROM_TEST
+
+/*
+ * < System Debug Message Config 
+ */
+#define CONFIG_UART_LOG_HISTORY 1
+#define CONFIG_DEBUG_LOG 1
+#define CONFIG_DEBUG_ERR_MSG 1
+#undef  CONFIG_DEBUG_WARN_MSG
+#undef  CONFIG_DEBUG_INFO_MSG
+
+/*
+ * < Build Option 
+ */
+#define CONFIG_TOOLCHAIN_ASDK 1
+#undef  CONFIG_TOOLCHAIN_ARM_GCC
+#define CONFIG_LINK_ROM_LIB 1
+#undef  CONFIG_LINK_ROM_SYMB

platform/realtek-ambz/fixups/inc/platform_opts.h

@@ -0,0 +1,352 @@
+// CHANGES:
+// - 2022-05-08 change CONFIG_USE_POLARSSL to CONFIG_USE_MBEDTLS
+// - 2022-05-08 use static int errno
+// - 2022-05-18 include lwip/init.h
+
+
+/**
+ ******************************************************************************
+ *This file contains general configurations for ameba platform
+ ******************************************************************************
+*/
+
+#ifndef __PLATFORM_OPTS_H__
+#define __PLATFORM_OPTS_H__
+
+#include "platform_autoconf.h"
+
+// There are two different errno's:
+// - first is just an int
+// - second is a macro that calls __errno()
+// Here the first option is ensured in the entire project.
+#include <errno.h> // use system __errno() & error codes
+#undef errno // undefine __errno() macro
+extern int errno; // use a static errno
+
+#include <lwip/init.h>
+
+/*For MP mode setting*/
+//#define SUPPORT_MP_MODE		1
+
+/**
+ * For AT cmd Log service configurations
+ */
+#define SUPPORT_LOG_SERVICE	1
+#if SUPPORT_LOG_SERVICE
+#define LOG_SERVICE_BUFLEN     100 //can't larger than UART_LOG_CMD_BUFLEN(127)
+#define CONFIG_LOG_HISTORY	0
+#if CONFIG_LOG_HISTORY
+#define LOG_HISTORY_LEN    5
+#endif
+#define SUPPORT_INTERACTIVE_MODE		0//on/off wifi_interactive_mode
+#define CONFIG_LOG_SERVICE_LOCK 0
+#endif
+
+/* For DCT example*/
+#define CONFIG_EXAMPLE_DCT				0
+
+/**
+ * For interactive mode configurations, depents on log service
+ */
+#if SUPPORT_INTERACTIVE_MODE
+#define CONFIG_INTERACTIVE_MODE     1
+#define CONFIG_INTERACTIVE_EXT   0
+#else
+#define CONFIG_INTERACTIVE_MODE     0
+#define CONFIG_INTERACTIVE_EXT   0
+#endif
+
+/**
+ * For FreeRTOS tickless configurations
+ */
+#define FREERTOS_PMU_TICKLESS_SUSPEND_SDRAM  1   // In sleep mode, 1: suspend SDRAM, 0: no act
+
+/******************************************************************************/
+
+/**
+* For common flash usage  
+*/
+#define AP_SETTING_SECTOR		0x000FE000
+#define UART_SETTING_SECTOR		0x000FC000
+#define SPI_SETTING_SECTOR		0x000FC000
+#define FAST_RECONNECT_DATA 	(0x80000 - 0x1000)
+#define FLASH_SECTOR_SIZE       0x1000
+
+#define CONFIG_ENABLE_RDP		0
+
+/**
+ * For Wlan configurations
+ */
+#define CONFIG_WLAN	1
+#if CONFIG_WLAN
+#define CONFIG_LWIP_LAYER	1
+#define CONFIG_INIT_NET		1 //init lwip layer when start up
+#define CONFIG_WIFI_IND_USE_THREAD	0	// wifi indicate worker thread
+
+//on/off relative commands in log service
+#define CONFIG_SSL_CLIENT	0
+#define CONFIG_WEBSERVER	0
+#define CONFIG_OTA_UPDATE	1
+#define CONFIG_BSD_TCP		1//NOTE : Enable CONFIG_BSD_TCP will increase about 11KB code size
+#define CONFIG_AIRKISS		0//on or off tencent airkiss
+#define CONFIG_UART_SOCKET	0
+#define CONFIG_UART_XMODEM	0//support uart xmodem upgrade or not
+#define CONFIG_TRANSPORT	0//on or off the at command for transport socket
+
+/* For WPS and P2P */
+#define CONFIG_ENABLE_WPS		0
+#define CONFIG_ENABLE_WPS_DISCOVERY	0
+#if CONFIG_ENABLE_P2P
+#define CONFIG_ENABLE_WPS_AP		1
+#undef CONFIG_WIFI_IND_USE_THREAD
+#define CONFIG_WIFI_IND_USE_THREAD	1
+#endif
+#if (CONFIG_ENABLE_P2P && ((CONFIG_ENABLE_WPS_AP == 0) || (CONFIG_ENABLE_WPS == 0)))
+#error "If CONFIG_ENABLE_P2P, need to define CONFIG_ENABLE_WPS_AP 1" 
+#endif
+
+/* For SSL/TLS */
+#define CONFIG_USE_POLARSSL     0
+#define CONFIG_USE_MBEDTLS      1
+#if ((CONFIG_USE_POLARSSL == 0) && (CONFIG_USE_MBEDTLS == 0)) || ((CONFIG_USE_POLARSSL == 1) && (CONFIG_USE_MBEDTLS == 1))
+#undef CONFIG_USE_POLARSSL
+#define CONFIG_USE_POLARSSL 1
+#undef CONFIG_USE_MBEDTLS
+#define CONFIG_USE_MBEDTLS 0
+#endif
+
+/* For Simple Link */
+#define CONFIG_INCLUDE_SIMPLE_CONFIG		1
+
+/*For fast reconnection*/
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT	0
+
+
+#define CONFIG_GAGENT			0
+/*Disable CONFIG_EXAMPLE_WLAN_FAST_CONNECT when CONFIG_GAGENT is enabled,because
+	reconnect to previous AP is not suitable when re-configuration. 
+*/
+#if CONFIG_GAGENT
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT 0
+#endif
+
+
+#endif //end of #if CONFIG_WLAN
+/*******************************************************************************/
+
+/**
+ * For Ethernet configurations
+ */
+#define CONFIG_ETHERNET 0
+#if CONFIG_ETHERNET
+
+#define CONFIG_LWIP_LAYER	1
+#define CONFIG_INIT_NET         1 //init lwip layer when start up
+
+//on/off relative commands in log service
+#define CONFIG_SSL_CLIENT	0
+#define CONFIG_BSD_TCP		0//NOTE : Enable CONFIG_BSD_TCP will increase about 11KB code size
+
+#endif
+
+/**
+ * For user to adjust SLEEP_INTERVAL
+ */
+#define CONFIG_DYNAMIC_TICKLESS  1
+
+/*******************************************************************************/
+
+/**
+ * For iNIC configurations
+ */
+//#define CONFIG_INIC_EN 0//enable iNIC mode
+#if CONFIG_INIC_EN
+#ifndef CONFIG_LWIP_LAYER
+#define CONFIG_LWIP_LAYER	0
+#endif
+#ifndef CONFIG_INIC_SDIO_HCI
+#define CONFIG_INIC_SDIO_HCI	0 //for SDIO or USB iNIC
+#endif
+#ifndef CONFIG_INIC_CMD_RSP
+#define CONFIG_INIC_CMD_RSP	0
+#endif
+#ifndef CONFIG_INIC_USB_HCI
+#define CONFIG_INIC_USB_HCI	0
+#endif
+#endif
+/******************End of iNIC configurations*******************/
+
+
+/* For WIFI GET BEACON FRAME example */
+#define CONFIG_EXAMPLE_GET_BEACON_FRAME  0
+
+/* For WIFI MAC MONITOR example */
+#define CONFIG_EXAMPLE_WIFI_MAC_MONITOR  0
+   
+/* For HTTP CLIENT example */
+#define CONFIG_EXAMPLE_HTTP_CLIENT  0
+
+/* For MQTT example */
+#define CONFIG_EXAMPLE_MQTT				0
+
+/* For mDNS example */
+#define CONFIG_EXAMPLE_MDNS				0
+
+/* For multicast example */
+#define CONFIG_EXAMPLE_MCAST			0
+
+/* For XML example */
+#define CONFIG_EXAMPLE_XML				0
+
+/* For socket select example */
+#define CONFIG_EXAMPLE_SOCKET_SELECT	0
+
+/* For socket nonblocking connect example */
+#define CONFIG_EXAMPLE_NONBLOCK_CONNECT	0
+
+/* For socket TCP bidirectional transmission example */
+#define CONFIG_EXAMPLE_SOCKET_TCP_TRX	0
+
+/* For ssl download example */
+#define CONFIG_EXAMPLE_SSL_DOWNLOAD      0
+
+/* For http download example */
+#define CONFIG_EXAMPLE_HTTP_DOWNLOAD	0
+
+/* For httpc example */
+#define CONFIG_EXAMPLE_HTTPC			0
+
+/* For httpd example */
+#define CONFIG_EXAMPLE_HTTPD			0
+
+/* For tcp keepalive example */
+#define CONFIG_EXAMPLE_TCP_KEEPALIVE	0
+
+/* For sntp show time example */
+#define CONFIG_EXAMPLE_SNTP_SHOWTIME	0
+
+
+/* For websocket client example */
+#define CONFIG_EXAMPLE_WEBSOCKET		0
+
+
+/* For UART Module AT command example */
+#define CONFIG_EXAMPLE_UART_ATCMD	0
+#if CONFIG_EXAMPLE_UART_ATCMD
+#undef CONFIG_OTA_UPDATE
+#define CONFIG_OTA_UPDATE 1
+#undef CONFIG_TRANSPORT
+#define CONFIG_TRANSPORT 1
+#undef LOG_SERVICE_BUFLEN
+#define LOG_SERVICE_BUFLEN 1600
+#undef CONFIG_LOG_SERVICE_LOCK
+#define CONFIG_LOG_SERVICE_LOCK 1
+#undef CONFIG_EXAMPLE_WLAN_FAST_CONNECT
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT  0
+#endif
+
+
+
+/****************** For EAP method example *******************/
+#define CONFIG_EXAMPLE_EAP	0
+
+// on/off specified eap method
+#define CONFIG_ENABLE_PEAP	0
+#define CONFIG_ENABLE_TLS	0
+#define CONFIG_ENABLE_TTLS	0
+
+// optional feature: whether to verify the cert of radius server
+#define ENABLE_EAP_SSL_VERIFY_SERVER	0
+
+#if CONFIG_ENABLE_PEAP || CONFIG_ENABLE_TLS || CONFIG_ENABLE_TTLS
+#define CONFIG_ENABLE_EAP
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT 0
+#endif
+
+#if CONFIG_ENABLE_TLS
+#define ENABLE_EAP_SSL_VERIFY_CLIENT	1
+#else
+#define ENABLE_EAP_SSL_VERIFY_CLIENT	0
+#endif
+/******************End of EAP configurations*******************/
+
+
+/* For iNIC host example*/
+#ifdef CONFIG_INIC_GSPI_HOST //this flag is defined in IAR project
+#define	CONFIG_EXAMPLE_INIC_GSPI_HOST	1
+#if CONFIG_EXAMPLE_INIC_GSPI_HOST
+
+#define CONFIG_INIC_HOST	1
+
+#undef CONFIG_WLAN
+#define CONFIG_WLAN		0
+#undef	CONFIG_INCLUDE_SIMPLE_CONFIG
+#define CONFIG_INCLUDE_SIMPLE_CONFIG	0
+#undef	CONFIG_EXAMPLE_WLAN_FAST_CONNECT
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT	0
+#undef CONFIG_LWIP_LAYER
+#define CONFIG_LWIP_LAYER	1
+#undef	CONFIG_BSD_TCP
+#define CONFIG_BSD_TCP		1
+
+#endif
+#endif
+
+/*For uart update example*/
+#define CONFIG_UART_UPDATE				0
+#if CONFIG_UART_UPDATE
+#undef CONFIG_EXAMPLE_WLAN_FAST_CONNECT
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT 0
+#endif
+
+/* For uart adapter example */
+/* Please also configure LWIP_UART_ADAPTER to 1 
+in lwip_opt.h for support uart adapter*/
+#define CONFIG_EXAMPLE_UART_ADAPTER	0
+#if CONFIG_EXAMPLE_UART_ADAPTER
+#undef CONFIG_EXAMPLE_WLAN_FAST_CONNECT
+#define CONFIG_EXAMPLE_WLAN_FAST_CONNECT	1
+#undef CONFIG_EXAMPLE_MDNS
+#define CONFIG_EXAMPLE_MDNS	1
+#endif
+
+/* For wifi scenarios example (Wi-Fi, WPS enrollee, P2P GO) */
+// also need to enable WPS and P2P
+#define CONFIG_EXAMPLE_WLAN_SCENARIO	0
+	 
+/* For broadcast example */
+#define CONFIG_EXAMPLE_BCAST			0
+
+/* For high-load memory use case memory usage */
+#define CONFIG_EXAMPLE_HIGH_LOAD_MEMORY_USE		0
+
+/* For rarp example */
+#define CONFIG_EXAMPLE_RARP				0
+
+/* For ssl server example */
+#define CONFIG_EXAMPLE_SSL_SERVER		0
+
+#if CONFIG_QQ_LINK
+#define FATFS_R_10C
+#define FATFS_DISK_USB	0
+#define FATFS_DISK_SD 	1
+#endif
+
+#if CONFIG_ENABLE_WPS
+#define WPS_CONNECT_RETRY_COUNT		4
+#define WPS_CONNECT_RETRY_INTERVAL	5000 // in ms
+#endif 
+
+#define AUTO_RECONNECT_COUNT	8
+#define AUTO_RECONNECT_INTERVAL	5 // in sec
+
+#if CONFIG_INIC_EN
+#undef CONFIG_INCLUDE_SIMPLE_CONFIG
+#define CONFIG_INCLUDE_SIMPLE_CONFIG	0
+#define SUPPORT_INTERACTIVE_MODE		0
+#define CONFIG_INTERACTIVE_MODE		0
+#define CONFIG_INTERACTIVE_EXT			0
+#define CONFIG_OTA_UPDATE				0
+#endif
+
+#endif

platform/realtek-ambz/fixups/inc/sockets.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-23. */
+
+#pragma once
+
+#include <lwip/sockets.h>

platform/realtek-ambz/fixups/inc/sys.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-22. */
+
+#pragma once
+
+#include <lwip/sys.h>

platform/realtek-ambz/fixups/inc/tcpip.h

@@ -0,0 +1,5 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-22. */
+
+#pragma once
+
+#include <lwip/tcpip.h>

platform/realtek-ambz/fixups/inc/udp.h

@@ -0,0 +1,10 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-05-23. */
+
+#pragma once
+
+#include <lwip/udp.h>
+
+// this is included only by wifi_simple_config.c
+// which uses lwip_ntohl without parentheses
+// so the #define from lwip/def.h doesn't work
+#define lwip_ntohl lwip_htonl

platform/realtek-ambz/fixups/net_sockets.c

@@ -0,0 +1,739 @@
+/*
+ *  TCP/IP or UDP/IP networking functions
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_NET_C)
+
+/*
+#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
+    !defined(__APPLE__) && !defined(_WIN32)
+#error "This module only works on Unix and Windows, see MBEDTLS_NET_C in config.h"
+#endif
+*/
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#endif
+
+#include "mbedtls/net_sockets.h"
+
+#include <string.h>
+
+#if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \
+    !defined(EFI32)
+
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+/* Enables getaddrinfo() & Co */
+#define _WIN32_WINNT 0x0501
+#include <ws2tcpip.h>
+
+#include <winsock2.h>
+#include <windows.h>
+
+#if defined(_MSC_VER)
+#if defined(_WIN32_WCE)
+#pragma comment( lib, "ws2.lib" )
+#else
+#pragma comment( lib, "ws2_32.lib" )
+#endif
+#endif /* _MSC_VER */
+
+#define read(fd,buf,len)        recv(fd,(char*)buf,(int) len,0)
+#define write(fd,buf,len)       send(fd,(char*)buf,(int) len,0)
+#define close(fd)               closesocket(fd)
+
+static int wsa_init_done = 0;
+
+#elif defined(__ICCARM__) || defined(__CC_ARM) || defined ( __GNUC__ )
+
+#include "lwip/sockets.h"
+#include "lwip/inet.h"
+#if LWIP_DNS
+#include "lwip/netdb.h"
+#endif
+#include <errno.h>
+
+#define net_htons(n) htons(n)
+#define net_htonl(n) htonl(n)
+
+#else /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <errno.h>
+
+#endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
+
+/* Some MS functions want int and MSVC warns if we pass size_t,
+ * but the standard fucntions use socklen_t, so cast only for MSVC */
+#if defined(_MSC_VER)
+#define MSVC_INT_CAST   (int)
+#else
+#define MSVC_INT_CAST
+#endif
+
+#include <stdio.h>
+
+#include <time.h>
+
+#include <stdint.h>
+
+/*
+ * Prepare for using the sockets interface
+ */
+static int net_prepare( void )
+{
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+    WSADATA wsaData;
+
+    if( wsa_init_done == 0 )
+    {
+        if( WSAStartup( MAKEWORD(2,0), &wsaData ) != 0 )
+            return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+
+        wsa_init_done = 1;
+    }
+#else
+#if !defined(EFIX64) && !defined(EFI32) && !defined(__ICCARM__) && !defined(__CC_ARM) &&  !defined ( __GNUC__ )
+    signal( SIGPIPE, SIG_IGN );
+#endif
+#endif
+    return( 0 );
+}
+
+/*
+ * Initialize a context
+ */
+void mbedtls_net_init( mbedtls_net_context *ctx )
+{
+    ctx->fd = -1;
+}
+
+/*
+ * Initiate a TCP connection with host:port and the given protocol
+ */
+int mbedtls_net_connect( mbedtls_net_context *ctx, const char *host, const char *port, int proto )
+{
+#if defined(MBEDTLS_HAVE_IPV6)
+    int ret;
+    struct addrinfo hints, *addr_list, *cur;
+
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
+
+    /* Do name resolution with both IPv6 and IPv4 */
+    memset( &hints, 0, sizeof( hints ) );
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = proto == MBEDTLS_NET_PROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
+    hints.ai_protocol = proto == MBEDTLS_NET_PROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
+
+    if( getaddrinfo( host, port, &hints, &addr_list ) != 0 )
+        return( MBEDTLS_ERR_NET_UNKNOWN_HOST );
+
+    /* Try the sockaddrs until a connection succeeds */
+    ret = MBEDTLS_ERR_NET_UNKNOWN_HOST;
+    for( cur = addr_list; cur != NULL; cur = cur->ai_next )
+    {
+        ctx->fd = (int) socket( cur->ai_family, cur->ai_socktype,
+                            cur->ai_protocol );
+        if( ctx->fd < 0 )
+        {
+            ret = MBEDTLS_ERR_NET_SOCKET_FAILED;
+            continue;
+        }
+
+        if( connect( ctx->fd, cur->ai_addr, MSVC_INT_CAST cur->ai_addrlen ) == 0 )
+        {
+            ret = 0;
+            break;
+        }
+
+        close( ctx->fd );
+        ret = MBEDTLS_ERR_NET_CONNECT_FAILED;
+    }
+
+    freeaddrinfo( addr_list );
+
+    return( ret );
+#else
+    /* Legacy IPv4-only version */
+
+    int ret;
+    int type, protocol;
+    struct sockaddr_in server_addr;
+#if LWIP_DNS  
+    struct hostent *server_host;
+#endif
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
+
+    type = ( proto == MBEDTLS_NET_PROTO_UDP ) ? SOCK_DGRAM : SOCK_STREAM;
+    protocol = ( proto == MBEDTLS_NET_PROTO_UDP ) ? IPPROTO_UDP : IPPROTO_TCP;
+
+#if LWIP_DNS
+    if( ( server_host = gethostbyname( host ) ) == NULL )
+        return( MBEDTLS_ERR_NET_UNKNOWN_HOST );
+
+    if( ( ctx->fd = (int) socket( AF_INET, type, protocol ) ) < 0 )
+        return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+
+    memcpy( (void *) &server_addr.sin_addr,
+            (void *) server_host->h_addr,
+                     server_host->h_length );
+#else
+    if( ( ctx->fd = (int) socket( AF_INET, type, protocol ) ) < 0 )
+        return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+
+    server_addr.sin_len = sizeof(server_addr);
+    server_addr.sin_addr.s_addr = inet_addr(host);
+#endif
+
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_port   = net_htons( atoi(port) );
+
+    if( connect( ctx->fd, (struct sockaddr *) &server_addr,
+                 sizeof( server_addr ) ) < 0 )
+    {
+        close( ctx->fd );
+        return( MBEDTLS_ERR_NET_CONNECT_FAILED );
+    }
+
+    return( 0 );
+#endif /* MBEDTLS_HAVE_IPV6 */
+}
+
+/*
+ * Create a listening socket on bind_ip:port
+ */
+int mbedtls_net_bind( mbedtls_net_context *ctx, const char *bind_ip, const char *port, int proto )
+{
+#if defined(MBEDTLS_HAVE_IPV6)
+    int n, ret;
+    struct addrinfo hints, *addr_list, *cur;
+
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
+
+    /* Bind to IPv6 and/or IPv4, but only in the desired protocol */
+    memset( &hints, 0, sizeof( hints ) );
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = proto == MBEDTLS_NET_PROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
+    hints.ai_protocol = proto == MBEDTLS_NET_PROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
+    if( bind_ip == NULL )
+        hints.ai_flags = AI_PASSIVE;
+
+    if( getaddrinfo( bind_ip, port, &hints, &addr_list ) != 0 )
+        return( MBEDTLS_ERR_NET_UNKNOWN_HOST );
+
+    /* Try the sockaddrs until a binding succeeds */
+    ret = MBEDTLS_ERR_NET_UNKNOWN_HOST;
+    for( cur = addr_list; cur != NULL; cur = cur->ai_next )
+    {
+        ctx->fd = (int) socket( cur->ai_family, cur->ai_socktype,
+                            cur->ai_protocol );
+        if( ctx->fd < 0 )
+        {
+            ret = MBEDTLS_ERR_NET_SOCKET_FAILED;
+            continue;
+        }
+
+        n = 1;
+        if( setsockopt( ctx->fd, SOL_SOCKET, SO_REUSEADDR,
+                        (const char *) &n, sizeof( n ) ) != 0 )
+        {
+            close( ctx->fd );
+            ret = MBEDTLS_ERR_NET_SOCKET_FAILED;
+            continue;
+        }
+
+        if( bind( ctx->fd, cur->ai_addr, MSVC_INT_CAST cur->ai_addrlen ) != 0 )
+        {
+            close( ctx->fd );
+            ret = MBEDTLS_ERR_NET_BIND_FAILED;
+            continue;
+        }
+
+        /* Listen only makes sense for TCP */
+        if( proto == MBEDTLS_NET_PROTO_TCP )
+        {
+            if( listen( ctx->fd, MBEDTLS_NET_LISTEN_BACKLOG ) != 0 )
+            {
+                close( ctx->fd );
+                ret = MBEDTLS_ERR_NET_LISTEN_FAILED;
+                continue;
+            }
+        }
+
+        /* I we ever get there, it's a success */
+        ret = 0;
+        break;
+    }
+
+    freeaddrinfo( addr_list );
+
+    return( ret );
+#else
+    /* Legacy IPv4-only version */
+
+    int ret, n, c[4];
+    int type, protocol;
+    struct sockaddr_in server_addr;
+
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
+
+    type = ( proto == MBEDTLS_NET_PROTO_UDP ) ? SOCK_DGRAM : SOCK_STREAM;
+    protocol = ( proto == MBEDTLS_NET_PROTO_UDP ) ? IPPROTO_UDP : IPPROTO_TCP;
+
+    if( ( ctx->fd = (int) socket( AF_INET, type, protocol ) ) < 0 )
+        return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+
+    n = 1;
+    setsockopt( ctx->fd, SOL_SOCKET, SO_REUSEADDR,
+                (const char *) &n, sizeof( n ) );
+
+    server_addr.sin_addr.s_addr = net_htonl( INADDR_ANY );
+    server_addr.sin_family      = AF_INET;
+    server_addr.sin_port        = net_htons( atoi(port) );
+
+    if( bind_ip != NULL )
+    {
+        memset( c, 0, sizeof( c ) );
+        sscanf( bind_ip, "%d.%d.%d.%d", &c[0], &c[1], &c[2], &c[3] );
+
+        for( n = 0; n < 4; n++ )
+            if( c[n] < 0 || c[n] > 255 )
+                break;
+
+        if( n == 4 )
+            server_addr.sin_addr.s_addr = net_htonl(
+                ( (uint32_t) c[0] << 24 ) |
+                ( (uint32_t) c[1] << 16 ) |
+                ( (uint32_t) c[2] <<  8 ) |
+                ( (uint32_t) c[3]       ) );
+    }
+
+    if( bind( ctx->fd, (struct sockaddr *) &server_addr,
+              sizeof( server_addr ) ) < 0 )
+    {
+        close( ctx->fd );
+        return( MBEDTLS_ERR_NET_BIND_FAILED );
+    }
+
+    /* Listen only makes sense for TCP */
+    if( proto == MBEDTLS_NET_PROTO_TCP )
+    {
+        if( listen( ctx->fd, MBEDTLS_NET_LISTEN_BACKLOG ) != 0 )
+        {
+            close( ctx->fd );
+            return( MBEDTLS_ERR_NET_LISTEN_FAILED );
+        }
+    }
+
+    return( 0 );
+#endif /* MBEDTLS_HAVE_IPV6 */
+}
+
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+/*
+ * Check if the requested operation would be blocking on a non-blocking socket
+ * and thus 'failed' with a negative return value.
+ */
+static int net_would_block( const mbedtls_net_context *ctx )
+{
+    ((void) ctx);
+    return( WSAGetLastError() == WSAEWOULDBLOCK );
+}
+#else
+/*
+ * Check if the requested operation would be blocking on a non-blocking socket
+ * and thus 'failed' with a negative return value.
+ *
+ * Note: on a blocking socket this function always returns 0!
+ */
+static int net_would_block( const mbedtls_net_context *ctx )
+{
+    /*
+     * Never return 'WOULD BLOCK' on a non-blocking socket
+     */
+    if( ( fcntl( ctx->fd, F_GETFL , 0 ) & O_NONBLOCK ) != O_NONBLOCK )
+        return( 0 );
+
+    switch( errno )
+    {
+#if defined EAGAIN
+        case EAGAIN:
+#endif
+#if defined EWOULDBLOCK && EWOULDBLOCK != EAGAIN
+        case EWOULDBLOCK:
+#endif
+            return( 1 );
+    }
+    return( 0 );
+}
+#endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
+
+/*
+ * Accept a connection from a remote client
+ */
+int mbedtls_net_accept( mbedtls_net_context *bind_ctx,
+                        mbedtls_net_context *client_ctx,
+                        void *client_ip, size_t buf_size, size_t *ip_len )
+{
+    int ret;
+    int type;
+
+#if defined(MBEDTLS_HAVE_IPV6)
+    struct sockaddr_storage client_addr;
+#else
+    struct sockaddr_in client_addr;
+#endif
+
+#if defined(__socklen_t_defined) || defined(_SOCKLEN_T) ||  \
+    defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t)
+    socklen_t n = (socklen_t) sizeof( client_addr );
+    socklen_t type_len = (socklen_t) sizeof( type );
+#else
+    int n = (int) sizeof( client_addr );
+    int type_len = (int) sizeof( type );
+#endif
+
+    /* Is this a TCP or UDP socket? */
+    if( getsockopt( bind_ctx->fd, SOL_SOCKET, SO_TYPE,
+                    (void *) &type, &type_len ) != 0 ||
+        ( type != SOCK_STREAM && type != SOCK_DGRAM ) )
+    {
+        return( MBEDTLS_ERR_NET_ACCEPT_FAILED );
+    }
+
+    if( type == SOCK_STREAM )
+    {
+        /* TCP: actual accept() */
+        ret = client_ctx->fd = (int) accept( bind_ctx->fd,
+                                         (struct sockaddr *) &client_addr, &n );
+    }
+    else
+    {
+        /* UDP: wait for a message, but keep it in the queue */
+        char buf[1] = { 0 };
+
+        ret = (int) recvfrom( bind_ctx->fd, buf, sizeof( buf ), MSG_PEEK,
+                        (struct sockaddr *) &client_addr, &n );
+
+#if defined(_WIN32)
+        if( ret == SOCKET_ERROR &&
+            WSAGetLastError() == WSAEMSGSIZE )
+        {
+            /* We know buf is too small, thanks, just peeking here */
+            ret = 0;
+        }
+#endif
+    }
+
+    if( ret < 0 )
+    {
+        if( net_would_block( bind_ctx ) != 0 )
+            return( MBEDTLS_ERR_SSL_WANT_READ );
+
+        return( MBEDTLS_ERR_NET_ACCEPT_FAILED );
+    }
+
+    /* UDP: hijack the listening socket to communicate with the client,
+     * then bind a new socket to accept new connections */
+    if( type != SOCK_STREAM )
+    {
+#if defined(MBEDTLS_HAVE_IPV6)
+        struct sockaddr_storage local_addr;
+#else
+        struct sockaddr_in local_addr;
+#endif
+
+        int one = 1;
+
+        if( connect( bind_ctx->fd, (struct sockaddr *) &client_addr, n ) != 0 )
+            return( MBEDTLS_ERR_NET_ACCEPT_FAILED );
+
+        client_ctx->fd = bind_ctx->fd;
+        bind_ctx->fd   = -1; /* In case we exit early */
+
+#if defined(MBEDTLS_HAVE_IPV6)
+        n = sizeof( struct sockaddr_storage );
+        if( getsockname( client_ctx->fd,
+                         (struct sockaddr *) &local_addr, &n ) != 0 ||
+            ( bind_ctx->fd = (int) socket( local_addr.ss_family,
+                                           SOCK_DGRAM, IPPROTO_UDP ) ) < 0 ||
+            setsockopt( bind_ctx->fd, SOL_SOCKET, SO_REUSEADDR,
+                        (const char *) &one, sizeof( one ) ) != 0 )
+        {
+            return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+        }
+#else
+        n = sizeof( struct sockaddr_in );
+        if( getsockname( client_ctx->fd,
+                         (struct sockaddr *) &local_addr, &n ) != 0 ||
+            ( bind_ctx->fd = (int) socket( local_addr.sin_family,
+                                           SOCK_DGRAM, IPPROTO_UDP ) ) < 0 ||
+            setsockopt( bind_ctx->fd, SOL_SOCKET, SO_REUSEADDR,
+                        (const char *) &one, sizeof( one ) ) != 0 )
+        {
+            return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+        }
+#endif
+
+        if( bind( bind_ctx->fd, (struct sockaddr *) &local_addr, n ) != 0 )
+        {
+            return( MBEDTLS_ERR_NET_BIND_FAILED );
+        }
+    }
+
+    if( client_ip != NULL )
+    {
+#if defined(MBEDTLS_HAVE_IPV6)
+        if( client_addr.ss_family == AF_INET )
+        {
+            struct sockaddr_in *addr4 = (struct sockaddr_in *) &client_addr;
+            *ip_len = sizeof( addr4->sin_addr.s_addr );
+
+            if( buf_size < *ip_len )
+                return( MBEDTLS_ERR_NET_BUFFER_TOO_SMALL );
+
+            memcpy( client_ip, &addr4->sin_addr.s_addr, *ip_len );
+        }
+        else
+        {
+            struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &client_addr;
+            *ip_len = sizeof( addr6->sin6_addr.s6_addr );
+
+            if( buf_size < *ip_len )
+                return( MBEDTLS_ERR_NET_BUFFER_TOO_SMALL );
+
+            memcpy( client_ip, &addr6->sin6_addr.s6_addr, *ip_len );
+        }
+#else
+        *ip_len = sizeof( client_addr.sin_addr.s_addr );
+
+        if( buf_size < *ip_len )
+            return( MBEDTLS_ERR_NET_BUFFER_TOO_SMALL );
+
+        memcpy( client_ip, &client_addr.sin_addr.s_addr, *ip_len );
+#endif /* MBEDTLS_HAVE_IPV6 */
+    }
+
+    return( 0 );
+}
+
+/*
+ * Set the socket blocking or non-blocking
+ */
+int mbedtls_net_set_block( mbedtls_net_context *ctx )
+{
+#if ( defined(_WIN32) || defined(_WIN32_WCE) || defined(__ICCARM__) || defined(__CC_ARM)  || defined ( __GNUC__ ) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+    unsigned long n = 0;
+    return( ioctlsocket( ctx->fd, FIONBIO, &n ) );
+#else
+    return( fcntl( ctx->fd, F_SETFL, fcntl( ctx->fd, F_GETFL ) & ~O_NONBLOCK ) );
+#endif
+}
+
+int mbedtls_net_set_nonblock( mbedtls_net_context *ctx )
+{
+#if ( defined(_WIN32) || defined(_WIN32_WCE) || defined(__ICCARM__) || defined(__CC_ARM)  || defined ( __GNUC__ ) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+    unsigned long n = 1;
+    return( ioctlsocket( ctx->fd, FIONBIO, &n ) );
+#else
+    return( fcntl( ctx->fd, F_SETFL, fcntl( ctx->fd, F_GETFL ) | O_NONBLOCK ) );
+#endif
+}
+
+/*
+ * Portable usleep helper
+ */
+void mbedtls_net_usleep( unsigned long usec )
+{
+#if defined(_WIN32)
+    Sleep( ( usec + 999 ) / 1000 );
+#else
+    struct timeval tv;
+    tv.tv_sec  = usec / 1000000;
+#if defined(__unix__) || defined(__unix) || \
+    ( defined(__APPLE__) && defined(__MACH__) )
+    tv.tv_usec = (suseconds_t) usec % 1000000;
+#else
+    tv.tv_usec = usec % 1000000;
+#endif
+    select( 0, NULL, NULL, NULL, &tv );
+#endif
+}
+
+/*
+ * Read at most 'len' characters
+ */
+int mbedtls_net_recv( void *ctx, unsigned char *buf, size_t len )
+{
+    int ret;
+    int fd = ((mbedtls_net_context *) ctx)->fd;
+
+    if( fd < 0 )
+        return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+
+    ret = (int) read( fd, buf, len );
+
+    if( ret < 0 )
+    {
+        if( net_would_block( ctx ) != 0 )
+            return( MBEDTLS_ERR_SSL_WANT_READ );
+
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+        if( WSAGetLastError() == WSAECONNRESET )
+            return( MBEDTLS_ERR_NET_CONN_RESET );
+#else
+#ifdef ERRNO
+        if( errno == EPIPE || errno == ECONNRESET )
+            return( MBEDTLS_ERR_NET_CONN_RESET );
+
+        if( errno == EINTR )
+            return( MBEDTLS_ERR_SSL_WANT_READ );
+#endif
+#endif
+        return( MBEDTLS_ERR_NET_RECV_FAILED );
+    }
+
+    return( ret );
+}
+
+/*
+ * Read at most 'len' characters, blocking for at most 'timeout' ms
+ */
+int mbedtls_net_recv_timeout( void *ctx, unsigned char *buf, size_t len,
+                      uint32_t timeout )
+{
+    int ret;
+    struct timeval tv;
+    fd_set read_fds;
+    int fd = ((mbedtls_net_context *) ctx)->fd;
+
+    if( fd < 0 )
+        return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+
+    FD_ZERO( &read_fds );
+    FD_SET( fd, &read_fds );
+
+    tv.tv_sec  = timeout / 1000;
+    tv.tv_usec = ( timeout % 1000 ) * 1000;
+
+    ret = select( fd + 1, &read_fds, NULL, NULL, timeout == 0 ? NULL : &tv );
+
+    /* Zero fds ready means we timed out */
+    if( ret == 0 )
+        return( MBEDTLS_ERR_SSL_TIMEOUT );
+
+    if( ret < 0 )
+    {
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+        if( WSAGetLastError() == WSAEINTR )
+            return( MBEDTLS_ERR_SSL_WANT_READ );
+#else
+#ifdef ERRNO
+        if( errno == EINTR )
+            return( MBEDTLS_ERR_SSL_WANT_READ );
+#endif
+#endif
+        return( MBEDTLS_ERR_NET_RECV_FAILED );
+    }
+
+    /* This call will not block */
+    return( mbedtls_net_recv( ctx, buf, len ) );
+}
+
+/*
+ * Write at most 'len' characters
+ */
+int mbedtls_net_send( void *ctx, const unsigned char *buf, size_t len )
+{
+    int ret;
+    int fd = ((mbedtls_net_context *) ctx)->fd;
+
+    if( fd < 0 )
+        return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+
+    ret = (int) write( fd, buf, len );
+
+    if( ret < 0 )
+    {
+        if( net_would_block( ctx ) != 0 )
+            return( MBEDTLS_ERR_SSL_WANT_WRITE );
+
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+        if( WSAGetLastError() == WSAECONNRESET )
+            return( MBEDTLS_ERR_NET_CONN_RESET );
+#else
+#ifdef ERRNO
+        if( errno == EPIPE || errno == ECONNRESET )
+            return( MBEDTLS_ERR_NET_CONN_RESET );
+
+        if( errno == EINTR )
+            return( MBEDTLS_ERR_SSL_WANT_WRITE );
+#endif
+#endif
+        return( MBEDTLS_ERR_NET_SEND_FAILED );
+    }
+
+    return( ret );
+}
+
+/*
+ * Gracefully close the connection
+ */
+void mbedtls_net_free( mbedtls_net_context *ctx )
+{
+    if( ctx->fd == -1 )
+        return;
+
+    shutdown( ctx->fd, 2 );
+    close( ctx->fd );
+
+    ctx->fd = -1;
+}
+
+#endif /* MBEDTLS_NET_C */