correct reaction on SET, GET and SETGET message types

breaker27 · Jan 6, 2014 · c6cd415 · c6cd415
1 parent 04f6c57
commit c6cd415
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/firmware/shc_powerswitch/shc_powerswitch.c b/firmware/shc_powerswitch/shc_powerswitch.c
@@ -217,8 +217,15 @@ void process_message(MessageTypeEnum messagetype, uint32_t messagegroupid, uint3
 
 	inc_packetcounter();
 
+	// "Set" -> send "Ack"
+	if (messagetype == MESSAGETYPE_SET)
+	{
+		pkg_header_init_powerswitch_switchstate_ack();
+
+		UART_PUTS("Sending Ack\r\n");
+	}
 	// "Get" or "SetGet" -> send "AckStatus"
-	if ((messagetype == MESSAGETYPE_GET) && (messagetype != MESSAGETYPE_SETGET))
+	else
 	{
 		pkg_header_init_powerswitch_switchstate_ackstatus();
 
@@ -228,13 +235,6 @@ void process_message(MessageTypeEnum messagetype, uint32_t messagegroupid, uint3
 
 		UART_PUTS("Sending AckStatus\r\n");
 	}
-	// "Set" -> send "Ack"
-	else
-	{
-		pkg_header_init_powerswitch_switchstate_ack();
-
-		UART_PUTS("Sending Ack\r\n");
-	}
 
 	// set common fields
 	pkg_header_set_senderid(device_id);