meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates based on PR review feedback from liamcottle

Browse source
This commit is contained in:
Ryan Gregg 2026-03-10 22:35:31 -07:00
parent ffe0853d7f
commit 3e9ceba24a
9 changed files with 237 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/pr-build-check.yml vendored
View file

@ -23,11 +23,11 @@ jobs:
- Heltec_v3_room_server
# nRF52
- RAK_4631_companion_radio_ble
- RAK_4631_companion_radio_eth
- RAK_4631_companion_radio_ethernet
- RAK_4631_repeater
- RAK_4631_repeater_eth
- RAK_4631_repeater_ethernet
- RAK_4631_room_server
- RAK_4631_room_server_eth
- RAK_4631_room_server_ethernet
# RP2040
- PicoW_repeater
# STM32

20
examples/companion_radio/main.cpp
View file

@ -75,7 +75,7 @@ static uint32_t _atoi(const char* sp) {
#ifdef BLE_PIN_CODE
#include <helpers/nrf52/SerialBLEInterface.h>
SerialBLEInterface serial_interface;
#elif defined(ETH_ENABLED)
#elif defined(ETHERNET_ENABLED)
#include <helpers/nrf52/SerialEthernetInterface.h>
SerialEthernetInterface serial_interface;
#else
@ -83,7 +83,7 @@ static uint32_t _atoi(const char* sp) {
ArduinoSerialInterface serial_interface;
#endif
#elif defined(STM32_PLATFORM)
#ifdef ETH_ENABLED
#ifdef ETHERNET_ENABLED
#include <helpers/nrf52/SerialEthernetInterface.h>
SerialEthernetInterface serial_interface;
#else
@ -160,18 +160,14 @@ void setup() {
#ifdef BLE_PIN_CODE
serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
#elif defined(ETH_ENABLED)
#elif defined(ETHERNET_ENABLED)
Serial.print("Waiting for serial to connect...\n");
time_t timeout = millis();
// Initialize Serial for debug output.
while (!Serial)
{
while (!Serial) {
if ((millis() - timeout) < 5000) { delay(100); } else { break; }
}
Serial.print("Initializing ethernet adapter....\n");
bool result = serial_interface.begin();
if (!result) {
Serial.println("Initializing Ethernet adapter...");
if (!serial_interface.begin()) {
Serial.println("ETH: Init failed, halting");
halt();
}
@ -249,7 +245,7 @@ void loop() {
#endif
rtc_clock.tick();
#ifdef ETH_ENABLED
serial_interface.maintain();
#ifdef ETHERNET_ENABLED
serial_interface.loop();
#endif
}

141
examples/simple_repeater/main.cpp
View file

@ -8,45 +8,38 @@
static UITask ui_task(display);
#endif
#ifdef ETH_ENABLED
#ifdef ETHERNET_ENABLED
#include <SPI.h>
#include <RAK13800_W5100S.h>
#include <helpers/nrf52/EthernetMac.h>
#define PIN_SPI1_MISO (29)
#define PIN_SPI1_MOSI (30)
#define PIN_SPI1_SCK (3)
SPIClass ETH_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
SPIClass ETHERNET_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
#define PIN_ETH_POWER_EN WB_IO2
#define PIN_ETHERNET_POWER_EN WB_IO2
#define PIN_ETHERNET_RESET 21
#define PIN_ETHERNET_SS 26
#ifndef ETH_TCP_PORT
#define ETH_TCP_PORT 23 // telnet port for CLI access
#ifndef ETHERNET_TCP_PORT
#define ETHERNET_TCP_PORT 23 // telnet port for CLI access
#endif
#define ETH_RETRY_INTERVAL_MS 30000
#define ETHERNET_RETRY_INTERVAL_MS 30000
static EthernetServer eth_server(ETH_TCP_PORT);
static EthernetClient eth_client;
static volatile bool eth_running = false;
static void generateDeviceMac(uint8_t mac[6]) {
uint32_t device_id = NRF_FICR->DEVICEID[0];
mac[0] = 0x02; mac[1] = 0x92; mac[2] = 0x1F;
mac[3] = (device_id >> 16) & 0xFF;
mac[4] = (device_id >> 8) & 0xFF;
mac[5] = device_id & 0xFF;
}
static EthernetServer ethernet_server(ETHERNET_TCP_PORT);
static EthernetClient ethernet_client;
static volatile bool ethernet_running = false;
// FreeRTOS task: handles hw init, DHCP, and retries in the background
static void eth_task(void* param) {
static void ethernet_task(void* param) {
(void)param;
// Hardware init
Serial.println("ETH: Initializing hardware");
pinMode(PIN_ETH_POWER_EN, OUTPUT);
digitalWrite(PIN_ETH_POWER_EN, HIGH);
pinMode(PIN_ETHERNET_POWER_EN, OUTPUT);
digitalWrite(PIN_ETHERNET_POWER_EN, HIGH);
vTaskDelay(pdMS_TO_TICKS(100));
pinMode(PIN_ETHERNET_RESET, OUTPUT);
@ -54,8 +47,8 @@
vTaskDelay(pdMS_TO_TICKS(100));
digitalWrite(PIN_ETHERNET_RESET, HIGH);
ETH_SPI_PORT.begin();
Ethernet.init(ETH_SPI_PORT, PIN_ETHERNET_SS);
ETHERNET_SPI_PORT.begin();
Ethernet.init(ETHERNET_SPI_PORT, PIN_ETHERNET_SS);
uint8_t mac[6];
generateDeviceMac(mac);
@ -63,7 +56,7 @@
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
// Retry loop: keep trying until we get an IP
while (!eth_running) {
while (!ethernet_running) {
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
Serial.println("ETH: Hardware not found, giving up");
vTaskDelete(NULL);
@ -71,56 +64,56 @@
}
if (Ethernet.linkStatus() == LinkOFF) {
vTaskDelay(pdMS_TO_TICKS(ETH_RETRY_INTERVAL_MS));
vTaskDelay(pdMS_TO_TICKS(ETHERNET_RETRY_INTERVAL_MS));
continue;
}
Serial.println("ETH: Link detected, attempting DHCP...");
if (Ethernet.begin(mac, 10000, 2000) == 0) {
Serial.println("ETH: DHCP failed, will retry");
vTaskDelay(pdMS_TO_TICKS(ETH_RETRY_INTERVAL_MS));
vTaskDelay(pdMS_TO_TICKS(ETHERNET_RETRY_INTERVAL_MS));
continue;
}
IPAddress ip = Ethernet.localIP();
Serial.printf("ETH: IP: %u.%u.%u.%u\n", ip[0], ip[1], ip[2], ip[3]);
Serial.printf("ETH: Listening on TCP port %d\n", ETH_TCP_PORT);
eth_server.begin();
eth_running = true;
Serial.printf("ETH: Listening on TCP port %d\n", ETHERNET_TCP_PORT);
ethernet_server.begin();
ethernet_running = true;
}
// DHCP succeeded, task is done
vTaskDelete(NULL);
}
static void eth_start_task() {
xTaskCreate(eth_task, "eth_init", 1024, NULL, 1, NULL);
static void ethernet_start_task() {
xTaskCreate(ethernet_task, "eth_init", 1024, NULL, 1, NULL);
}
// Format ethernet status into reply buffer. Returns true if command was handled.
static bool eth_handle_command(const char* command, char* reply) {
static bool ethernet_handle_command(const char* command, char* reply) {
if (strcmp(command, "eth") != 0) return false;
if (!eth_running) {
if (!ethernet_running) {
strcpy(reply, "ETH: not connected");
} else {
IPAddress ip = Ethernet.localIP();
sprintf(reply, "ETH: %u.%u.%u.%u:%d", ip[0], ip[1], ip[2], ip[3], ETH_TCP_PORT);
sprintf(reply, "ETH: %u.%u.%u.%u:%d", ip[0], ip[1], ip[2], ip[3], ETHERNET_TCP_PORT);
}
return true;
}
// Check for new TCP client connections
static void eth_check_client() {
if (eth_client && eth_client.connected()) return;
static void ethernet_check_client() {
if (ethernet_client && ethernet_client.connected()) return;
auto newClient = eth_server.available();
auto newClient = ethernet_server.available();
if (newClient) {
if (eth_client) eth_client.stop();
eth_client = newClient;
IPAddress ip = eth_client.remoteIP();
if (ethernet_client) ethernet_client.stop();
ethernet_client = newClient;
IPAddress ip = ethernet_client.remoteIP();
Serial.printf("ETH: Client connected from %u.%u.%u.%u\n", ip[0], ip[1], ip[2], ip[3]);
eth_client.println("MeshCore Repeater CLI");
eth_client.print("> ");
ethernet_client.println("MeshCore Repeater CLI");
ethernet_client.print("> ");
}
}
#endif
@ -135,8 +128,8 @@ void halt() {
}
static char command[160];
#ifdef ETH_ENABLED
static char eth_command[160];
#ifdef ETHERNET_ENABLED
static char ethernet_command[160];
#endif
// For power saving
@ -205,8 +198,8 @@ void setup() {
mesh::Utils::printHex(Serial, the_mesh.self_id.pub_key, PUB_KEY_SIZE); Serial.println();
command[0] = 0;
#ifdef ETH_ENABLED
eth_command[0] = 0;
#ifdef ETHERNET_ENABLED
ethernet_command[0] = 0;
#endif
sensors.begin();
@ -217,8 +210,8 @@ void setup() {
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
#endif
#ifdef ETH_ENABLED
eth_start_task();
#ifdef ETHERNET_ENABLED
ethernet_start_task();
#endif
// send out initial zero hop Advertisement to the mesh
@ -248,10 +241,13 @@ void loop() {
command[len - 1] = 0; // replace newline with C string null terminator
char reply[160];
reply[0] = 0;
#ifdef ETH_ENABLED
if (!eth_handle_command(command, reply))
#endif
#ifdef ETHERNET_ENABLED
if (!ethernet_handle_command(command, reply)) {
the_mesh.handleCommand(0, command, reply);
}
#else
the_mesh.handleCommand(0, command, reply); // NOTE: there is no sender_timestamp via serial!
#endif
if (reply[0]) {
Serial.print(" -> "); Serial.println(reply);
}
@ -259,37 +255,38 @@ void loop() {
command[0] = 0; // reset command buffer
}
#ifdef ETH_ENABLED
if (eth_running) {
eth_check_client();
#ifdef ETHERNET_ENABLED
if (ethernet_running) {
ethernet_check_client();
Ethernet.maintain();
}
if (eth_running && eth_client && eth_client.connected()) {
int elen = strlen(eth_command);
while (eth_client.available() && elen < (int)sizeof(eth_command)-1) {
char c = eth_client.read();
if (c == '\n') continue; // ignore LF
eth_command[elen++] = c;
eth_command[elen] = 0;
if (c == '\r') break;
if (ethernet_running && ethernet_client && ethernet_client.connected()) {
int elen = strlen(ethernet_command);
while (ethernet_client.available() && elen < (int)sizeof(ethernet_command)-1) {
char c = ethernet_client.read();
if (c == '\n' && elen == 0) continue; // ignore leading LF (from CR+LF)
if (c == '\r' || c == '\n') { ethernet_command[elen++] = '\r'; break; }
ethernet_command[elen++] = c;
ethernet_command[elen] = 0;
}
if (elen == sizeof(eth_command)-1) {
eth_command[sizeof(eth_command)-1] = '\r';
if (elen == sizeof(ethernet_command)-1) {
ethernet_command[sizeof(ethernet_command)-1] = '\r';
}
if (elen > 0 && eth_command[elen - 1] == '\r') {
eth_command[elen - 1] = 0;
eth_client.println();
if (elen > 0 && ethernet_command[elen - 1] == '\r') {
ethernet_command[elen - 1] = 0;
ethernet_client.println();
char reply[160];
reply[0] = 0;
if (!eth_handle_command(eth_command, reply))
the_mesh.handleCommand(0, eth_command, reply);
if (reply[0]) {
eth_client.print(" -> "); eth_client.println(reply);
if (!ethernet_handle_command(ethernet_command, reply)) {
the_mesh.handleCommand(0, ethernet_command, reply);
}
eth_client.print("> ");
eth_command[0] = 0;
if (reply[0]) {
ethernet_client.print(" -> "); ethernet_client.println(reply);
}
ethernet_client.print("> ");
ethernet_command[0] = 0;
}
}
#endif

141
examples/simple_room_server/main.cpp
View file

@ -3,43 +3,36 @@
#include "MyMesh.h"
#ifdef ETH_ENABLED
#ifdef ETHERNET_ENABLED
#include <SPI.h>
#include <RAK13800_W5100S.h>
#include <helpers/nrf52/EthernetMac.h>
#define PIN_SPI1_MISO (29)
#define PIN_SPI1_MOSI (30)
#define PIN_SPI1_SCK (3)
SPIClass ETH_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
SPIClass ETHERNET_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
#define PIN_ETH_POWER_EN WB_IO2
#define PIN_ETHERNET_POWER_EN WB_IO2
#define PIN_ETHERNET_RESET 21
#define PIN_ETHERNET_SS 26
#ifndef ETH_TCP_PORT
#define ETH_TCP_PORT 23
#ifndef ETHERNET_TCP_PORT
#define ETHERNET_TCP_PORT 23
#endif
#define ETH_RETRY_INTERVAL_MS 30000
#define ETHERNET_RETRY_INTERVAL_MS 30000
static EthernetServer eth_server(ETH_TCP_PORT);
static EthernetClient eth_client;
static volatile bool eth_running = false;
static EthernetServer ethernet_server(ETHERNET_TCP_PORT);
static EthernetClient ethernet_client;
static volatile bool ethernet_running = false;
static void generateDeviceMac(uint8_t mac[6]) {
uint32_t device_id = NRF_FICR->DEVICEID[0];
mac[0] = 0x02; mac[1] = 0x92; mac[2] = 0x1F;
mac[3] = (device_id >> 16) & 0xFF;
mac[4] = (device_id >> 8) & 0xFF;
mac[5] = device_id & 0xFF;
}
static void eth_task(void* param) {
static void ethernet_task(void* param) {
(void)param;
Serial.println("ETH: Initializing hardware");
pinMode(PIN_ETH_POWER_EN, OUTPUT);
digitalWrite(PIN_ETH_POWER_EN, HIGH);
pinMode(PIN_ETHERNET_POWER_EN, OUTPUT);
digitalWrite(PIN_ETHERNET_POWER_EN, HIGH);
vTaskDelay(pdMS_TO_TICKS(100));
pinMode(PIN_ETHERNET_RESET, OUTPUT);
@ -47,66 +40,66 @@
vTaskDelay(pdMS_TO_TICKS(100));
digitalWrite(PIN_ETHERNET_RESET, HIGH);
ETH_SPI_PORT.begin();
Ethernet.init(ETH_SPI_PORT, PIN_ETHERNET_SS);
ETHERNET_SPI_PORT.begin();
Ethernet.init(ETHERNET_SPI_PORT, PIN_ETHERNET_SS);
uint8_t mac[6];
generateDeviceMac(mac);
Serial.printf("ETH: MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
while (!eth_running) {
while (!ethernet_running) {
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
Serial.println("ETH: Hardware not found, giving up");
vTaskDelete(NULL);
return;
}
if (Ethernet.linkStatus() == LinkOFF) {
vTaskDelay(pdMS_TO_TICKS(ETH_RETRY_INTERVAL_MS));
vTaskDelay(pdMS_TO_TICKS(ETHERNET_RETRY_INTERVAL_MS));
continue;
}
Serial.println("ETH: Link detected, attempting DHCP...");
if (Ethernet.begin(mac, 10000, 2000) == 0) {
Serial.println("ETH: DHCP failed, will retry");
vTaskDelay(pdMS_TO_TICKS(ETH_RETRY_INTERVAL_MS));
vTaskDelay(pdMS_TO_TICKS(ETHERNET_RETRY_INTERVAL_MS));
continue;
}
IPAddress ip = Ethernet.localIP();
Serial.printf("ETH: IP: %u.%u.%u.%u\n", ip[0], ip[1], ip[2], ip[3]);
Serial.printf("ETH: Listening on TCP port %d\n", ETH_TCP_PORT);
eth_server.begin();
eth_running = true;
Serial.printf("ETH: Listening on TCP port %d\n", ETHERNET_TCP_PORT);
ethernet_server.begin();
ethernet_running = true;
}
vTaskDelete(NULL);
}
static void eth_start_task() {
xTaskCreate(eth_task, "eth_init", 1024, NULL, 1, NULL);
static void ethernet_start_task() {
xTaskCreate(ethernet_task, "eth_init", 1024, NULL, 1, NULL);
}
static bool eth_handle_command(const char* command, char* reply) {
static bool ethernet_handle_command(const char* command, char* reply) {
if (strcmp(command, "eth") != 0) return false;
if (!eth_running) {
if (!ethernet_running) {
strcpy(reply, "ETH: not connected");
} else {
IPAddress ip = Ethernet.localIP();
sprintf(reply, "ETH: %u.%u.%u.%u:%d", ip[0], ip[1], ip[2], ip[3], ETH_TCP_PORT);
sprintf(reply, "ETH: %u.%u.%u.%u:%d", ip[0], ip[1], ip[2], ip[3], ETHERNET_TCP_PORT);
}
return true;
}
static void eth_check_client() {
if (eth_client && eth_client.connected()) return;
auto newClient = eth_server.available();
static void ethernet_check_client() {
if (ethernet_client && ethernet_client.connected()) return;
auto newClient = ethernet_server.available();
if (newClient) {
if (eth_client) eth_client.stop();
eth_client = newClient;
IPAddress ip = eth_client.remoteIP();
if (ethernet_client) ethernet_client.stop();
ethernet_client = newClient;
IPAddress ip = ethernet_client.remoteIP();
Serial.printf("ETH: Client connected from %u.%u.%u.%u\n", ip[0], ip[1], ip[2], ip[3]);
eth_client.println("MeshCore Room Server CLI");
eth_client.print("> ");
ethernet_client.println("MeshCore Room Server CLI");
ethernet_client.print("> ");
}
}
#endif
@ -125,8 +118,8 @@ void halt() {
}
static char command[MAX_POST_TEXT_LEN+1];
#ifdef ETH_ENABLED
static char eth_command[MAX_POST_TEXT_LEN+1];
#ifdef ETHERNET_ENABLED
static char ethernet_command[MAX_POST_TEXT_LEN+1];
#endif
void setup() {
@ -178,8 +171,8 @@ void setup() {
mesh::Utils::printHex(Serial, the_mesh.self_id.pub_key, PUB_KEY_SIZE); Serial.println();
command[0] = 0;
#ifdef ETH_ENABLED
eth_command[0] = 0;
#ifdef ETHERNET_ENABLED
ethernet_command[0] = 0;
#endif
sensors.begin();
@ -190,8 +183,8 @@ void setup() {
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
#endif
#ifdef ETH_ENABLED
eth_start_task();
#ifdef ETHERNET_ENABLED
ethernet_start_task();
#endif
// send out initial zero hop Advertisement to the mesh
@ -218,10 +211,13 @@ void loop() {
command[len - 1] = 0; // replace newline with C string null terminator
char reply[160];
reply[0] = 0;
#ifdef ETH_ENABLED
if (!eth_handle_command(command, reply))
#endif
#ifdef ETHERNET_ENABLED
if (!ethernet_handle_command(command, reply)) {
the_mesh.handleCommand(0, command, reply);
}
#else
the_mesh.handleCommand(0, command, reply); // NOTE: there is no sender_timestamp via serial!
#endif
if (reply[0]) {
Serial.print(" -> "); Serial.println(reply);
}
@ -229,37 +225,38 @@ void loop() {
command[0] = 0; // reset command buffer
}
#ifdef ETH_ENABLED
if (eth_running) {
eth_check_client();
#ifdef ETHERNET_ENABLED
if (ethernet_running) {
ethernet_check_client();
Ethernet.maintain();
}
if (eth_running && eth_client && eth_client.connected()) {
int elen = strlen(eth_command);
while (eth_client.available() && elen < (int)sizeof(eth_command)-1) {
char c = eth_client.read();
if (c == '\n') continue;
eth_command[elen++] = c;
eth_command[elen] = 0;
if (c == '\r') break;
if (ethernet_running && ethernet_client && ethernet_client.connected()) {
int elen = strlen(ethernet_command);
while (ethernet_client.available() && elen < (int)sizeof(ethernet_command)-1) {
char c = ethernet_client.read();
if (c == '\n' && elen == 0) continue; // ignore leading LF (from CR+LF)
if (c == '\r' || c == '\n') { ethernet_command[elen++] = '\r'; break; }
ethernet_command[elen++] = c;
ethernet_command[elen] = 0;
}
if (elen == sizeof(eth_command)-1) {
eth_command[sizeof(eth_command)-1] = '\r';
if (elen == sizeof(ethernet_command)-1) {
ethernet_command[sizeof(ethernet_command)-1] = '\r';
}
if (elen > 0 && eth_command[elen - 1] == '\r') {
eth_command[elen - 1] = 0;
eth_client.println();
if (elen > 0 && ethernet_command[elen - 1] == '\r') {
ethernet_command[elen - 1] = 0;
ethernet_client.println();
char reply[160];
reply[0] = 0;
if (!eth_handle_command(eth_command, reply))
the_mesh.handleCommand(0, eth_command, reply);
if (reply[0]) {
eth_client.print(" -> "); eth_client.println(reply);
if (!ethernet_handle_command(ethernet_command, reply)) {
the_mesh.handleCommand(0, ethernet_command, reply);
}
eth_client.print("> ");
eth_command[0] = 0;
if (reply[0]) {
ethernet_client.print(" -> "); ethernet_client.println(reply);
}
ethernet_client.print("> ");
ethernet_command[0] = 0;
}
}
#endif

13
src/helpers/nrf52/EthernetMac.h Normal file
View file

@ -0,0 +1,13 @@
#pragma once
#include <Arduino.h>
static inline void generateDeviceMac(uint8_t mac[6]) {
uint32_t device_id = NRF_FICR->DEVICEID[0];
mac[0] = 0x02;
mac[1] = 0x92;
mac[2] = 0x1F;
mac[3] = (device_id >> 16) & 0xFF;
mac[4] = (device_id >> 8) & 0xFF;
mac[5] = device_id & 0xFF;
}

117
src/helpers/nrf52/SerialEthernetInterface.cpp
View file

@ -1,4 +1,5 @@
#include "SerialEthernetInterface.h"
#include "EthernetMac.h"
#include <SPI.h>
#include <EthernetUdp.h>
@ -6,12 +7,11 @@
#define PIN_SPI1_MOSI (30) // (0 + 30)
#define PIN_SPI1_SCK (3) // (0 + 3)
SPIClass ETH_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
SPIClass ETHERNET_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
#define PIN_ETH_POWER_EN WB_IO2 // output, high to enable
#define PIN_ETHERNET_POWER_EN WB_IO2 // output, high to enable
#define PIN_ETHERNET_RESET 21
#define PIN_ETHERNET_SS 26
//#define STATIC_IP 1
#define RECV_STATE_IDLE 0
#define RECV_STATE_HDR_FOUND 1
@ -19,15 +19,15 @@ SPIClass ETH_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
#define RECV_STATE_LEN2_FOUND 3
bool SerialEthernetInterface::begin() {
ETH_DEBUG_PRINTLN("Ethernet initializing");
#ifdef PIN_ETH_POWER_EN
ETH_DEBUG_PRINTLN("Ethernet power enable");
pinMode(PIN_ETH_POWER_EN, OUTPUT);
digitalWrite(PIN_ETH_POWER_EN, HIGH); // Power up.
ETHERNET_DEBUG_PRINTLN("Ethernet initializing");
#ifdef PIN_ETHERNET_POWER_EN
ETHERNET_DEBUG_PRINTLN("Ethernet power enable");
pinMode(PIN_ETHERNET_POWER_EN, OUTPUT);
digitalWrite(PIN_ETHERNET_POWER_EN, HIGH); // Power up.
delay(100);
ETH_DEBUG_PRINTLN("Ethernet power enabled");
ETHERNET_DEBUG_PRINTLN("Ethernet power enabled");
#endif
#ifdef PIN_ETHERNET_RESET
@ -35,12 +35,12 @@ bool SerialEthernetInterface::begin() {
digitalWrite(PIN_ETHERNET_RESET, LOW); // Reset Time.
delay(100);
digitalWrite(PIN_ETHERNET_RESET, HIGH); // Reset Time.
ETH_DEBUG_PRINTLN("Ethernet reset pulse");
ETHERNET_DEBUG_PRINTLN("Ethernet reset pulse");
#endif
uint8_t mac[6];
generateDeviceMac(mac);
ETH_DEBUG_PRINTLN(
ETHERNET_DEBUG_PRINTLN(
"Ethernet MAC: %02X:%02X:%02X:%02X:%02X:%02X",
mac[0],
mac[1],
@ -48,49 +48,49 @@ bool SerialEthernetInterface::begin() {
mac[3],
mac[4],
mac[5]);
ETH_DEBUG_PRINTLN("Init");
ETH_SPI_PORT.begin();
Ethernet.init(ETH_SPI_PORT, PIN_ETHERNET_SS);
ETHERNET_DEBUG_PRINTLN("Init");
ETHERNET_SPI_PORT.begin();
Ethernet.init(ETHERNET_SPI_PORT, PIN_ETHERNET_SS);
// Hardcode IP address for now
#ifdef STATIC_IP
IPAddress ip(192, 168, 8, 118);
IPAddress gateway(192, 168, 8, 1);
IPAddress subnet(255, 255, 255, 0);
IPAddress dns(192, 168, 8, 1);
// Use static IP if build flags are defined, otherwise DHCP
#if defined(ETHERNET_STATIC_IP) && defined(ETHERNET_STATIC_GATEWAY) && defined(ETHERNET_STATIC_SUBNET) && defined(ETHERNET_STATIC_DNS)
IPAddress ip(ETHERNET_STATIC_IP);
IPAddress gateway(ETHERNET_STATIC_GATEWAY);
IPAddress subnet(ETHERNET_STATIC_SUBNET);
IPAddress dns(ETHERNET_STATIC_DNS);
Ethernet.begin(mac, ip, dns, gateway, subnet);
#else
ETH_DEBUG_PRINTLN("Begin");
ETHERNET_DEBUG_PRINTLN("Begin");
if (Ethernet.begin(mac) == 0) {
ETH_DEBUG_PRINTLN("Begin failed.");
ETHERNET_DEBUG_PRINTLN("Begin failed.");
// DHCP failed -- let's figure out why
if (Ethernet.hardwareStatus() == EthernetNoHardware) // Check for Ethernet hardware present.
{
ETH_DEBUG_PRINTLN("Ethernet hardware not found.");
ETHERNET_DEBUG_PRINTLN("Ethernet hardware not found.");
return false;
}
if (Ethernet.linkStatus() == LinkOFF) // No physical connection
{
ETH_DEBUG_PRINTLN("Ethernet cable not connected.");
ETHERNET_DEBUG_PRINTLN("Ethernet cable not connected.");
return false;
}
ETH_DEBUG_PRINTLN("Ethernet: DHCP failed for unknown reason.");
ETHERNET_DEBUG_PRINTLN("Ethernet: DHCP failed for unknown reason.");
return false;
}
#endif
ETH_DEBUG_PRINTLN("Ethernet begin complete");
ETHERNET_DEBUG_PRINTLN("Ethernet begin complete");
IPAddress ip = Ethernet.localIP();
ETH_DEBUG_PRINT_IP("IP", ip);
ETHERNET_DEBUG_PRINT_IP("IP", ip);
IPAddress subnet = Ethernet.subnetMask();
ETH_DEBUG_PRINT_IP("Subnet", subnet);
ETHERNET_DEBUG_PRINT_IP("Subnet", subnet);
IPAddress gateway = Ethernet.gatewayIP();
ETH_DEBUG_PRINT_IP("Gateway", gateway);
ETHERNET_DEBUG_PRINT_IP("Gateway", gateway);
server.begin(); // start listening for clients
ETH_DEBUG_PRINTLN("Ethernet: listening on TCP port: %d", ETH_TCP_PORT);
ETHERNET_DEBUG_PRINTLN("Ethernet: listening on TCP port: %d", ETHERNET_TCP_PORT);
return true;
}
@ -108,13 +108,13 @@ void SerialEthernetInterface::disable() {
size_t SerialEthernetInterface::writeFrame(const uint8_t src[], size_t len) {
if (len > MAX_FRAME_SIZE) {
ETH_DEBUG_PRINTLN("writeFrame(), frame too big, len=%d\n", len);
ETHERNET_DEBUG_PRINTLN("writeFrame(), frame too big, len=%d\n", len);
return 0;
}
if (deviceConnected && len > 0) {
if (send_queue_len >= FRAME_QUEUE_SIZE) {
ETH_DEBUG_PRINTLN("writeFrame(), send_queue is full!");
ETHERNET_DEBUG_PRINTLN("writeFrame(), send_queue is full!");
return 0;
}
@ -140,7 +140,7 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
if (newClient) {
IPAddress new_ip = newClient.remoteIP();
uint16_t new_port = newClient.remotePort();
ETH_DEBUG_PRINTLN(
ETHERNET_DEBUG_PRINTLN(
"New client available %u.%u.%u.%u:%u",
new_ip[0],
new_ip[1],
@ -150,7 +150,7 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
if (client && client.connected()) {
IPAddress cur_ip = client.remoteIP();
uint16_t cur_port = client.remotePort();
ETH_DEBUG_PRINTLN(
ETHERNET_DEBUG_PRINTLN(
"Current client %u.%u.%u.%u:%u",
cur_ip[0],
cur_ip[1],
@ -158,27 +158,27 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
cur_ip[3],
cur_port);
if (cur_ip == new_ip && cur_port == new_port) {
ETH_DEBUG_PRINTLN("Ignoring duplicate client");
ETHERNET_DEBUG_PRINTLN("Ignoring duplicate client");
return 0;
}
}
deviceConnected = false;
if (client) {
ETH_DEBUG_PRINTLN("Closing previous client");
ETHERNET_DEBUG_PRINTLN("Closing previous client");
client.stop();
}
_state = RECV_STATE_IDLE;
_frame_len = 0;
_rx_len = 0;
client = newClient;
ETH_DEBUG_PRINTLN("Switched to new client");
ETHERNET_DEBUG_PRINTLN("Switched to new client");
}
}
if (client.connected()) {
if (!deviceConnected) {
ETH_DEBUG_PRINTLN(
ETHERNET_DEBUG_PRINTLN(
"Got connection %u.%u.%u.%u:%u",
client.remoteIP()[0],
client.remoteIP()[1],
@ -190,18 +190,18 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
} else {
if (deviceConnected) {
deviceConnected = false;
ETH_DEBUG_PRINTLN("Disconnected");
ETHERNET_DEBUG_PRINTLN("Disconnected");
}
}
if (deviceConnected) {
if (send_queue_len > 0) { // first, check send queue
_last_write = millis();
int len = send_queue[0].len;
#if ETH_RAW_LINE
ETH_DEBUG_PRINTLN("TX line len=%d", len);
#if ETHERNET_RAW_LINE
ETHERNET_DEBUG_PRINTLN("TX line len=%d", len);
client.write(send_queue[0].buf, len);
client.write("\r\n", 2);
#else
@ -210,9 +210,9 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
pkt[1] = (len & 0xFF); // LSB
pkt[2] = (len >> 8); // MSB
memcpy(&pkt[3], send_queue[0].buf, send_queue[0].len);
ETH_DEBUG_PRINTLN("Sending frame len=%d", len);
#if ETH_DEBUG_LOGGING && ARDUINO
ETH_DEBUG_PRINTLN("TX frame len=%d", len);
ETHERNET_DEBUG_PRINTLN("Sending frame len=%d", len);
#if ETHERNET_DEBUG_LOGGING && ARDUINO
ETHERNET_DEBUG_PRINTLN("TX frame len=%d", len);
#endif
client.write(pkt, 3 + len);
#endif
@ -225,7 +225,7 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
int c = client.read();
if (c < 0) break;
#if ETH_RAW_LINE
#if ETHERNET_RAW_LINE
if (c == '\r' || c == '\n') {
if (_rx_len == 0) {
continue;
@ -267,8 +267,8 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
if (_frame_len > MAX_FRAME_SIZE) {
_frame_len = MAX_FRAME_SIZE;
}
#if ETH_DEBUG_LOGGING && ARDUINO
ETH_DEBUG_PRINTLN("RX frame len=%d", _frame_len);
#if ETHERNET_DEBUG_LOGGING && ARDUINO
ETHERNET_DEBUG_PRINTLN("RX frame len=%d", _frame_len);
#endif
memcpy(dest, _rx_buf, _frame_len);
_state = RECV_STATE_IDLE;
@ -284,20 +284,9 @@ size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
}
bool SerialEthernetInterface::isConnected() const {
return deviceConnected; //pServer != NULL && pServer->getConnectedCount() > 0;
return deviceConnected;
}
void SerialEthernetInterface::generateDeviceMac(uint8_t mac[6]) {
uint32_t device_id = NRF_FICR->DEVICEID[0];
mac[0] = 0x02;
mac[1] = 0x92;
mac[2] = 0x1F;
mac[3] = (device_id >> 16) & 0xFF;
mac[4] = (device_id >> 8) & 0xFF;
mac[5] = device_id & 0xFF;
}
void SerialEthernetInterface::maintain() {
void SerialEthernetInterface::loop() {
Ethernet.maintain();
}

27
src/helpers/nrf52/SerialEthernetInterface.h
View file

@ -4,10 +4,10 @@
#include <SPI.h>
#include <RAK13800_W5100S.h>
#ifndef ETH_TCP_PORT
#define ETH_TCP_PORT 5000
#ifndef ETHERNET_TCP_PORT
#define ETHERNET_TCP_PORT 5000
#endif
// define ETH_RAW_LINE=1 to use raw line-based CLI instead of framed packets
// define ETHERNET_RAW_LINE=1 to use raw line-based CLI instead of framed packets
class SerialEthernetInterface : public BaseSerialInterface {
bool deviceConnected;
@ -44,7 +44,7 @@ class SerialEthernetInterface : public BaseSerialInterface {
protected:
public:
SerialEthernetInterface() : server(EthernetServer(ETH_TCP_PORT)) {
SerialEthernetInterface() : server(EthernetServer(ETHERNET_TCP_PORT)) {
deviceConnected = false;
_isEnabled = false;
_last_write = 0;
@ -66,20 +66,17 @@ class SerialEthernetInterface : public BaseSerialInterface {
size_t writeFrame(const uint8_t src[], size_t len) override;
size_t checkRecvFrame(uint8_t dest[]) override;
void maintain();
private:
void generateDeviceMac(uint8_t mac[6]);
void loop();
};
#if ETH_DEBUG_LOGGING && ARDUINO
#if ETHERNET_DEBUG_LOGGING && ARDUINO
#include <Arduino.h>
#define ETH_DEBUG_PRINT(F, ...) Serial.printf("ETH: " F, ##__VA_ARGS__)
#define ETH_DEBUG_PRINTLN(F, ...) Serial.printf("ETH: " F "\n", ##__VA_ARGS__)
#define ETH_DEBUG_PRINT_IP(name, ip) Serial.printf(name ": %u.%u.%u.%u" "\n", ip[0], ip[1], ip[2], ip[3])
#define ETHERNET_DEBUG_PRINT(F, ...) Serial.printf("ETH: " F, ##__VA_ARGS__)
#define ETHERNET_DEBUG_PRINTLN(F, ...) Serial.printf("ETH: " F "\n", ##__VA_ARGS__)
#define ETHERNET_DEBUG_PRINT_IP(name, ip) Serial.printf(name ": %u.%u.%u.%u" "\n", ip[0], ip[1], ip[2], ip[3])
#else
#define ETH_DEBUG_PRINT(...) {}
#define ETH_DEBUG_PRINTLN(...) {}
#define ETH_DEBUG_PRINT_IP(...) {}
#define ETHERNET_DEBUG_PRINT(...) {}
#define ETHERNET_DEBUG_PRINTLN(...) {}
#define ETHERNET_DEBUG_PRINT_IP(...) {}
#endif

2
src/helpers/sensors/EnvironmentSensorManager.cpp
View file

@ -628,7 +628,7 @@ void EnvironmentSensorManager::rakGPSInit(){
bool EnvironmentSensorManager::gpsIsAwake(uint8_t ioPin){
#if defined(ETH_ENABLED) && defined(RAK_BOARD)
#if defined(ETHERNET_ENABLED) && defined(RAK_BOARD)
if (ioPin == WB_IO2) {
// WB_IO2 powers the Ethernet module on RAK baseboards.
return false;

19
variants/rak4631/platformio.ini
View file

@ -46,17 +46,17 @@ build_src_filter = ${rak4631.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_repeater>
[env:RAK_4631_repeater_eth]
[env:RAK_4631_repeater_ethernet]
extends = rak4631
build_flags =
${rak4631.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"RAK4631 Repeater ETH"'
-D ADVERT_NAME='"RAK4631 Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
-D ETH_ENABLED=1
-D ETHERNET_ENABLED=1
; -D MESH_DEBUG=1
build_src_filter = ${rak4631.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
@ -128,17 +128,17 @@ build_src_filter = ${rak4631.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_room_server>
[env:RAK_4631_room_server_eth]
[env:RAK_4631_room_server_ethernet]
extends = rak4631
build_flags =
${rak4631.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Test Room ETH"'
-D ADVERT_NAME='"RAK4631 Room Server"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"'
-D ETH_ENABLED=1
-D ETHERNET_ENABLED=1
; -D MESH_DEBUG=1
build_src_filter = ${rak4631.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
@ -170,7 +170,7 @@ lib_deps =
densaugeo/base64 @ ~1.4.0
[env:RAK_4631_companion_radio_eth]
[env:RAK_4631_companion_radio_ethernet]
extends = rak4631
board_build.ldscript = boards/nrf52840_s140_v6.ld
board_upload.maximum_size = 712704
@ -184,11 +184,10 @@ build_flags =
-D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D ETH_ENABLED=1
-D ETHERNET_ENABLED=1
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
; -D MESH_DEBUG=1
; -D ETH_DEBUG_LOGGING=1
; -D ETHERNET_DEBUG_LOGGING=1
build_src_filter = ${rak4631.build_src_filter}
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>