scratch/libretiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[beken-72xx] Implement broken WiFi station

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2022-06-28 22:49:28 +02:00
parent a8228851d9
commit ded6638ef6
14 changed files with 335 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -54,19 +54,19 @@ SoftwareSerial | ❌ | ❌
SPI | ❌ | ❌
Wire | ❗ | ❌
**OTHER LIBRARIES** | |
Wi-Fi STA/AP/Mixed | ✔️ | ❌
Wi-Fi STA/AP/Mixed | ✔️ | ❗/❌/❌
Wi-Fi Events | ✔️ | ❌
TCP Client (SSL) | ✔️ (✔️) | ❌
TCP Server | ✔️ | ❌
TCP Client (SSL) | ✔️ (✔️) | ❓
TCP Server | ✔️ | ❓
IPv6 | ❌ | ❌
HTTP Client (SSL) | ✔️ (✔️) | ❌
HTTP Server | ✔️ | ❌
HTTP Client (SSL) | ✔️ (✔️) | ❓
HTTP Server | ✔️ | ❓
NVS / Preferences | ❌ | ❌
SPIFFS | ❌ | ❌
BLE | - | ❌
NTP | ❌ | ❌
OTA | ✔️ | ❌
MDNS | ✔️ | ❌
MDNS | ✔️ | ❓
MQTT | ✅ | ❌
SD | ❌ | ❌

23
arduino/beken-72xx/libraries/WiFi/WiFi.cpp
View File

@@ -10,6 +10,29 @@ WiFiClass::~WiFiClass() {
vSemaphoreDelete(data.scanSem);
}
WiFiStatus eventTypeToStatus(uint8_t type) {
// rw_msg_pub.h:9
switch (type) {
case RW_EVT_STA_IDLE:
return WL_IDLE_STATUS;
return WL_NO_SSID_AVAIL;
case RW_EVT_STA_CONNECTING:
case RW_EVT_STA_CONNECTED:
return WL_SCAN_COMPLETED;
case RW_EVT_STA_GOT_IP:
return WL_CONNECTED;
case RW_EVT_STA_PASSWORD_WRONG:
case RW_EVT_STA_NO_AP_FOUND:
case RW_EVT_STA_ASSOC_FULL:
case RW_EVT_STA_CONNECT_FAILED:
return WL_CONNECT_FAILED;
case RW_EVT_STA_BEACON_LOSE:
return WL_CONNECTION_LOST;
case RW_EVT_STA_DISCONNECTED:
return WL_DISCONNECTED;
}
}
WiFiAuthMode securityTypeToAuthMode(uint8_t type) {
// wlan_ui_pub.h:62
switch (type) {

4
arduino/beken-72xx/libraries/WiFi/WiFi.h
View File

@@ -4,3 +4,7 @@
#include <Arduino.h>
#include <api/WiFi/WiFi.h>
#include "WiFiClient.h"
#include "WiFiClientSecure.h"
#include "WiFiServer.h"

8
arduino/beken-72xx/libraries/WiFi/WiFiClient.h Normal file
View File

@@ -0,0 +1,8 @@
/* Copyright (c) Kuba Szczodrzyński 2022-06-27. */
#pragma once
#include <api/WiFi/WiFi.h>
#include <lwip/LwIPClient.h>
typedef LwIPClient WiFiClient;

8
arduino/beken-72xx/libraries/WiFi/WiFiClientSecure.h Normal file
View File

@@ -0,0 +1,8 @@
/* Copyright (c) Kuba Szczodrzyński 2022-05-04. */
#pragma once
#include <api/WiFi/WiFi.h>
#include <ssl/MbedTLSClient.h>
typedef MbedTLSClient WiFiClientSecure;

6
arduino/beken-72xx/libraries/WiFi/WiFiData.h
View File

@@ -12,5 +12,11 @@ extern "C" {
} // extern "C"
typedef struct {
char ssid[32 + 1];
char pass[64 + 1];
uint32_t ipSta[4];
uint32_t ipAp[4];
SemaphoreHandle_t scanSem;
void *statusIp;
void *statusLink;
} WiFiData;

30
arduino/beken-72xx/libraries/WiFi/WiFiGeneric.cpp
View File

@@ -5,6 +5,11 @@
bool WiFiClass::modePriv(WiFiMode mode, WiFiModeAction sta, WiFiModeAction ap) {
__wrap_bk_printf_disable();
if (mode && !data.statusIp) {
data.statusIp = (IPStatusTypedef *)malloc(sizeof(IPStatusTypedef));
data.statusLink = (LinkStatusTypeDef *)malloc(sizeof(LinkStatusTypeDef));
}
if (!__bk_rf_is_init) {
LT_D_WG("Initializing func&app");
func_init_extended();
@@ -32,6 +37,13 @@ bool WiFiClass::modePriv(WiFiMode mode, WiFiModeAction sta, WiFiModeAction ap) {
bk_wlan_stop(BK_SOFT_AP);
}
if (!mode) {
free(data.statusIp);
free(data.statusLink);
data.statusIp = NULL;
data.statusLink = NULL;
}
LT_HEAP_I();
__wrap_bk_printf_enable();
@@ -46,10 +58,16 @@ WiFiMode WiFiClass::getMode() {
}
WiFiStatus WiFiClass::status() {
// wpa_suppliant_ctrl_get_wpas()->disconnected;
if (wpas_connect_ssid && wpas_connect_ssid->ssid_len) {
return WL_CONNECTED;
} else {
return WL_DISCONNECTED;
}
auto status = mhdr_get_station_status();
LT_D_WG("mhdr_get_station_status()=%d", status);
return eventTypeToStatus(status);
}
IPAddress WiFiClass::hostByName(const char *hostname) {
ip_addr_t ip;
int ret = netconn_gethostbyname(hostname, &ip);
if (ret == ERR_OK) {
return ip.addr;
}
return IPAddress();
}

24
arduino/beken-72xx/libraries/WiFi/WiFiPriv.h
View File

@@ -2,14 +2,19 @@
#pragma once
#include "WiFi.h"
#include <api/WiFi/WiFi.h>
extern "C" {
#include <lwip/api.h>
#include <lwip/ip_addr.h>
#include <lwip/netif.h>
#include <FreeRTOS.h>
#include <semphr.h>
#include <common.h>
#include <config.h>
#include <main_none.h>
#include <param_config.h>
#include <rw_msg_rx.h>
@@ -23,6 +28,10 @@ extern void bk_wlan_ap_init(network_InitTypeDef_st *inNetworkInitPara);
// func/hostapd-2.5/wpa_supplicant/main_supplicant.c
extern struct wpa_ssid_value *wpas_connect_ssid;
// func/lwip_intf/lwip-2.0.2/port/net.c
extern struct netif *net_get_sta_handle(void);
extern struct netif *net_get_uap_handle(void);
// app/param_config.c
extern general_param_t *g_wlan_general_param;
extern ap_param_t *g_ap_param_ptr;
@@ -30,6 +39,19 @@ extern sta_param_t *g_sta_param_ptr;
extern uint8_t system_mac[6];
// WiFi.cpp
WiFiStatus eventTypeToStatus(uint8_t type);
WiFiAuthMode securityTypeToAuthMode(uint8_t type);
#define ADDR_STA_IP data.ipSta[0]
#define ADDR_STA_MASK data.ipSta[1]
#define ADDR_STA_GW data.ipSta[2]
#define ADDR_STA_DNS data.ipSta[3]
#define ADDR_AP_IP data.ipAp[0]
#define ADDR_AP_MASK data.ipAp[1]
#define ADDR_AP_GW data.ipAp[2]
#define ADDR_AP_DNS data.ipAp[3]
#define IP_STATUS ((IPStatusTypedef *)data.statusIp)
#define LINK_STATUS ((LinkStatusTypeDef *)data.statusLink)
} // extern "C"

209
arduino/beken-72xx/libraries/WiFi/WiFiSTA.cpp Normal file
View File

@@ -0,0 +1,209 @@
/* Copyright (c) Kuba Szczodrzyński 2022-06-27. */
#include "WiFiPriv.h"
WiFiStatus
WiFiClass::begin(const char *ssid, const char *passphrase, int32_t channel, const uint8_t *bssid, bool connect) {
enableSTA(true);
if (!ssid || *ssid == 0x00 || strlen(ssid) > 32) {
LT_W("SSID not specified or too long");
return WL_CONNECT_FAILED;
}
if (passphrase && strlen(passphrase) > 64) {
LT_W("Passphrase too long");
return WL_CONNECT_FAILED;
}
// store the network data for later
strcpy(data.ssid, ssid);
if (passphrase)
strcpy(data.pass, passphrase);
else
data.pass[0] = 0;
if (reconnect(bssid))
return WL_CONNECTED;
return WL_CONNECT_FAILED;
}
bool WiFiClass::config(IPAddress localIP, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2) {
ADDR_STA_IP = (uint32_t)localIP;
ADDR_STA_GW = (uint32_t)gateway;
ADDR_STA_MASK = (uint32_t)subnet;
ADDR_STA_DNS = (uint32_t)dns1;
if (status() == WL_CONNECTED) {
IPStatusTypedef config;
config.dhcp = !localIP[0];
if (localIP) {
sprintf(config.ip, "%u.%u.%u.%u", ADDR_STA_IP);
sprintf(config.mask, "%u.%u.%u.%u", ADDR_STA_MASK);
sprintf(config.gate, "%u.%u.%u.%u", ADDR_STA_GW);
}
if (dns1)
sprintf(config.dns, "%u.%u.%u.%u", ADDR_STA_DNS);
bk_wlan_set_ip_status(&config, BK_STATION);
}
return true;
}
bool WiFiClass::reconnect(const uint8_t *bssid) {
if (!bssid && !data.ssid[0]) {
LT_E("(B)SSID not specified");
goto error;
}
LT_D_WG("Connecting to " MACSTR, MAC2STR(bssid));
network_InitTypeDef_st config;
memset(&config, 0, sizeof(network_InitTypeDef_st));
// network_InitTypeDef_adv_st config;
// memset(&config, 0, sizeof(network_InitTypeDef_adv_st));
config.wifi_mode = BK_STATION;
config.wifi_retry_interval = 100;
// config.ap_info.security = BK_SECURITY_TYPE_WPA2_MIXED;
// config.ap_info.channel = 6;
strcpy(config.wifi_ssid, data.ssid);
// strcpy(config.ap_info.ssid, data.ssid);
strcpy(config.wifi_key, data.pass);
// strcpy(config.key, data.pass);
// config.key_len = strlen(data.pass);
if (bssid)
memcpy(config.wifi_bssid, bssid, 6);
// memcpy(config.ap_info.bssid, bssid, 6);
if (ADDR_STA_IP && ADDR_STA_MASK && ADDR_STA_GW) {
config.dhcp_mode = DHCP_DISABLE;
sprintf(config.local_ip_addr, "%u.%u.%u.%u", ADDR_STA_IP);
sprintf(config.net_mask, "%u.%u.%u.%u", ADDR_STA_MASK);
sprintf(config.gateway_ip_addr, "%u.%u.%u.%u", ADDR_STA_GW);
LT_D_WG("Static IP: %s / %s / %s", config.local_ip_addr, config.net_mask, config.gateway_ip_addr);
} else {
config.dhcp_mode = DHCP_CLIENT;
LT_D_WG("Using DHCP");
}
if (ADDR_STA_DNS) {
sprintf(config.dns_server_ip_addr, "%u.%u.%u.%u", ADDR_STA_DNS);
LT_D_WG("Static DNS: %s", config.dns_server_ip_addr);
}
LT_D_WG("Starting WiFi...");
bk_wlan_start_sta(&config);
LT_D_WG("bk_wlan_start() OK");
return true;
error:
return false;
}
bool WiFiClass::disconnect(bool wifiOff) {
bk_wlan_connection_loss();
return true;
}
bool WiFiClass::setAutoReconnect(bool autoReconnect) {
return false;
}
bool WiFiClass::getAutoReconnect() {
return false;
}
IPAddress WiFiClass::localIP() {
IPStatusTypedef config;
bk_wlan_get_ip_status(&config, BK_STATION);
IPAddress ip;
ip.fromString(config.ip);
return ip;
}
IPAddress WiFiClass::subnetMask() {
IPStatusTypedef config;
bk_wlan_get_ip_status(&config, BK_STATION);
IPAddress ip;
ip.fromString(config.mask);
return ip;
}
IPAddress WiFiClass::gatewayIP() {
IPStatusTypedef config;
bk_wlan_get_ip_status(&config, BK_STATION);
IPAddress ip;
ip.fromString(config.gate);
return ip;
}
IPAddress WiFiClass::dnsIP(uint8_t dns_no) {
IPStatusTypedef config;
bk_wlan_get_ip_status(&config, BK_STATION);
IPAddress ip;
ip.fromString(config.dns);
return ip;
}
IPAddress WiFiClass::broadcastIP() {
return calculateBroadcast(localIP(), subnetMask());
}
const char *WiFiClass::getHostname() {
struct netif *ifs = net_get_sta_handle();
return netif_get_hostname(ifs);
}
bool WiFiClass::setHostname(const char *hostname) {
struct netif *ifs = net_get_sta_handle();
netif_set_hostname(ifs, (char *)hostname);
return true;
}
uint8_t *WiFiClass::macAddress(uint8_t *mac) {
wifi_get_mac_address((char *)mac, CONFIG_ROLE_STA);
return mac;
}
bool WiFiClass::setMacAddress(const uint8_t *mac) {
wifi_set_mac_address((char *)mac);
return true;
}
const String WiFiClass::SSID() {
if (!isConnected() || !wpas_connect_ssid)
return "";
return (char *)wpas_connect_ssid->ssid;
}
const String WiFiClass::psk() {
if (!isConnected())
return "";
struct wpa_supplicant *wpas = wpa_suppliant_ctrl_get_wpas();
if (!wpas || !wpas->conf || !wpas->conf->ssid)
return "";
return (char *)wpas->conf->ssid->passphrase;
}
uint8_t *WiFiClass::BSSID() {
if (!isConnected())
return NULL;
bk_wlan_get_link_status(LINK_STATUS);
return LINK_STATUS->bssid;
}
int32_t WiFiClass::channel() {
bk_wlan_get_link_status(LINK_STATUS);
return LINK_STATUS->channel;
}
int8_t WiFiClass::RSSI() {
bk_wlan_get_link_status(LINK_STATUS);
return LINK_STATUS->wifi_strength;
}
WiFiAuthMode WiFiClass::getEncryption() {
bk_wlan_get_link_status(LINK_STATUS);
return securityTypeToAuthMode(LINK_STATUS->security);
}

8
arduino/beken-72xx/libraries/WiFi/WiFiServer.h Normal file
View File

@@ -0,0 +1,8 @@
/* Copyright (c) Kuba Szczodrzyński 2022-06-27. */
#pragma once
#include <api/WiFi/WiFi.h>
#include <lwip/LwIPServer.h>
typedef LwIPServer WiFiServer;

2
arduino/libretuya/api/WiFi/WiFi.h
View File

@@ -48,7 +48,6 @@ class WiFiClass {
void printDiag(Print &dest);
public: /* WiFiGeneric.cpp */
int32_t channel(void);
bool mode(WiFiMode mode);
bool modePriv(WiFiMode mode, WiFiModeAction sta, WiFiModeAction ap);
WiFiMode getMode();
@@ -135,6 +134,7 @@ class WiFiClass {
const String psk();
uint8_t *BSSID();
String BSSIDstr();
int32_t channel();
int8_t RSSI();
WiFiAuthMode getEncryption();

4
builder/frameworks/beken-72xx-arduino.py
View File

@@ -23,6 +23,10 @@ env.Append(
"-Wno-missing-braces",
"-Wno-attributes",
],
CPPDEFINES=[
# LibreTuya configuration
("LT_ARD_HAS_WIFI", "1"),
],
LINKFLAGS=[
# stdio wrappers (port/printf/printf.c)
"-Wl,-wrap,bk_printf",

5
builder/frameworks/beken-72xx-sdk.py
View File

@@ -66,7 +66,10 @@ env.Append(
],
CPPDEFINES=[
# LibreTuya configuration
# (reserved)
("LT_HAS_LWIP", "1"),
("LT_HAS_LWIP2", "1"),
("LT_HAS_FREERTOS", "1"),
("LT_HAS_MBEDTLS", "1"),
# SDK options
("CFG_OS_FREERTOS", "1"),
("MBEDTLS_CONFIG_FILE", "<tls_config.h>"),

7
platform/beken-72xx/fixups/inc/lwipopts.h Normal file
View File

@@ -0,0 +1,7 @@
/* Copyright (c) Kuba Szczodrzyński 2022-06-27. */
#pragma once
#include_next "lwipopts.h"
#define LWIP_MDNS_RESPONDER 1