20200927

platform/zigbee/app/builder/Z3GatewayHost/cli.c

@@ -2376,9 +2376,9 @@ static EmberCommandEntry emberCommandTablePluginOtaStorageCommonCommands[] = {
   emberCommandEntryActionWithDetails("data-print", emAfOtaStorageDataPrint, "uw", "Print arbitray bytes of the OTA image on disk.", emberCommandTablePluginOtaStorageCommonDataPrintCommandArguments),
   emberCommandEntryActionWithDetails("delete", emAfOtaImageDelete, "u", "Deletes the image at the specified index.", emberCommandTablePluginOtaStorageCommonDeleteCommandArguments),
   emberCommandEntryActionWithDetails("printImages", emAfOtaPrintAllImages, "", "Prints the images.", NULL),
-  emberCommandEntryActionWithDetails("reload", emAfOtaReloadStorageDevice, "", "Reload the storage device.", NULL),
-  emberCommandEntryActionWithDetails("storage-info", emAfOtaStorageInfoPrint, "", "Print information about the storage device.", NULL),
-  emberCommandEntryTerminator()
+	emberCommandEntryActionWithDetails("reload", emAfOtaReloadStorageDevice, "", "Reload the storage device.", NULL),
+	emberCommandEntryActionWithDetails("storage-info", emAfOtaStorageInfoPrint, "", "Print information about the storage device.", NULL),
+	emberCommandEntryTerminator()
 };
 
 #if defined(EMBER_COMMAND_INTEPRETER_HAS_DESCRIPTION_FIELD)

platform/zigbee/app/builder/Z3GatewayHost/enums.h

@@ -1989,7 +1989,7 @@ typedef enum {
   EMBER_ZCL_STATUS_ABORT                        = 0x95,
   EMBER_ZCL_STATUS_INVALID_IMAGE                = 0x96,
   EMBER_ZCL_STATUS_WAIT_FOR_DATA                = 0x97,
-  EMBER_ZCL_STATUS_NO_IMAGE_AVAILABLE           = 0x98,
+	EMBER_ZCL_STATUS_NO_IMAGE_AVAILABLE           = 0x98,
   EMBER_ZCL_STATUS_REQUIRE_MORE_IMAGE           = 0x99,
   EMBER_ZCL_STATUS_HARDWARE_FAILURE             = 0xC0,
   EMBER_ZCL_STATUS_SOFTWARE_FAILURE             = 0xC1,

platform/zigbee/app/builder/Z3GatewayHost/yjq_ezsp.c

@@ -89,6 +89,8 @@ void kk_read_ncp_configuration_without_memory_allocation(void)
 
 extern void kk_print_network_info(void);
 extern void test_123(int val);
+extern void kk_ota_test111();
+extern void kk_ota_test123123123();
 
 void kk_message_process(char *messageString)
 {
@@ -111,30 +113,10 @@ void kk_message_process(char *messageString)
 	}	
 
 	if(MEMCOMPARE(messageString,"AT+TEST1\r\n",len)==0){
-		uint16_t h;
-		unsigned char s,l;
-		RGB_to_HSL(100, 150, 200,&h,&s,&l);
-		emberAfAppPrintln("%d,%d,%d",h,s,l);
-		emberAfAppPrintln("%d,%d,%d",h*254/360,s*254/100,l);
-		kk_device_table_s* dev = kk_device_find_by_node(0x5996);
-		dev->manage.dev.ColorLighting.color.HSL.L = l;
-		zclLevel_MoveToLevel(0x5996,1,l,0,NULL,NULL);
-		zclColorControlMovetohueandsat(0x5996,1,h*254/360,s*254/100,0,0,0,0);
-		
-		emberAfAppPrint("AT+TEST1\r\n" );
+		kk_ota_test123123123();
 	}	
-	if(MEMCOMPARE(messageString,"AT+TEST2\r\n",len)==0){
-		uint16_t h;
-		unsigned char s,l;
-		RGB_to_HSL(20, 24, 22,&h,&s,&l);
-		emberAfAppPrintln("%d,%d,%d",h,s,l);
-		emberAfAppPrintln("%d,%d,%d",h*254/360,s*254/100,l);
-		kk_device_table_s* dev = kk_device_find_by_node(0x5996);
-		dev->manage.dev.ColorLighting.color.HSL.L = l;
-		zclLevel_MoveToLevel(0x5996,1,l,0,NULL,NULL);
-		zclColorControlMovetohueandsat(0x5996,1,h*254/360,s*254/100,0,0,0,0);
-		
-		emberAfAppPrint("AT+TEST2\r\n" );
+	if(MEMCOMPARE(messageString,"AT+TEST\r\n",len)==0){
+		kk_ota_test111();
 	}
 }
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////