Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2024-01-04 13:57:22 +00:00
8 changed files with 49 additions and 18 deletions

2
Conf.h
View File

@@ -332,6 +332,7 @@ public:
// The TFTSERIAL section
std::string getTFTSerialPort() const;
unsigned int getTFTSerialBrightness() const;
unsigned int getTFTSerialScreenLayout() const;
// The HD44780 section
unsigned int getHD44780Rows() const;
@@ -655,6 +656,7 @@ private:
std::string m_tftSerialPort;
unsigned int m_tftSerialBrightness;
unsigned int m_tftSerialScreenLayout;
unsigned int m_hd44780Rows;
unsigned int m_hd44780Columns;