API v0.7.14 changes

Author: scaryghost

project_version.mk

@@ -1,4 +1,4 @@
-VERSION=0.7.10
+VERSION=0.7.14
 VERSION_MAJOR=0
 VERSION_MINOR=7
-VERSION_STEP=10
+VERSION_STEP=14

src/metawear/core/cpp/logging.cpp

@@ -314,12 +314,15 @@ void MblMwDataLogger::process_log_data(uint8_t id, int64_t epoch, uint32_t data)
 }
 
 void MblMwDataLogger::serialize(vector<uint8_t>& state) const {
-    auto root= dynamic_cast<MblMwDataSignal*>(source->owner->module_events.at(source->header));
+    ResponseHeader copy(source->header);
+    copy.disable_silent();
+
+    auto root = dynamic_cast<MblMwDataSignal*>(source->owner->module_events.at(copy));
     if (source == root) {
         state.push_back(ROOT_SIGNAL_INDEX);
     } else {
-        uint8_t i= 0;
-        for(auto it: root->components) {
+        uint8_t i = 0;
+        for (auto it : root->components) {
             if (it == source) break;
             i++;
         }
@@ -328,7 +331,7 @@ void MblMwDataLogger::serialize(vector<uint8_t>& state) const {
     }
     source->header.serialize(state);
 
-    state.push_back((uint8_t) entry_ids.size());
+    state.push_back((uint8_t)entry_ids.size());
     state.insert(state.end(), entry_ids.begin(), entry_ids.end());
 }
 

src/metawear/core/cpp/version.cpp

@@ -14,6 +14,10 @@ const char SEPARATOR= '.';
 Version::Version() : Version(EMPTY_VALUE, EMPTY_VALUE, EMPTY_VALUE) {
 }
 
+Version::Version(const string& version) {
+    assign(version);
+}
+
 Version::Version(uint8_t major, uint8_t minor, uint8_t step) {
     this->major= major;
     this->minor= minor;
@@ -38,7 +42,7 @@ bool Version::empty() const {
     return major == EMPTY_VALUE && minor == EMPTY_VALUE && step == EMPTY_VALUE;
 }
 
-void Version::assign(const std::string new_version) {
+void Version::assign(const std::string& new_version) {
     string tempStr;
     vector<string> parts;
     size_t i= 0;

src/metawear/core/cpp/version.h

@@ -6,13 +6,14 @@
 
 struct Version {
     Version();
+    Version(const std::string& version);
     Version(uint8_t major, uint8_t minor, uint8_t step);
 
     void deserialize(uint8_t** state_stream);
     void serialize(std::vector<uint8_t>& state) const;
 
     bool empty() const;
-    void assign(const std::string new_version);
+    void assign(const std::string& new_version);
     Version& operator =(const Version& original);
 
     uint8_t major, minor, step;

src/metawear/impl/cpp/metawearboard.cpp

@@ -348,42 +348,38 @@ void mbl_mw_connection_char_read(MblMwMetaWearBoard *board, const MblMwGattChar
 
 void mbl_mw_metawearboard_char_read(MblMwMetaWearBoard *board, const MblMwGattChar *characteristic, const uint8_t *value, uint8_t length) {
     if (characteristic->uuid_high == DEV_INFO_FIRMWARE_CHAR.uuid_high && characteristic->uuid_low == DEV_INFO_FIRMWARE_CHAR.uuid_low) {
-        if (board->firmware_revision.empty()) {
-            board->firmware_revision.assign(string(value, value + length));
-            board->module_discovery_index= -1;
-        } else {
-            Version current;
-            current.assign(string(value, value + length));
-
-            if (board->firmware_revision == current) {
-                if (mbl_mw_metawearboard_is_initialized(board)) {
-                    board->initialized_timeout->cancel();
-                    board->initialized(board, MBL_MW_STATUS_OK);
-                } else {
-                    board->module_discovery_index = MODULE_DISCOVERY_CMDS.size();
-                    service_discovery_completed(board);
-                }
-                return;
+        Version current(string(value, value + length));
+
+        if (board->firmware_revision == current) {
+            if (mbl_mw_metawearboard_is_initialized(board)) {
+                board->initialized_timeout->cancel();
+                board->initialized(board, MBL_MW_STATUS_OK);
             } else {
-                board->logger_state.reset();
-                board->timer_state.reset();
-                board->event_state.reset();
-                board->dp_state.reset();
-
-                for (auto it : board->module_events) {
-                    it.second->remove = false;
-                    delete it.second;
-                }
-                board->module_events.clear();
+                board->module_discovery_index = MODULE_DISCOVERY_CMDS.size();
+                service_discovery_completed(board);
+            }
+            return;
+        } else {
+            board->firmware_revision = current;
 
-                for (auto it: board->module_config) {
-                    free(it.second);
-                }
-                board->module_config.clear();
+            board->logger_state.reset();
+            board->timer_state.reset();
+            board->event_state.reset();
+            board->dp_state.reset();
 
-                board->module_info.clear();
-                board->module_discovery_index= -1;
+            for (auto it : board->module_events) {
+                it.second->remove = false;
+                delete it.second;
             }
+            board->module_events.clear();
+
+            for (auto it : board->module_config) {
+                free(it.second);
+            }
+            board->module_config.clear();
+
+            board->module_info.clear();
+            board->module_discovery_index = -1;
         }
         queue_next_gatt_char(board);
     } else if (characteristic->uuid_high == DEV_INFO_MODEL_CHAR.uuid_high && characteristic->uuid_low == DEV_INFO_MODEL_CHAR.uuid_low) {

test/test_metawearboard.py

@@ -252,6 +252,129 @@ def test_deserialize_motion_r(self):
 
         self.assertTrue(True)
 
+    def test_deserialize_motion_r_new_fw(self):
+        firmware_state = [0x03, 0x03, 0x01]
+
+        self.firmware_revision= create_string_buffer(b'1.3.3', 5)
+        self.boardType = TestMetaWearBase.METAWEAR_MOTION_R_BOARD
+
+        state_buffer= self.to_string_buffer(TestMetaWearBoardSerialize.motion_r_state)
+        self.libmetawear.mbl_mw_metawearboard_deserialize(self.board, state_buffer.raw, len(state_buffer.raw))
+        self.libmetawear.mbl_mw_metawearboard_initialize(self.board, self.initialized_fn)
+
+        state_array_size= c_uint(0)
+        state_ptr= cast(self.libmetawear.mbl_mw_metawearboard_serialize(self.board, byref(state_array_size)), POINTER(c_ubyte * state_array_size.value))
+
+        python_array= []
+        for i in range(0, state_array_size.value):
+            python_array.append(state_ptr.contents[i])
+        self.libmetawear.mbl_mw_memory_free(state_ptr)
+
+        self.assertEqual(python_array[1:4], firmware_state)
+
+    def test_serialize_readable_logger(self):
+        logger_state= [
+            0x1,
+            0xff, 0x04, 0xc1, 0x00, 0x01, 0x00
+        ]
+
+        self.firmware_revision= create_string_buffer(b'1.2.5', 5)
+        self.boardType = TestMetaWearBase.METAWEAR_RPRO_BOARD
+        self.libmetawear.mbl_mw_metawearboard_initialize(self.board, self.initialized_fn)
+
+        readable_signal = self.libmetawear.mbl_mw_multi_chnl_temp_get_temperature_data_signal(self.board, 0)
+        self.libmetawear.mbl_mw_datasignal_log(readable_signal, self.logger_created);
+
+        state_array_size= c_uint(0)
+        state_ptr= cast(self.libmetawear.mbl_mw_metawearboard_serialize(self.board, byref(state_array_size)), POINTER(c_ubyte * state_array_size.value))
+
+        python_array= []
+        for i in range(0, state_array_size.value):
+            python_array.append(state_ptr.contents[i])
+        self.libmetawear.mbl_mw_memory_free(state_ptr)
+
+        print(python_array)
+        self.assertEqual(python_array[368:], logger_state)
+
+    def test_deserialize_readable_logger(self):
+        state = [
+            1, 
+            5, 2, 1, 
+            1, 49, 
+            25, 
+            1, 0, 0, 0, 
+            2, 0, 0, 0, 
+            3, 1, 1, 0, 
+            4, 1, 0, 4, 0, 3, 1, 2, 
+            5, 0, 0, 0, 
+            6, 0, 0, 0, 
+            7, 0, 0, 0, 
+            8, 0, 0, 0, 
+            9, 0, 0, 1, 28, 
+            10, 0, 0, 1, 28, 
+            11, 0, 2, 5, 8, 128, 45, 0, 0, 
+            12, 0, 0, 1, 8, 
+            13, 0, 0, 0, 
+            15, 0, 0, 0, 
+            16, 255, 255, 
+            17, 0, 0, 0, 
+            18, 0, 0, 0, 
+            19, 0, 1, 0, 
+            20, 0, 0, 0, 
+            21, 255, 255, 
+            22, 255, 255, 
+            23, 255, 255, 
+            24, 255, 255, 
+            25, 255, 255, 
+            254, 0, 0, 0, 
+            21, 
+            1, 1, 255, 0, 1, 0, 1, 1, 0, 0, 
+            3, 4, 255, 0, 7, 2, 3, 2, 1, 0, 
+            3, 4, 255, 0, 8, 2, 1, 2, 1, 0, 
+            3, 4, 255, 0, 8, 2, 1, 2, 1, 2, 
+            3, 4, 255, 0, 8, 2, 1, 2, 1, 4, 
+            3, 25, 255, 0, 1, 0, 1, 1, 0, 0, 
+            3, 28, 255, 0, 7, 2, 3, 2, 1, 0, 
+            3, 218, 255, 0, 1, 0, 1, 2, 0, 0, 
+            4, 193, 0, 0, 2, 6, 1, 2, 1, 0, 
+            4, 193, 1, 0, 2, 6, 1, 2, 1, 0, 
+            4, 193, 2, 0, 2, 6, 1, 2, 1, 0, 
+            4, 193, 3, 0, 2, 6, 1, 2, 1, 0, 
+            18, 1, 255, 0, 3, 3, 1, 4, 0, 0, 
+            18, 2, 255, 0, 4, 3, 1, 4, 1, 0, 
+            18, 193, 255, 0, 3, 3, 1, 4, 0, 0, 
+            19, 5, 255, 0, 5, 4, 3, 2, 1, 0, 
+            19, 5, 255, 0, 6, 4, 1, 2, 1, 0, 
+            19, 5, 255, 0, 6, 4, 1, 2, 1, 2, 
+            19, 5, 255, 0, 6, 4, 1, 2, 1, 4, 
+            19, 7, 255, 0, 5, 4, 3, 2, 1, 0, 
+            20, 3, 255, 0, 1, 0, 1, 4, 0, 0, 
+            4, 
+            3, 40, 3, 7, 48, 129, 11, 192, 0, 20, 20, 20, 64, 10, 24, 72, 8, 17, 0, 0, 
+            18, 44, 0, 
+            19, 40, 0, 
+            20, 0, 3, 
+            1, 
+            226, 118, 142, 47, 90, 1, 0, 0, 21, 4, 0, 0, 5, 
+            1, 
+            255, 4, 193, 0, 1, 0
+        ]
+
+        self.firmware_revision= create_string_buffer(b'1.2.5', 5)
+        self.boardType = TestMetaWearBase.METAWEAR_RPRO_BOARD
+
+        state_buffer= self.to_string_buffer(state)
+        self.libmetawear.mbl_mw_metawearboard_deserialize(self.board, state_buffer.raw, len(state_buffer.raw))
+        self.libmetawear.mbl_mw_metawearboard_initialize(self.board, self.initialized_fn)
+
+        logger = self.libmetawear.mbl_mw_logger_lookup_id(self.board, 0);
+        self.libmetawear.mbl_mw_logger_subscribe(logger, self.sensor_data_handler);
+
+        buffer = create_string_buffer(b'\x0b\x07\xa0\x37\x43\x00\x00\xc8\x00\x00\x00', 11)
+        self.libmetawear.mbl_mw_metawearboard_notify_char_changed(self.board, buffer.raw, len(buffer))
+
+        self.assertAlmostEqual(self.data_float.value, 25.0)
+
 class TestMetaWearBoardTearDownSerialize(TestMetaWearBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)