jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add telnet compile options

Browse Source
This commit is contained in:
Theo Arends 2025-03-25 11:19:53 +01:00
parent a3b564f4f3
commit 69fca99ac1
5 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasmota/my_user_config.h
View File

@ -486,7 +486,14 @@
#define USE_KNX_WEB_MENU // Enable KNX WEB MENU (+8.3k code, +144 mem) #define USE_KNX_WEB_MENU // Enable KNX WEB MENU (+8.3k code, +144 mem)
// -- Telnet -------------------------------------- // -- Telnet --------------------------------------
//#define USE_TELNET // Add support for telnet (+1k6 code) //#define USE_TELNET // Add support for telnet (+1k9 code)
// #define TELNET_BUF_SIZE 256 // [TelnetBuffer] Size of input buffer (default 256)
// #define TELNET_START 1 // [Telnet] Start telnet on network connection (default 0 - No start)
// #define TELNET_PORT 23 // [Telnet] Telnet port (default 23)
// #define TELNET_COL_DISABLE 1 // [TelnetColor] Disable colors (default 0 - Enable colors)
// #define TELNET_COL_PROMPT 33 // [TelnetColor] ANSI color escape code (default 33 - Yellow)
// #define TELNET_COL_RESPONSE 32 // [TelnetColor] ANSI color escape code (default 32 - Green)
// #define TELNET_COL_LOGGING 36 // [TelnetColor] ANSI color escape code (default 36 - Cyan)
// -- HTTP ---------------------------------------- // -- HTTP ----------------------------------------
#define USE_WEBSERVER // Enable web server and Wi-Fi Manager (+66k code, +8k mem) #define USE_WEBSERVER // Enable web server and Wi-Fi Manager (+66k code, +8k mem)

6
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -1537,12 +1537,6 @@ bool Xdrv03(uint32_t function)
case FUNC_COMMAND: case FUNC_COMMAND:
result = DecodeCommand(kEnergyCommands, EnergyCommand); result = DecodeCommand(kEnergyCommands, EnergyCommand);
break; break;
case FUNC_NETWORK_UP:
XnrgCall(FUNC_NETWORK_UP);
break;
case FUNC_NETWORK_DOWN:
XnrgCall(FUNC_NETWORK_DOWN);
break;
case FUNC_ACTIVE: case FUNC_ACTIVE:
result = true; result = true;
break; break;

6
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -1947,12 +1947,6 @@ bool Xdrv03(uint32_t function)
case FUNC_COMMAND: case FUNC_COMMAND:
result = DecodeCommand(kEnergyCommands, EnergyCommand); result = DecodeCommand(kEnergyCommands, EnergyCommand);
break; break;
case FUNC_NETWORK_UP:
XnrgCall(FUNC_NETWORK_UP);
break;
case FUNC_NETWORK_DOWN:
XnrgCall(FUNC_NETWORK_DOWN);
break;
case FUNC_ACTIVE: case FUNC_ACTIVE:
result = true; result = true;
break; break;

3
tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View File

@ -14114,9 +14114,6 @@ bool Xdrv10(uint32_t function) {
WebServer82Loop(); WebServer82Loop();
#endif #endif
break; break;
case FUNC_NETWORK_UP:
break;
case FUNC_ACTIVE: case FUNC_ACTIVE:
result = true; result = true;

86
tasmota/tasmota_xdrv_driver/xdrv_78_telnet.ino
View File

@ -13,7 +13,7 @@
* Supported commands: * Supported commands:
* Telnet - Show telnet server state * Telnet - Show telnet server state
* Telnet 0 - Disable telnet server * Telnet 0 - Disable telnet server
* Telnet 1 - Enable telnet server on port 23 * Telnet 1 - Enable telnet server on port TELNET_PORT
* Telnet 23 - Enable telnet server on port 23 * Telnet 23 - Enable telnet server on port 23
* Telnet 1, 192.168.2.1 - Enable telnet server and only allow connection from 192.168.2.1 * Telnet 1, 192.168.2.1 - Enable telnet server and only allow connection from 192.168.2.1
* TelnetBuffer - Show current input buffer size (default 256) * TelnetBuffer - Show current input buffer size (default 256)
@ -24,9 +24,11 @@
* TelnetColor 2 - Enable last set colors * TelnetColor 2 - Enable last set colors
* TelnetColor 33,32,37 - Set prompt (yellow), response (green) and log (white) colors * TelnetColor 33,32,37 - Set prompt (yellow), response (green) and log (white) colors
* *
* To start telnet at restart add one of below rules like * To start telnet at restart:
* on system#boot do backlog telnetcolor 33,32,36; telnet 1 endon * Add one of below rules like
* on system#boot do backlog telnetcolor 0; telnet 1 endon * on system#boot do backlog telnetcolor 33,32,36; telnet 1 endon
* on system#boot do backlog telnetcolor 0; telnet 1 endon
* Enable compile option TELNET_START
* *
* Supported ANSI Escape Color codes: * Supported ANSI Escape Color codes:
* Normal Bright * Normal Bright
@ -44,17 +46,27 @@
#define XDRV_78 78 #define XDRV_78 78
#ifndef TELNET_BUF_SIZE #ifndef TELNET_BUF_SIZE
#define TELNET_BUF_SIZE 256 // Size of input buffer #define TELNET_BUF_SIZE 256 // [TelnetBuffer] Size of input buffer (default 256)
#endif #endif
#ifndef TELNET_START
#define TELNET_START 0 // [Telnet] Start telnet on network connection (default 0 - No start)
#endif
#ifndef TELNET_PORT
#define TELNET_PORT 23 // [Telnet] Telnet port (default 23)
#endif
#ifndef TELNET_COL_DISABLE
#define TELNET_COL_DISABLE 0 // [TelnetColor] Disable colors (default 0 - Enable colors)
#endif
#ifndef TELNET_COL_PROMPT #ifndef TELNET_COL_PROMPT
#define TELNET_COL_PROMPT 33 // Yellow - ANSI color escape code #define TELNET_COL_PROMPT 33 // [TelnetColor] ANSI color escape code (default 33 - Yellow)
#endif #endif
#ifndef TELNET_COL_RESPONSE #ifndef TELNET_COL_RESPONSE
#define TELNET_COL_RESPONSE 32 // Green - ANSI color escape code #define TELNET_COL_RESPONSE 32 // [TelnetColor] ANSI color escape code (default 32 - Green)
#endif #endif
#ifndef TELNET_COL_LOGGING #ifndef TELNET_COL_LOGGING
#define TELNET_COL_LOGGING 36 // Cyan - ANSI color escape code #define TELNET_COL_LOGGING 36 // [TelnetColor] ANSI color escape code (default 36 - Cyan)
#endif #endif
struct { struct {
@ -221,11 +233,33 @@ void TelnetStop(void) {
Telnet.buffer = nullptr; Telnet.buffer = nullptr;
} }
void TelnetStart(void) {
if (Telnet.server) {
TelnetStop();
}
if (Telnet.port > 0) {
if (!Telnet.buffer) {
Telnet.buffer = (char*)malloc(Telnet.buffer_size);
}
if (Telnet.buffer) {
if (1 == Telnet.port) { Telnet.port = TELNET_PORT; }
Telnet.server = new WiFiServer(Telnet.port);
Telnet.server->begin(); // Start TCP server
Telnet.server->setNoDelay(true);
AddLog(LOG_LEVEL_INFO, PSTR("TLN: Started"));
return;
}
}
AddLog(LOG_LEVEL_INFO, PSTR("TLN: Stopped"));
}
void TelnetInit(void) { void TelnetInit(void) {
Telnet.buffer_size = TELNET_BUF_SIZE; Telnet.buffer_size = TELNET_BUF_SIZE;
Telnet.color_disable = TELNET_COL_DISABLE;
Telnet.color[0] = TELNET_COL_PROMPT; Telnet.color[0] = TELNET_COL_PROMPT;
Telnet.color[1] = TELNET_COL_RESPONSE; Telnet.color[1] = TELNET_COL_RESPONSE;
Telnet.color[2] = TELNET_COL_LOGGING; Telnet.color[2] = TELNET_COL_LOGGING;
Telnet.port = (TELNET_START) ? TELNET_PORT : 0;
} }
/*********************************************************************************************\ /*********************************************************************************************\
@ -241,7 +275,7 @@ void (* const TelnetCommand[])(void) PROGMEM = {
void CmndTelnet(void) { void CmndTelnet(void) {
// Telnet - Show telnet server state // Telnet - Show telnet server state
// Telnet 0 - Disable telnet server // Telnet 0 - Disable telnet server
// Telnet 1 - Enable telnet server on port 23 // Telnet 1 - Enable telnet server on port TELNET_PORT
// Telnet 23 - Enable telnet server on port 23 // Telnet 23 - Enable telnet server on port 23
// Telnet 1, 192.168.2.1 - Enable telnet server and only allow connection from 192.168.2.1 // Telnet 1, 192.168.2.1 - Enable telnet server and only allow connection from 192.168.2.1
if (!TasmotaGlobal.global_state.network_down) { if (!TasmotaGlobal.global_state.network_down) {
@ -256,20 +290,7 @@ void CmndTelnet(void) {
Telnet.ip_filter_enabled = false; // Disable whitelist if previously set Telnet.ip_filter_enabled = false; // Disable whitelist if previously set
} }
if (Telnet.server) { TelnetStart();
TelnetStop();
}
if (Telnet.port > 0) {
if (!Telnet.buffer) {
Telnet.buffer = (char*)malloc(Telnet.buffer_size);
}
if (Telnet.buffer) {
if (1 == Telnet.port) { Telnet.port = 23; }
Telnet.server = new WiFiServer(Telnet.port);
Telnet.server->begin(); // Start TCP server
Telnet.server->setNoDelay(true);
}
}
} }
if (Telnet.server) { if (Telnet.server) {
ResponseCmndChar_P(PSTR("Started")); ResponseCmndChar_P(PSTR("Started"));
@ -345,16 +366,25 @@ void CmndTelnetColor(void) {
bool Xdrv78(uint32_t function) { bool Xdrv78(uint32_t function) {
bool result = false; bool result = false;
if (FUNC_INIT == function) { switch (function) {
TelnetInit(); case FUNC_INIT:
TelnetInit();
break;
case FUNC_NETWORK_UP:
if (!Telnet.server && (Telnet.port > 0) && !TasmotaGlobal.restart_flag) {
TelnetStart();
}
break;
case FUNC_COMMAND:
result = DecodeCommand(kTelnetCommands, TelnetCommand);
break;
} }
else if (FUNC_COMMAND == function) { if (Telnet.buffer) {
result = DecodeCommand(kTelnetCommands, TelnetCommand);
} else if (Telnet.buffer) {
switch (function) { switch (function) {
case FUNC_LOOP: case FUNC_LOOP:
TelnetLoop(); TelnetLoop();
break; break;
case FUNC_NETWORK_DOWN:
case FUNC_SAVE_BEFORE_RESTART: case FUNC_SAVE_BEFORE_RESTART:
TelnetStop(); TelnetStop();
break; break;