mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-07-17 12:12:32 +00:00
Ryan GreggandClaude Sonnet 4.6
61ba79966b
- 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>
79 lines
1.9 KiB
C++
79 lines
1.9 KiB
C++
#pragma once
|
|
|
|
#include "helpers/BaseSerialInterface.h"
|
|
#include <SPI.h>
|
|
#include <RAK13800_W5100S.h>
|
|
|
|
#ifndef ETHERNET_TCP_PORT
|
|
#define ETHERNET_TCP_PORT 5000
|
|
#endif
|
|
// define ETHERNET_RAW_LINE=1 to use raw line-based CLI instead of framed packets
|
|
|
|
class SerialEthernetInterface : public BaseSerialInterface {
|
|
bool deviceConnected;
|
|
bool _isEnabled;
|
|
unsigned long _last_write;
|
|
uint8_t _state;
|
|
uint16_t _frame_len;
|
|
uint16_t _rx_len;
|
|
uint8_t _rx_buf[MAX_FRAME_SIZE];
|
|
|
|
EthernetServer server;
|
|
EthernetClient client;
|
|
|
|
struct Frame {
|
|
uint8_t len;
|
|
uint8_t buf[MAX_FRAME_SIZE];
|
|
};
|
|
|
|
#define FRAME_QUEUE_SIZE 4
|
|
int send_queue_len;
|
|
Frame send_queue[FRAME_QUEUE_SIZE];
|
|
|
|
void clearBuffers() {
|
|
send_queue_len = 0;
|
|
_state = 0;
|
|
_frame_len = 0;
|
|
_rx_len = 0;
|
|
}
|
|
|
|
protected:
|
|
|
|
public:
|
|
SerialEthernetInterface() : server(EthernetServer(ETHERNET_TCP_PORT)) {
|
|
deviceConnected = false;
|
|
_isEnabled = false;
|
|
_last_write = 0;
|
|
send_queue_len = 0;
|
|
_state = 0;
|
|
_frame_len = 0;
|
|
_rx_len = 0;
|
|
}
|
|
bool begin();
|
|
|
|
// BaseSerialInterface methods
|
|
void enable() override;
|
|
void disable() override;
|
|
bool isEnabled() const override { return _isEnabled; }
|
|
|
|
bool isConnected() const override;
|
|
bool isWriteBusy() const override;
|
|
|
|
size_t writeFrame(const uint8_t src[], size_t len) override;
|
|
size_t checkRecvFrame(uint8_t dest[]) override;
|
|
|
|
void loop();
|
|
};
|
|
|
|
|
|
#if ETHERNET_DEBUG_LOGGING && ARDUINO
|
|
#include <Arduino.h>
|
|
#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 ETHERNET_DEBUG_PRINT(...) {}
|
|
#define ETHERNET_DEBUG_PRINTLN(...) {}
|
|
#define ETHERNET_DEBUG_PRINT_IP(...) {}
|
|
#endif
|