andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-10 05:39:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

new interface class itemCmd as interface between objects

Browse Source 
Modbus polling->MQTT
syslog fix
different level of logging infoSerial errorSerial
This commit is contained in:
Andrey Klimov
2020-06-06 18:03:57 +03:00
parent 8c95732164
commit e87240d841
8 changed files with 369 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lighthub/item.h
View File

@@ -61,8 +61,18 @@ e-mail anklimov@gmail.com
#define CMD_NUM 0
#define CMD_UNKNOWN -1
#define CMD_JSON -2
#define CMD_RGB -3
#define CMD_HSV -4
//#define CMD_RGB -3
//#define CMD_HSV -4
typedef char cmdstr[9];
const cmdstr commands_P[] PROGMEM =
{
"","ON","OFF","RESTORE","TOGGLE","HALT","XON","XOFF","INCREASE","DECREASE",
"HEAT","COOL","AUTO","FAN_ONLY","DRY","STOP","HIGH","MEDIUM","LOW",
"TRUE","FALSE","ENABLED","DISABLED","RGB","HSV"
};
#define commandsNum sizeof(commands_P)/sizeof(cmdstr)
#define CMD_ON 1
#define CMD_OFF 2
@@ -78,10 +88,16 @@ e-mail anklimov@gmail.com
#define CMD_AUTO 0xc
#define CMD_FAN 0xd
#define CMD_DRY 0xe
//#define CMD_SET 0xf
#define CMD_STOP 0xf
#define CMD_HIGH 0x10 //AC fan leve
#define CMD_MED 0x11
#define CMD_LOW 0x12
#define CMD_ENABLED 0x13
#define CMD_DISABLED 0x14
#define CMD_TRUE 0x15
#define CMD_FALSE 0x16
#define CMD_RGB 0x17
#define CMD_HSV 0x18
//#define CMD_CURTEMP 0xf
#define CMD_MASK 0xff
#define FLAG_MASK 0xff00
@@ -94,6 +110,10 @@ e-mail anklimov@gmail.com
#define ACTION_NEEDED 0x1000
#define ACTION_IN_PROCESS 0x2000
//#define CMD_REPORT 32
#define I_TYPE 0 //Type of item
@@ -130,7 +150,12 @@ ST_FLOAT_FARENHEIT= 5,
ST_RGB = 6,
ST_RGBW = 7,
ST_PERCENTS255 = 8,
ST_HSV255 = 9
ST_HSV255 = 9,
ST_INT32 = 10,
ST_UINT32 = 11,
ST_STRING = 12,
ST_FLOAT = 13,
ST_COMMAND = 15
};
@@ -138,7 +163,17 @@ ST_HSV255 = 9
typedef union
{
long int aslong;
float asfloat;
int32_t asInt32;
uint32_t asUint32;
char* asString;
float asfloat;
struct
{
uint8_t cmd_code;
uint8_t cmd_flag;
uint8_t cmd_effect;
uint8_t cmd_effect_param;
};
struct
{ uint8_t v;
uint8_t s;
@@ -155,14 +190,18 @@ typedef union
};
} itemStore;
/*
typedef union
class itemCmd
{
long int aslong;
struct
public:
itemStoreType type;
itemStore param;
itemCmd Percents(int i);
itemCmd Int(int32_t i);
itemCmd Int(uint32_t i);
itemCmd Cmd(uint8_t i);
char * toString(char * Buffer, int bufLen);
} ;
} RGBWstore;
*/
#pragma pack(pop)
class Item