Fix decoding of %c (used in BESTUTM)

Was always being decoded as 0.
valgur · Oct 23, 2024 · 9c2d205 · 9c2d205
1 parent a1afa88
commit 9c2d205
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/python/test/test_novatel_types.py b/python/test/test_novatel_types.py
@@ -152,7 +152,6 @@ def test_ASCII_UCHAR_BYTE_INVALID(helper):
     assert intermediate_format.INT_1 == 0
 
 
-@pytest.mark.xfail(reason="%c is broken")
 def test_ASCII_CHAR_VALID(helper):
     helper.create_base_field("CHAR_1", FIELD_TYPE.SIMPLE, "%c", 1, DATA_TYPE.CHAR)
     helper.create_base_field("CHAR_2", FIELD_TYPE.SIMPLE, "%c", 1, DATA_TYPE.CHAR)
@@ -167,7 +166,6 @@ def test_ASCII_CHAR_VALID(helper):
     assert intermediate_format.CHAR_3 == ord(';')
 
 
-@pytest.mark.xfail(reason="%c is broken")
 def test_ASCII_CHAR_INVALID(helper):
     helper.create_base_field("CHAR", FIELD_TYPE.SIMPLE, "%c", 2, DATA_TYPE.CHAR)
     input = b""

diff --git a/regression/targets/BESTUTMBIN.GPS.ABBREV_ASCII b/regression/targets/BESTUTMBIN.GPS.ABBREV_ASCII
diff --git a/regression/targets/BESTUTMBIN.GPS.ASCII b/regression/targets/BESTUTMBIN.GPS.ASCII
diff --git a/regression/targets/BESTUTMBIN.GPS.BINARY b/regression/targets/BESTUTMBIN.GPS.BINARY
diff --git a/regression/targets/BESTUTMBIN.GPS.FLATTENED_BINARY b/regression/targets/BESTUTMBIN.GPS.FLATTENED_BINARY
diff --git a/regression/targets/BESTUTMBIN.GPS.JSON b/regression/targets/BESTUTMBIN.GPS.JSON
diff --git a/src/decoders/oem/src/message_decoder.cpp b/src/decoders/oem/src/message_decoder.cpp
@@ -44,7 +44,13 @@ void MessageDecoder::InitOemFieldMaps()
     // =========================================================
     // ASCII Field Mapping
     // =========================================================
-    asciiFieldMap[CalculateBlockCrc32("c")] = SimpleAsciiMapEntry<uint32_t>();
+    asciiFieldMap[CalculateBlockCrc32("c")] = [](std::vector<FieldContainer>& vIntermediateFormat_, BaseField::ConstPtr pstMessageDataType_,
+                                                 const char** ppcToken_, [[maybe_unused]] const size_t tokenLength_,
+                                                 [[maybe_unused]] JsonReader& pclMsgDb_) {
+        // TODO: check that the character is printable
+        // if (!isprint(**ppcToken_)) { throw ... }
+        vIntermediateFormat_.emplace_back(static_cast<uint32_t>(**ppcToken_), pstMessageDataType_);
+    };
     asciiFieldMap[CalculateBlockCrc32("k")] = SimpleAsciiMapEntry<float>();
     asciiFieldMap[CalculateBlockCrc32("lk")] = SimpleAsciiMapEntry<double>();