mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-04-20 22:13:47 +00:00
- Rename eth command to eth.status for consistency with other commands - Rename generateDeviceMac to generateEthernetMac for clarity - Refactor ethernet_handle_command to return false by default - Allow new TCP clients to replace existing connections (repeater, room server, SerialEthernetInterface) - Boot companion radio without Ethernet on init failure (LoRa-only recovery mode) - Remove > prompt from ethernet CLI for consistency with serial interface - Fix variable redeclaration compile error in SerialEthernetInterface when ETHERNET_STATIC_IP is defined - Fix TCP socket leak when duplicate client detection fires - Remove dead recv_queue and adv_restart_time members from SerialEthernetInterface - Fix port numbers in docs (port 23 for repeater/room server CLI, port 5000 for companion radio) - Clarify eth.status command is only available in repeater and room server firmware Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
270 lines
7.3 KiB
C++
270 lines
7.3 KiB
C++
#include <Arduino.h> // needed for PlatformIO
|
|
#include <Mesh.h>
|
|
|
|
#include "MyMesh.h"
|
|
|
|
#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 ETHERNET_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
|
|
|
|
#define PIN_ETHERNET_POWER_EN WB_IO2
|
|
#define PIN_ETHERNET_RESET 21
|
|
#define PIN_ETHERNET_SS 26
|
|
|
|
#ifndef ETHERNET_TCP_PORT
|
|
#define ETHERNET_TCP_PORT 23
|
|
#endif
|
|
|
|
#define ETHERNET_RETRY_INTERVAL_MS 30000
|
|
|
|
static EthernetServer ethernet_server(ETHERNET_TCP_PORT);
|
|
static EthernetClient ethernet_client;
|
|
static volatile bool ethernet_running = false;
|
|
|
|
static void ethernet_task(void* param) {
|
|
(void)param;
|
|
|
|
Serial.println("ETH: Initializing hardware");
|
|
pinMode(PIN_ETHERNET_POWER_EN, OUTPUT);
|
|
digitalWrite(PIN_ETHERNET_POWER_EN, HIGH);
|
|
vTaskDelay(pdMS_TO_TICKS(100));
|
|
|
|
pinMode(PIN_ETHERNET_RESET, OUTPUT);
|
|
digitalWrite(PIN_ETHERNET_RESET, LOW);
|
|
vTaskDelay(pdMS_TO_TICKS(100));
|
|
digitalWrite(PIN_ETHERNET_RESET, HIGH);
|
|
|
|
ETHERNET_SPI_PORT.begin();
|
|
Ethernet.init(ETHERNET_SPI_PORT, PIN_ETHERNET_SS);
|
|
|
|
uint8_t mac[6];
|
|
generateEthernetMac(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 (!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(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(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", ETHERNET_TCP_PORT);
|
|
ethernet_server.begin();
|
|
ethernet_running = true;
|
|
}
|
|
vTaskDelete(NULL);
|
|
}
|
|
|
|
static void ethernet_start_task() {
|
|
xTaskCreate(ethernet_task, "eth_init", 1024, NULL, 1, NULL);
|
|
}
|
|
|
|
static bool ethernet_handle_command(const char* command, char* reply) {
|
|
if (strcmp(command, "eth.status") == 0) {
|
|
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], ETHERNET_TCP_PORT);
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Check for new TCP client connections, replacing any existing connection
|
|
static void ethernet_check_client() {
|
|
auto newClient = ethernet_server.available();
|
|
if (newClient) {
|
|
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]);
|
|
ethernet_client.println("MeshCore Room Server CLI");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef DISPLAY_CLASS
|
|
#include "UITask.h"
|
|
static UITask ui_task(display);
|
|
#endif
|
|
|
|
StdRNG fast_rng;
|
|
SimpleMeshTables tables;
|
|
MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);
|
|
|
|
void halt() {
|
|
while (1) ;
|
|
}
|
|
|
|
static char command[MAX_POST_TEXT_LEN+1];
|
|
#ifdef ETHERNET_ENABLED
|
|
static char ethernet_command[MAX_POST_TEXT_LEN+1];
|
|
#endif
|
|
|
|
void setup() {
|
|
Serial.begin(115200);
|
|
delay(1000);
|
|
|
|
board.begin();
|
|
|
|
#ifdef DISPLAY_CLASS
|
|
if (display.begin()) {
|
|
display.startFrame();
|
|
display.setCursor(0, 0);
|
|
display.print("Please wait...");
|
|
display.endFrame();
|
|
}
|
|
#endif
|
|
|
|
if (!radio_init()) { halt(); }
|
|
|
|
fast_rng.begin(radio_get_rng_seed());
|
|
|
|
FILESYSTEM* fs;
|
|
#if defined(NRF52_PLATFORM)
|
|
InternalFS.begin();
|
|
fs = &InternalFS;
|
|
IdentityStore store(InternalFS, "");
|
|
#elif defined(RP2040_PLATFORM)
|
|
LittleFS.begin();
|
|
fs = &LittleFS;
|
|
IdentityStore store(LittleFS, "/identity");
|
|
store.begin();
|
|
#elif defined(ESP32)
|
|
SPIFFS.begin(true);
|
|
fs = &SPIFFS;
|
|
IdentityStore store(SPIFFS, "/identity");
|
|
#else
|
|
#error "need to define filesystem"
|
|
#endif
|
|
if (!store.load("_main", the_mesh.self_id)) {
|
|
the_mesh.self_id = radio_new_identity(); // create new random identity
|
|
int count = 0;
|
|
while (count < 10 && (the_mesh.self_id.pub_key[0] == 0x00 || the_mesh.self_id.pub_key[0] == 0xFF)) { // reserved id hashes
|
|
the_mesh.self_id = radio_new_identity(); count++;
|
|
}
|
|
store.save("_main", the_mesh.self_id);
|
|
}
|
|
|
|
Serial.print("Room ID: ");
|
|
mesh::Utils::printHex(Serial, the_mesh.self_id.pub_key, PUB_KEY_SIZE); Serial.println();
|
|
|
|
command[0] = 0;
|
|
#ifdef ETHERNET_ENABLED
|
|
ethernet_command[0] = 0;
|
|
#endif
|
|
|
|
sensors.begin();
|
|
|
|
the_mesh.begin(fs);
|
|
|
|
#ifdef DISPLAY_CLASS
|
|
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
|
|
#endif
|
|
|
|
#ifdef ETHERNET_ENABLED
|
|
ethernet_start_task();
|
|
#endif
|
|
|
|
// send out initial zero hop Advertisement to the mesh
|
|
#if ENABLE_ADVERT_ON_BOOT == 1
|
|
the_mesh.sendSelfAdvertisement(16000, false);
|
|
#endif
|
|
}
|
|
|
|
void loop() {
|
|
int len = strlen(command);
|
|
while (Serial.available() && len < sizeof(command)-1) {
|
|
char c = Serial.read();
|
|
if (c != '\n') {
|
|
command[len++] = c;
|
|
command[len] = 0;
|
|
}
|
|
Serial.print(c);
|
|
}
|
|
if (len == sizeof(command)-1) { // command buffer full
|
|
command[sizeof(command)-1] = '\r';
|
|
}
|
|
|
|
if (len > 0 && command[len - 1] == '\r') { // received complete line
|
|
command[len - 1] = 0; // replace newline with C string null terminator
|
|
char reply[160];
|
|
reply[0] = 0;
|
|
#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);
|
|
}
|
|
|
|
command[0] = 0; // reset command buffer
|
|
}
|
|
|
|
#ifdef ETHERNET_ENABLED
|
|
if (ethernet_running) {
|
|
ethernet_check_client();
|
|
Ethernet.maintain();
|
|
}
|
|
|
|
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(ethernet_command)-1) {
|
|
ethernet_command[sizeof(ethernet_command)-1] = '\r';
|
|
}
|
|
|
|
if (elen > 0 && ethernet_command[elen - 1] == '\r') {
|
|
ethernet_command[elen - 1] = 0;
|
|
ethernet_client.println();
|
|
char reply[160];
|
|
reply[0] = 0;
|
|
if (!ethernet_handle_command(ethernet_command, reply)) {
|
|
the_mesh.handleCommand(0, ethernet_command, reply);
|
|
}
|
|
if (reply[0]) {
|
|
ethernet_client.print(" -> "); ethernet_client.println(reply);
|
|
}
|
|
ethernet_command[0] = 0;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
the_mesh.loop();
|
|
sensors.loop();
|
|
#ifdef DISPLAY_CLASS
|
|
ui_task.loop();
|
|
#endif
|
|
rtc_clock.tick();
|
|
}
|