2020 0930

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_manager.c

@@ -156,6 +156,9 @@ void emberAfPluginDeviceTableDeviceLeftCallback(EmberEUI64 nodeEui64)
 	rpc_printfJSON("left",nodeJson);
 
 	kk_msg_report_dev_leave(deviceTable[deviceTableIndex].eui64);
+
+	kk_device_table_delete(deviceTable[deviceTableIndex].eui64);
+	kk_device_db_delete(deviceTable[deviceTableIndex].eui64);
 }
 
 

platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c

@@ -266,7 +266,7 @@ int _init_param(struct jrpc_server *server) {
 	//kk_zlog_init("paltform");
 
 	printf("getenv\r\n");
-	char * debug_level_env = getenv("HOME");
+	char * debug_level_env = getenv("JRPC_DEBUG");
 	printf("getenv(JRPC_DEBUG):%s\n", server->debug_level);
 	if (debug_level_env == NULL)
 		server->debug_level = 0;

platform/zigbee/protocol/zigbee/app/ezsp-host/ash/ash-host-ui.c

@@ -36,6 +36,7 @@
 static const char options[] = "b:f:hv::i:n:o:p:r:s:t:x:";
 bool checkSerialPort(const char* portString);
 
+
 bool ezspInternalProcessCommandOptions(int argc, char *argv[], char *errStr)
 {
 	int c;
@@ -137,7 +138,7 @@ bool ezspInternalProcessCommandOptions(int argc, char *argv[], char *errStr)
 	        devport[5] = '\0';
 	        if ( strncmp(devport, port, 5) == 0) {
 	          strncat(devport, port + 5, ASH_PORT_LEN - 5 - 1);
-  #ifdef __CYGWIN__
+#ifdef __CYGWIN__
 	        } else if ( ((strncmp("COM", port, 3) == 0)
 	                     || (strncmp("com", port, 3) == 0) )
 	                    && (sscanf(port + 3, "%hhu", &portnum) == 1)
@@ -145,10 +146,10 @@ bool ezspInternalProcessCommandOptions(int argc, char *argv[], char *errStr)
 	          snprintf(devport, ASH_PORT_LEN, "/dev/ttyS%hhu", portnum - 1);
 	        } else if ( (sscanf(port, "%hhu", &portnum) == 1) && portnum ) {
 	          snprintf(devport, ASH_PORT_LEN, "/dev/ttyS%hhu", portnum - 1);
-  #else
+#else
 	        } else if (sscanf(port, "%hhu", &portnum) == 1) {
 	          snprintf(devport, ASH_PORT_LEN, "/dev/ttyS%hhu", portnum);
-  #endif
+#endif
 	        } else {
 	          strncat(devport, port, ASH_PORT_LEN - 1);
 	        }

platform/zigbee/protocol/zigbee/app/ezsp-host/ezsp-host-io.c

@@ -559,6 +559,7 @@ bool ezspSerialPortRegisterCallback(EzspSerialPortCallbackFunction callback)
 
 void ezspSerialWriteByte(uint8_t byte)
 {
+
   BUMP_HOST_COUNTER(txBytes);
 #ifdef IO_LOG
   {

platform/zigbee/protocol/zigbee/app/framework/plugin/ota-server-policy/ota-server-policy.c

@@ -226,11 +226,13 @@ uint8_t emberAfOtaServerQueryCallback(const EmberAfOtaImageId* currentImageId,
 		// We only perform a check if both the query and the
 		// file have hardware version(s).  If one or the other doesn't
 		// have them, we assume a match is still possible.
+		otaPrintln("[OTA]2222,hardwareVersion=%d",hardwareVersion);
 		if (hardwareVersion) {
 			EmberAfOtaHeader header;
 			emberAfOtaStorageGetFullHeaderCallback(nextUpgradeImageId,
 													&header);
 			if (header.fieldControl & HARDWARE_VERSIONS_PRESENT_MASK) {
+				otaPrintln("[OTA]3333");
 				if (*hardwareVersion < header.minimumHardwareVersion
 					|| header.maximumHardwareVersion < *hardwareVersion) {
 					otaPrintln("Hardware version 0x%02X does not fall within the min (0x%02X) and max (0x%02X) hardware versions in the file.",
@@ -246,16 +248,19 @@ uint8_t emberAfOtaServerQueryCallback(const EmberAfOtaImageId* currentImageId,
 		// as a potential upgrade candidate because the hardware is out
 		// of range.
 		if (!hardwareVersionMismatch) {
+			otaPrintln("[OTA]4444,%x,%x",nextUpgradeImageId->firmwareVersion,currentImageId->firmwareVersion);
 			status = (determineNextSoftwareVersion(nextUpgradeImageId->firmwareVersion,
 													currentImageId->firmwareVersion)
 						? EMBER_ZCL_STATUS_SUCCESS
 						: EMBER_ZCL_STATUS_NO_IMAGE_AVAILABLE);
+			otaPrintln("[OTA]555,status=%x",status);
 			if (status == EMBER_ZCL_STATUS_SUCCESS) {
 				otaPrintln("Next fw version is: 0x%4X",
 							nextUpgradeImageId->firmwareVersion);
 			}
 		}
 	}
+	otaPrintln("[OTA]11111");
 	return status;
 }
 

platform/zigbee/protocol/zigbee/app/framework/plugin/ota-server/ota-server.c

@@ -571,6 +571,54 @@ void emberAfOtaServerSendUpgradeCommandCallback(EmberNodeId dest,
 	}
 }
 
+
+
+void kk_ota_test123123123()
+{
+	EmberAfOtaImageId id;
+
+	id.manufacturerId = 0x1268;
+	id.imageTypeId = 0x2904;
+	id.firmwareVersion = 15;
+	emberAfOtaServerSendImageNotifyCallback(0xffff,
+												 1,
+												 0x03,
+												 0,
+												 &id);
+
+}
+
+void kk_ota_test111()
+{
+	/*zclBufferSetup(ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT|ZCL_DISABLE_DEFAULT_RESPONSE_MASK, \
+						(ZCL_OTA_BOOTLOAD_CLUSTER_ID),															  \
+						(ZCL_IMAGE_NOTIFY_COMMAND_ID));
+	
+	zclBufferAddByte(0x03);
+	zclBufferAddByte(0x00);
+	zclBufferAddWord(0x1234);
+	zclBufferAddWord(0x5678);
+	zclBufferAddInt32(0x11223344);
+	
+	rpcSendCommand(0xffff,1,1,false);
+	emberAfCorePrintln("[kk_ota_test111] \r\n");*/
+	emberAfCorePrintln("[kk_ota_test111] \r\n");
+	static int cnt;
+	EmberAfOtaImageId id = emberAfOtaStorageIteratorFirstCallback();
+	cnt = 0;
+	do {
+		emberAfCorePrintln("**********%d********\r\n",++cnt);
+		emberAfCorePrintln("manufacturerId=0x%4X \r\n",id.manufacturerId);
+		emberAfCorePrintln("imageTypeId=0x%4X \r\n",id.imageTypeId);
+		emberAfCorePrintln("firmwareVersion=0x%8X \r\n",id.firmwareVersion);
+		id = emberAfOtaStorageIteratorNextCallback();
+	} while (emberAfIsOtaImageIdValid(&id));
+	
+}
+
+
+
+
 static int s_ota_server_init = 0;
 
 EmberAfOtaImageId kk_get_imageId(char* filename){
@@ -589,7 +637,6 @@ EmberAfOtaImageId kk_get_imageId(char* filename){
 	return emberAfInvalidImageId;
 }
 
-
 void kk_ota_notify(char* filepath){
 	if (s_ota_server_init == 0){
 		s_ota_server_init = 1;

platform/zigbee/protocol/zigbee/app/framework/plugin/ota-storage-common/ota-storage.h

@@ -63,11 +63,11 @@
 #define INVALID_EUI64 { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 
 #define INVALID_OTA_IMAGE_ID  \
-  { INVALID_MANUFACTURER_ID,  \
+{ INVALID_MANUFACTURER_ID,  \
   INVALID_DEVICE_ID,        \
   INVALID_FIRMWARE_VERSION, \
   INVALID_EUI64,            \
-  }
+}
 
 #define INVALID_SLOT      (uint32_t)-1
 

platform/zigbee/protocol/zigbee/app/framework/plugin/ota-storage-posix-filesystem/ota-storage-linux.c

@@ -170,9 +170,9 @@ static OtaImage* iterator = NULL;
 #endif
 
 static EmAfOtaStorageLinuxConfig config = {
-  false,  // memoryDebug
-  false,  // fileDebug
-  false,  // fieldDebug
+  true,  // memoryDebug
+  true,  // fileDebug
+  true,  // fieldDebug
   true,   // ignoreFilesWithUnderscorePrefix
   true,   // printFileDiscoveryOrRemoval
   NULL,   // fileAddedHandler
@@ -863,13 +863,6 @@ static void printHeaderInfo(const EmberAfOtaHeader* header)
 	if (!config.printFileDiscoveryOrRemoval) {
 		return;
 	}
-
-  //  printf("  Header Version:  0x%04X\n",
-  //         header->headerVersion);
-  //  printf("  Header Length:   0x%04X\n",
-  //         header->headerLength);
-  //  printf("  Field Control:   0x%04X\n",
-  //         header->fieldControl);
 	note("  Manufacturer ID: 0x%04X\n",
 		header->manufacturerId);
 	note("  Image Type ID:   0x%04X\n",
@@ -878,7 +871,6 @@ static void printHeaderInfo(const EmberAfOtaHeader* header)
 		header->firmwareVersion);
 	note("  Header String:   %s\n",
 		header->headerString);
-  //  printf("\n");
 }
 
 static OtaImage* addImageFileToList(const char* filename,

platform/zigbee/protocol/zigbee/app/framework/util/af-main-host.c

@@ -545,16 +545,12 @@ int emberAfMain(MAIN_FUNCTION_PARAMETERS)
 	halInit();
 	INTERRUPTS_ON();  // Safe to enable interrupts at this point
 
-  {
+
 	int returnCode;
 	if (emberAfMainStartCallback(&returnCode,
 									APP_FRAMEWORK_MAIN_ARGUMENTS)) {   //get serial port info
 		return returnCode;
 	}
-  }
-	kk_print("*******************123****************\r\n");
-	kk_print_info("\r\n-----hello world![%s:%s]-----\r\n",__DATE__,__TIME__);
-	kk_print_version();
 
 	emberSerialInit(APP_SERIAL, BAUD_RATE, PARITY_NONE, 1);  //fock child process