STM32 Ethernet support

AWS MQTT connection works

Also fixes #1 (because why not).

PUBLISHED_FROM=7b0fa8894f2127335d075f2a97fcd37b932006b2

Author: Deomid Ryabkov

mos.yml

@@ -3,11 +3,18 @@ description: Ethernet support
 type: lib
 version: 1.0
 
-platforms: [ esp32 ]
+platforms: [ esp32, stm32 ]
+
+sources:
+  - src
 
 config_schema:
   - ["eth", "o", {title: "Ethernet settings"}]
   - ["eth.enable", "b", false, {title: "Enable Ethernet interface"}]
+  - ["eth.phy_addr", "i", 0, {title: "(R)MII PHY address"}]
+  - ["eth.ip", "s", {title: "Static IP Address"}]
+  - ["eth.netmask", "s", {title: "Static Netmask"}]
+  - ["eth.gw", "s", {title: "Static Default Gateway"}]
 
 tags:
   - c

mos_esp32.yml

@@ -7,6 +7,5 @@ cdefs:
   # MGOS_ETH_PHY_TLK110: 1
 
 config_schema:
-  - ["eth.phy_addr", "i", 0, {title: "RMII PHY address"}]
   - ["eth.mdc_gpio", "i", 23, {title: "GPIO to use for RMII MDC signal"}]
   - ["eth.mdio_gpio", "i", 18, {title: "GPIO to use for RMII MDIO signal"}]

mos_stm32.yml

@@ -0,0 +1,11 @@
+sources:
+  - src/stm32
+
+config_schema:
+  # OUI = 12:34:56 happens to be a valid Locally Administered Address prefix. Win!
+  - ["eth.mac", "s", "12:34:56:??:??:??", {title: "MAC address. ?? are replaced with bits from chip's unique ID."}]
+  - ["eth.speed", "s", "auto", {title: "Speed and duplex selection: auto, 10HD, 10FD, 100HD, 100FD."}]
+  - ["eth.mtu", "i", 1500, {title: "Interface MTU"}]
+
+cdefs:
+  STM32_ETH_PHY: STM32_ETH_PHY_LAN8742A

src/esp32/esp32_eth.c

@@ -10,6 +10,9 @@
 #include "eth_phy/phy_tlk110.h"
 #include "tcpip_adapter.h"
 
+#include "lwip/ip_addr.h"
+
+#include "mgos_eth.h"
 #include "mgos_net.h"
 #include "mgos_net_hal.h"
 #include "mgos_sys_config.h"
@@ -21,7 +24,18 @@ static void eth_config_pins(void) {
 }
 
 bool mgos_ethernet_init(void) {
-  if (!mgos_sys_config_get_eth_enable()) return true;
+  bool res = false;
+
+  if (!mgos_sys_config_get_eth_enable()) {
+    res = true;
+    goto clean;
+  }
+
+  tcpip_adapter_ip_info_t static_ip;
+  if (!mgos_eth_get_static_ip_config(&static_ip.ip, &static_ip.netmask,
+                                     &static_ip.gw)) {
+    goto clean;
+  }
 
   eth_config_t config;
   const char *phy_model;
@@ -40,17 +54,37 @@ bool mgos_ethernet_init(void) {
   config.gpio_config = eth_config_pins;
   config.tcpip_input = tcpip_adapter_eth_input;
 
-  LOG(LL_INFO,
-      ("Eth init: %s PHY @ %d", phy_model, mgos_sys_config_get_eth_phy_addr()));
   esp_err_t ret = esp_eth_init(&config);
-  if (ret == ESP_OK) {
-    esp_eth_enable();
-  } else {
+  if (ret != ESP_OK) {
     LOG(LL_ERROR, ("Ethernet init failed: %d", ret));
     return false;
   }
 
-  return true;
+  uint8_t mac[6];
+  esp_eth_get_mac(mac);
+  bool is_dhcp = ip4_addr_isany_val(static_ip.ip);
+
+  LOG(LL_INFO,
+      ("ETH: MAC %02x:%02x:%02x:%02x:%02x:%02x; PHY: %s @ %d%s", mac[0], mac[1],
+       mac[2], mac[3], mac[4], mac[5], phy_model,
+       mgos_sys_config_get_eth_phy_addr(), (is_dhcp ? "; IP: DHCP" : "")));
+  if (!is_dhcp) {
+    char ips[16], nms[16], gws[16];
+    ip4addr_ntoa_r(&static_ip.ip, ips, sizeof(ips));
+    ip4addr_ntoa_r(&static_ip.netmask, nms, sizeof(nms));
+    ip4addr_ntoa_r(&static_ip.gw, gws, sizeof(gws));
+    LOG(LL_INFO, ("ETH: IP %s/%s, GW %s", ips, nms, gws));
+    tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_ETH);
+    if (tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_ETH, &static_ip) != ESP_OK) {
+      LOG(LL_ERROR, ("ETH: Failed to set ip info"));
+      goto clean;
+    }
+  }
+
+  res = (esp_eth_enable() == ESP_OK);
+
+clean:
+  return res;
 }
 
 bool mgos_eth_dev_get_ip_info(int if_instance,

src/mgos_eth.c

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2014-2018 Cesanta Software Limited
+ * All rights reserved
+ */
+
+#include "mgos_eth.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "lwip/ip_addr.h"
+
+#include "mgos_sys_config.h"
+
+const char *mgos_eth_speed_str(enum mgos_eth_speed speed) {
+  switch (speed) {
+    case MGOS_ETH_SPEED_AUTO:
+      return "auto";
+    case MGOS_ETH_SPEED_10M:
+      return "10";
+    case MGOS_ETH_SPEED_100M:
+      return "100";
+  }
+  return "";
+}
+
+const char *mgos_eth_duplex_str(enum mgos_eth_duplex duplex) {
+  switch (duplex) {
+    case MGOS_ETH_DUPLEX_AUTO:
+      return "auto";
+    case MGOS_ETH_DUPLEX_HALF:
+      return "half";
+    case MGOS_ETH_DUPLEX_FULL:
+      return "full";
+  }
+  return "";
+}
+
+bool mgos_eth_phy_opts_from_str(const char *str,
+                                struct mgos_eth_phy_opts *opts) {
+  if (str == NULL) return false;
+
+  memset(opts, 0, sizeof(*opts));
+
+  opts->autoneg_on = (strcmp(str, "auto") == 0);
+
+  if (opts->autoneg_on) {
+    return true;
+  }
+
+  size_t len = strlen(str);
+
+  char *end = NULL;
+  switch (strtol(str, &end, 10)) {
+    case 10:
+      opts->speed = MGOS_ETH_SPEED_10M;
+      break;
+    case 100:
+      opts->speed = MGOS_ETH_SPEED_100M;
+      break;
+    default:
+      return false;
+  }
+
+  if (len - (end - str) != 2) return false;
+  if (strcmp(end, "FD")) {
+    opts->duplex = MGOS_ETH_DUPLEX_FULL;
+  } else if (strcmp(end, "HD")) {
+    opts->duplex = MGOS_ETH_DUPLEX_HALF;
+  } else {
+    return false;
+  }
+
+  return true;
+}
+
+bool mgos_eth_get_static_ip_config(ip4_addr_t *ip, ip4_addr_t *netmask,
+                                   ip4_addr_t *gw) {
+  bool res = false;
+  memset(ip, 0, sizeof(*ip));
+  memset(netmask, 0, sizeof(*netmask));
+  memset(gw, 0, sizeof(*gw));
+
+  if (mgos_sys_config_get_eth_ip() == NULL) {
+    res = true;
+    goto clean;
+  }
+
+  if (!ip4addr_aton(mgos_sys_config_get_eth_ip(), ip)) {
+    LOG(LL_ERROR, ("Invalid eth.ip!"));
+    goto clean;
+  }
+  if (mgos_sys_config_get_eth_netmask() == NULL ||
+      !ip4addr_aton(mgos_sys_config_get_eth_netmask(), netmask)) {
+    LOG(LL_ERROR, ("Invalid eth.netmask!"));
+    goto clean;
+  }
+  if (mgos_sys_config_get_eth_gw() != NULL &&
+      !ip4addr_aton(mgos_sys_config_get_eth_gw(), gw)) {
+    LOG(LL_ERROR, ("Invalid eth.gw!"));
+    goto clean;
+  }
+
+  res = true;
+
+clean:
+  return res;
+}

src/mgos_eth.h

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2014-2018 Cesanta Software Limited
+ * All rights reserved
+ */
+
+#ifndef CS_MOS_LIBS_ETHERNET_SRC_MGOS_ETH_H_
+#define CS_MOS_LIBS_ETHERNET_SRC_MGOS_ETH_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum mgos_eth_speed {
+  MGOS_ETH_SPEED_AUTO = 0,
+  MGOS_ETH_SPEED_10M,
+  MGOS_ETH_SPEED_100M,
+};
+
+enum mgos_eth_duplex {
+  MGOS_ETH_DUPLEX_AUTO = 0,
+  MGOS_ETH_DUPLEX_HALF,
+  MGOS_ETH_DUPLEX_FULL,
+};
+
+struct mgos_eth_phy_opts {
+  enum mgos_eth_speed speed;
+  enum mgos_eth_duplex duplex;
+  bool autoneg_on;
+};
+
+struct mgos_eth_opts {
+  int phy_addr;
+  struct mgos_eth_phy_opts phy_opts;
+  uint8_t mac[6];
+  int mtu;
+};
+
+const char *mgos_eth_speed_str(enum mgos_eth_speed speed);
+const char *mgos_eth_duplex_str(enum mgos_eth_duplex duplex);
+bool mgos_eth_phy_opts_from_str(const char *str,
+                                struct mgos_eth_phy_opts *opts);
+bool mgos_eth_get_static_ip_config(ip4_addr_t *ip, ip4_addr_t *netmask,
+                                   ip4_addr_t *gw);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* CS_MOS_LIBS_ETHERNET_SRC_MGOS_ETH_H_ */