mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-04-20 22:13:47 +00:00
Updates based on PR review feedback from liamcottle
This commit is contained in:
Ryan Gregg
parent
ffe0853d7f
commit
3e9ceba24a
9 changed files with 237 additions and 249 deletions
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue