tuyamCU stub, unfinished uart handler

openshwprojects · Oct 16, 2022 · d25ced9 · d25ced9
1 parent 34c684d
commit d25ced9
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 2 deletions.
diff --git a/src/cmnds/cmd_eventHandlers.c b/src/cmnds/cmd_eventHandlers.c
@@ -122,6 +122,8 @@ static int EVENT_ParseEventName(const char *s) {
 		return CMD_EVENT_PIN_ONDBLCLICK;
 	if(!stricmp(s,"OnChannelChange"))
 		return CMD_EVENT_CHANNEL_ONCHANGE;
+	if(!stricmp(s,"OnUART"))
+		return CMD_EVENT_ON_UART;
 	return CMD_EVENT_NONE;
 }
 static bool EVENT_EvaluateCondition(int code, int argument, int next) {
@@ -187,6 +189,8 @@ typedef struct eventHandler_s {
 	short requiredArgument;
 	// command to execute when it happens
 	char *command;
+	// for UART event handlers?
+	char *requiredArgumentText;
 
 	struct eventHandler_s *next;
 } eventHandler_t;
@@ -216,11 +220,27 @@ void EventHandlers_AddEventHandler_Integer(byte eventCode, int type, int require
 
 	ev->next = g_eventHandlers;
 	g_eventHandlers = ev;
+
+	ev->requiredArgumentText = NULL;
 	ev->eventType = type;
 	ev->command = test_strdup(commandToRun);
 	ev->eventCode = eventCode;
 	ev->requiredArgument = requiredArgument;
 }
+
+void EventHandlers_AddEventHandler_String(byte eventCode, int type, const char *requiredArgument, const char *commandToRun)
+{
+	eventHandler_t *ev = malloc(sizeof(eventHandler_t));
+
+	ev->next = g_eventHandlers;
+	g_eventHandlers = ev;
+
+	ev->requiredArgumentText = test_strdup(requiredArgument);
+	ev->eventType = type;
+	ev->command = test_strdup(commandToRun);
+	ev->eventCode = eventCode;
+	ev->requiredArgument = 0;
+}
 void EventHandlers_FireEvent(byte eventCode, int argument) {
 	struct eventHandler_s *ev;
 
@@ -236,13 +256,30 @@ void EventHandlers_FireEvent(byte eventCode, int argument) {
 		ev = ev->next;
 	}
 
+}
+void EventHandlers_FireEvent_String(byte eventCode, const char *argument) {
+	struct eventHandler_s *ev;
+
+	ev = g_eventHandlers;
+
+	while(ev) {
+		if(eventCode==ev->eventCode) {
+			if(argument == ev->requiredArgument) {
+				ADDLOG_INFO(LOG_FEATURE_EVENT, "EventHandlers_ProcessVariableChange_Integer: executing command %s",ev->command);
+				CMD_ExecuteCommand(ev->command, COMMAND_FLAG_SOURCE_SCRIPT);
+			}
+		}
+		ev = ev->next;
+	}
+
 }
 
 static int CMD_AddEventHandler(const void *context, const char *cmd, const char *args, int cmdFlags){
 	const char *eventName;
 	int reqArg;
 	const char *cmdToCall;
 	int eventCode;
+	const char *reqArgStr;
 
 	if(args==0||*args==0) {
 		ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddEventHandler: command requires argument");
@@ -255,7 +292,13 @@ static int CMD_AddEventHandler(const void *context, const char *cmd, const char
 	}
 
 	eventName = Tokenizer_GetArg(0);
-	reqArg = Tokenizer_GetArgInteger(1);
+	if(false==Tokenizer_IsArgInteger(1)) {
+		reqArg = 0;
+		reqArgStr = Tokenizer_GetArg(1);
+	} else {
+		reqArgStr = 0;
+		reqArg = Tokenizer_GetArgInteger(1);
+	}
 	cmdToCall = Tokenizer_GetArgFrom(2);
 
 	eventCode = EVENT_ParseEventName(eventName);
@@ -265,7 +308,11 @@ static int CMD_AddEventHandler(const void *context, const char *cmd, const char
 	}
 
 	ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddEventHandler: added %s with cmd %s",eventName,cmdToCall);
-	EventHandlers_AddEventHandler_Integer(eventCode,EVENT_DEFAULT,reqArg,cmdToCall);
+	if(reqArgStr) {
+		EventHandlers_AddEventHandler_String(eventCode,EVENT_DEFAULT,reqArgStr,cmdToCall);
+	} else {
+		EventHandlers_AddEventHandler_Integer(eventCode,EVENT_DEFAULT,reqArg,cmdToCall);
+	}
 
 	return 1;
 }

diff --git a/src/cmnds/cmd_public.h b/src/cmnds/cmd_public.h
@@ -45,6 +45,10 @@ enum EventCode {
 
 	// this is for ToggleChannelOnToggle
 	CMD_EVENT_PIN_ONTOGGLE,
+
+	// Argument is a string
+	// You can fire an event when TuyaMCU or something receives given string
+	CMD_EVENT_ON_UART,
 
 	// must be lower than 256
 	CMD_EVENT_MAX_TYPES
@@ -74,13 +78,15 @@ int Tokenizer_GetArgsCount();
 const char *Tokenizer_GetArg(int i);
 const char *Tokenizer_GetArgFrom(int i);
 int Tokenizer_GetArgInteger(int i);
+bool Tokenizer_IsArgInteger(int i);
 int Tokenizer_GetArgIntegerRange(int i, int rangeMax, int rangeMin);
 void Tokenizer_TokenizeString(const char *s);
 // cmd_repeatingEvents.c
 void RepeatingEvents_Init();
 void RepeatingEvents_OnEverySecond();
 // cmd_eventHandlers.c
 void EventHandlers_Init();
+void EventHandlers_FireEvent_String(byte eventCode, const char *argument);
 void EventHandlers_FireEvent(byte eventCode, int argument);
 void EventHandlers_ProcessVariableChange_Integer(byte eventCode, int oldValue, int newValue);
 // cmd_tasmota.c

diff --git a/src/cmnds/cmd_tokenizer.c b/src/cmnds/cmd_tokenizer.c
@@ -28,6 +28,9 @@ bool isWhiteSpace(char ch) {
 int Tokenizer_GetArgsCount() {
 	return g_numArgs;
 }
+bool Tokenizer_IsArgInteger(int i) {
+	return strIsInteger(g_args[i]);
+}
 const char *Tokenizer_GetArg(int i) {
 	return g_args[i];
 }

diff --git a/src/driver/drv_tuyaMCU.c b/src/driver/drv_tuyaMCU.c
@@ -844,6 +844,7 @@ void TuyaMCU_ParseStateMessage(const byte *data, int len) {
 
 void TuyaMCU_ProcessIncoming(const byte *data, int len) {
 	int checkLen;
+	int dataCount;
 	int i;
 	byte checkCheckSum;
 	byte cmd;
@@ -893,6 +894,27 @@ void TuyaMCU_ProcessIncoming(const byte *data, int len) {
 
 		}
 		break;
+	case TUYA_CMD_MCU_CONF:
+		// https://github.com/openshwprojects/OpenBK7231T_App/issues/291
+		// header	ver	TUYA_CMD_MCU_CONF	LENGHT							Chksum
+		// Pushing
+		// 55 AA	01	02					00 03	FF 01 01			06 
+		// 55 AA	01	02					00 03	FF 01 00			05 
+		// Rotating down
+		// 55 AA	01	02					00 05	01 24 02 01 0A		39 
+		// 55 AA	01	02					00 03	01 09 00			0F 
+		// Rotating up
+		// 55 AA	01	02					00 05	01 24 01 01 0A		38 
+		// 55 AA	01	02					00 03	01 09 01			10 
+		dataCount = data[5];
+		if(5 + dataCount + 1 != len) {
+			addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU,"TuyaMCU_ProcessIncoming: TUYA_CMD_MCU_CONF had wrong data lenght?");
+		} else {
+			addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU,"TuyaMCU_ProcessIncoming: TUYA_CMD_MCU_CONF, TODO!");
+
+		}
+		break;
+
 	default:
 		addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU,"TuyaMCU_ProcessIncoming: unhandled type %i",cmd);
 		break;