iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 20:09:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Переименовываем class UART в IoTmUART, т.к. имя забронировано

Browse Source
This commit is contained in:
biver
2023-03-28 09:14:03 +03:00
parent 30a0754823
commit a68b143e54
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/sensors/UART/Uart.cpp
View File

@@ -11,7 +11,7 @@
HardwareSerial* myUART = nullptr; HardwareSerial* myUART = nullptr;
#endif #endif
class UART : public IoTItem { class IoTmUART : public IoTItem {
private: private:
int _eventFormat = 0; // 0 - нет приема, 1 - json IoTM, 2 - Nextion int _eventFormat = 0; // 0 - нет приема, 1 - json IoTM, 2 - Nextion
char _inc; char _inc;
@@ -26,7 +26,7 @@ class UART : public IoTItem {
#endif #endif
public: public:
UART(String parameters) : IoTItem(parameters) { IoTmUART(String parameters) : IoTItem(parameters) {
int _tx, _rx, _speed, _line; int _tx, _rx, _speed, _line;
jsonRead(parameters, "tx", _tx); jsonRead(parameters, "tx", _tx);
jsonRead(parameters, "rx", _rx); jsonRead(parameters, "rx", _rx);
@@ -351,7 +351,7 @@ class UART : public IoTItem {
void* getAPI_UART(String subtype, String param) { void* getAPI_UART(String subtype, String param) {
if (subtype == F("UART")) { if (subtype == F("UART")) {
return new UART(param); return new IoTmUART(param);
} else { } else {
return nullptr; return nullptr;
} }