From 3abe4f956b2e79cfed06f99902d1e0ba3366c50f Mon Sep 17 00:00:00 2001 From: Kane-Chen-AS Date: Wed, 20 Mar 2024 15:47:01 +0800 Subject: [PATCH 1/3] to fix the possible measurement may be lost issue --- intelprot/capsule.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intelprot/capsule.py b/intelprot/capsule.py index 035a477..44fdfa4 100644 --- a/intelprot/capsule.py +++ b/intelprot/capsule.py @@ -648,6 +648,8 @@ def pack_device_measurement(self, dev_name): lst_idx_meas_data = self.manifest['afm_data'][dev_name]["measurement"][idx]["measurement"] idx_meas_hexstr =''.join(lst_idx_meas_data) meas_size = int(self.manifest['afm_data'][dev_name]["measurement"][idx]["size"], 0) + number_of_possible_measurement = int(self.manifest['afm_data'][dev_name]["measurement"][idx]["number_of_possible_measurement"], 0) + meas_size *= number_of_possible_measurement #print("\n**** idx={}, idx_meas_hexstr={} \n".format(idx, idx_meas_hexstr)) #print("\n**** len(idx_meas_hexstr)={}, meas_size = {}".format(len(idx_meas_hexstr), meas_size)) afm_dev_meas += struct.pack("%ds"%(meas_size), bytes.fromhex(idx_meas_hexstr)) From be8d04ab527a0703a6ffefe233040c1afc40572f Mon Sep 17 00:00:00 2001 From: Kane-Chen-AS Date: Wed, 20 Mar 2024 16:30:41 +0800 Subject: [PATCH 2/3] Revert "to fix the possible measurement may be lost issue" This reverts commit 3abe4f956b2e79cfed06f99902d1e0ba3366c50f. --- intelprot/capsule.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/intelprot/capsule.py b/intelprot/capsule.py index 44fdfa4..035a477 100644 --- a/intelprot/capsule.py +++ b/intelprot/capsule.py @@ -648,8 +648,6 @@ def pack_device_measurement(self, dev_name): lst_idx_meas_data = self.manifest['afm_data'][dev_name]["measurement"][idx]["measurement"] idx_meas_hexstr =''.join(lst_idx_meas_data) meas_size = int(self.manifest['afm_data'][dev_name]["measurement"][idx]["size"], 0) - number_of_possible_measurement = int(self.manifest['afm_data'][dev_name]["measurement"][idx]["number_of_possible_measurement"], 0) - meas_size *= number_of_possible_measurement #print("\n**** idx={}, idx_meas_hexstr={} \n".format(idx, idx_meas_hexstr)) #print("\n**** len(idx_meas_hexstr)={}, meas_size = {}".format(len(idx_meas_hexstr), meas_size)) afm_dev_meas += struct.pack("%ds"%(meas_size), bytes.fromhex(idx_meas_hexstr)) From c91fe7857f2f2d4224df3426f99fef585ebdac60 Mon Sep 17 00:00:00 2001 From: Kane-Chen-AS Date: Wed, 20 Mar 2024 16:33:36 +0800 Subject: [PATCH 3/3] to fix the possible measurement data may be lost issue --- intelprot/capsule.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intelprot/capsule.py b/intelprot/capsule.py index 035a477..2933fa7 100644 --- a/intelprot/capsule.py +++ b/intelprot/capsule.py @@ -955,6 +955,8 @@ def pack_device_measurement(self, dev_name): lst_idx_meas_data = self.manifest['afm_data'][dev_name]["measurement"][idx]["measurement"] idx_meas_hexstr =''.join(lst_idx_meas_data) meas_size = int(self.manifest['afm_data'][dev_name]["measurement"][idx]["meas_value_size"], 0) + number_of_possible_measurement = int(self.manifest['afm_data'][dev_name]["measurement"][idx]["number_of_possible_measurement"], 0) + meas_size *= number_of_possible_measurement #print("\n**** idx={}, idx_meas_hexstr={} \n".format(idx, idx_meas_hexstr)) #print("\n**** len(idx_meas_hexstr)={}, meas_size = {}".format(len(idx_meas_hexstr), meas_size)) afm_dev_meas += struct.pack("%ds"%(meas_size), bytes.fromhex(idx_meas_hexstr))