andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Proddy
2023-01-08 19:51:30 +01:00
parent da04a0d161
commit 9b54c1aa04
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/console.cpp
View File

@@ -746,7 +746,7 @@ std::vector<bool> EMSESPConsole::ptys_;
#endif #endif
EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local) EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local)
: APP_SHELL_TYPE(emsesp, stream, ShellContext::MAIN, local ? (CommandFlags::USER | CommandFlags::LOCAL) : CommandFlags::USER) : EMSESPShell(emsesp, stream, ShellContext::MAIN, local ? (CommandFlags::USER | CommandFlags::LOCAL) : CommandFlags::USER)
, name_("ttyS0") , name_("ttyS0")
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
, pty_(std::numeric_limits<size_t>::max()) , pty_(std::numeric_limits<size_t>::max())
@@ -758,7 +758,7 @@ EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local)
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, const IPAddress & addr, uint16_t port) EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, const IPAddress & addr, uint16_t port)
: APP_SHELL_TYPE(emsesp, stream, ShellContext::MAIN, CommandFlags::USER) : EMSESPShell(emsesp, stream, ShellContext::MAIN, CommandFlags::USER)
, addr_(addr) , addr_(addr)
, port_(port) { , port_(port) {
std::array<char, 16> text; std::array<char, 16> text;

6
src/console_stream.h
View File

@@ -22,13 +22,9 @@
#include "console.h" #include "console.h"
// #define APP_SHELL_TYPE uuid::console::StreamConsole, public EMSESPShell
#define APP_SHELL_TYPE EMSESPShell
// #define APP_SHELL_TYPE uuid::console::StreamConsole
namespace emsesp { namespace emsesp {
class EMSESPConsole : public APP_SHELL_TYPE { class EMSESPConsole : public EMSESPShell {
public: public:
EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local); EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local);
#ifndef ENV_NATIVE #ifndef ENV_NATIVE

7
src/emsesp.h
View File

@@ -92,10 +92,13 @@ class Shower;
class EMSESP { class EMSESP {
public: public:
EMSESP();
~EMSESP() = default; ~EMSESP() = default;
virtual void start(); virtual void start();
virtual void loop(); virtual void loop();
static uuid::log::Logger logger();
static void publish_device_values(uint8_t device_type); static void publish_device_values(uint8_t device_type);
static void publish_other_values(); static void publish_other_values();
static void publish_sensor_values(const bool time, const bool force = false); static void publish_sensor_values(const bool time, const bool force = false);
@@ -226,10 +229,6 @@ class EMSESP {
static WebLogService webLogService; static WebLogService webLogService;
static WebCustomizationService webCustomizationService; static WebCustomizationService webCustomizationService;
static uuid::log::Logger logger();
EMSESP();
private: private:
static std::string device_tostring(const uint8_t device_id); static std::string device_tostring(const uint8_t device_id);
static void process_UBADevices(std::shared_ptr<const Telegram> telegram); static void process_UBADevices(std::shared_ptr<const Telegram> telegram);