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

263 Impuls added

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-11-02 01:21:51 +03:00
parent 518a0e0404
commit 0bfc876c65
17 changed files with 161 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/BufferExecute.h
View File

@@ -5,4 +5,6 @@ extern void loopCmdAdd(const String &cmdStr);
extern void fileCmdExecute(const String &filename);
extern void csvCmdExecute(String &cmdStr);
extern void spaceCmdExecute(String &cmdStr);
extern void loopCmdExecute();
extern void loopCmdExecute();
extern void addKey(String& key, int number);
extern int getKeyNum(String& key);

4
include/Class/LineParsing.h
View File

@@ -155,10 +155,10 @@ class LineParsing {
String gint() {
return _int;
}
String gmaxcnt() {
String gcnt() {
return _cnt;
}
String gvalue() {
String gval() {
return _val;
}

4
include/Consts.h
View File

@@ -3,7 +3,7 @@
//===========Firmware=============================================================================================================================================
#ifdef ESP8266
#define FIRMWARE_NAME "esp8266-iotm"
#define FIRMWARE_VERSION 262
#define FIRMWARE_VERSION 263
#endif
#ifdef ESP32
#define FIRMWARE_NAME "esp32-iotm"
@@ -31,7 +31,7 @@
//#define MDNS_ENABLED
//#define WEBSOCKET_ENABLED
//#define LAYOUT_IN_RAM
//#define UDP_ENABLED
#define UDP_ENABLED
//#define SSDP_ENABLED
//=========Sensors enable/disable=================================================================================================================================

13
include/Global.h
View File

@@ -65,23 +65,20 @@ extern String eventBuf;
extern String itemsFile;
extern String itemsLine;
//key lists and numbers
extern String impulsKeyList;
extern int impulsEnterCounter;
// Sensors
extern String sensorReadingMap10sec;
extern String sensorReadingMap30sec;
extern int8_t dallasEnterCounter;
extern String logging_value_names_list;
extern String loggingKeyList;
extern int enter_to_logging_counter;
extern int scenario_line_status[40];
extern int lastVersion;
//Global functions
// Logging
extern void logging();
extern void deleteOldDate(String filename, size_t max_lines, String date_to_add);
// Main
extern void setChipId();
extern void saveConfig();

2
include/ItemsCmd.h
View File

@@ -51,3 +51,5 @@ extern void sysUptime();
extern void uptimeReading();
extern void logging();
extern void impuls();

14
include/items/ImpulsOutClass.h
View File

@@ -9,21 +9,23 @@ typedef std::vector<ImpulsOutClass> MyImpulsOutVector;
class ImpulsOutClass {
public:
ImpulsOutClass(unsigned long impulsPeriod, unsigned int impulsCount, unsigned int impulsPin);
ImpulsOutClass(unsigned int impulsPin);
~ImpulsOutClass();
void loop();
void activate();
void execute(unsigned long impulsPeriod, unsigned int impulsCount);
private:
unsigned long currentMillis;
unsigned long prevMillis;
unsigned long _impulsPeriod;
unsigned int _impulsCount;
unsigned int _impulsCountBuf;
unsigned int _impulsPin;
unsigned long _impulsPeriod = 0;
unsigned int _impulsCount = 0;
unsigned int _impulsCountBuf = 0;
unsigned int _impulsPin = 0;
};
extern MyImpulsOutVector* myImpulsOut;
extern void impulsExecute();