senml: Use the updated cbor2 API.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
pull/821/head
iabdalkader 2024-03-06 12:09:12 +01:00 zatwierdzone przez Damien George
rodzic 8ee876dcd6
commit 661efa48f0
3 zmienionych plików z 6 dodań i 7 usunięć

Wyświetl plik

@ -26,7 +26,7 @@ THE SOFTWARE.
from senml import * from senml import *
import time import time
from cbor2 import decoder import cbor2
pack = SenmlPack("device_name") pack = SenmlPack("device_name")
@ -38,5 +38,5 @@ while True:
cbor_val = pack.to_cbor() cbor_val = pack.to_cbor()
print(cbor_val) print(cbor_val)
print(cbor_val.hex()) print(cbor_val.hex())
print(decoder.loads(cbor_val)) # convert to string again so we can print it. print(cbor2.loads(cbor_val)) # convert to string again so we can print it.
time.sleep(1) time.sleep(1)

Wyświetl plik

@ -1,6 +1,6 @@
metadata( metadata(
description="SenML serialisation for MicroPython.", description="SenML serialisation for MicroPython.",
version="0.1.0", version="0.1.1",
pypi_publish="micropython-senml", pypi_publish="micropython-senml",
) )

Wyświetl plik

@ -27,8 +27,7 @@ THE SOFTWARE.
from senml.senml_record import SenmlRecord from senml.senml_record import SenmlRecord
from senml.senml_base import SenmlBase from senml.senml_base import SenmlBase
import json import json
from cbor2 import encoder import cbor2
from cbor2 import decoder
class SenmlPackIterator: class SenmlPackIterator:
@ -278,7 +277,7 @@ class SenmlPack(SenmlBase):
:param data: a byte array. :param data: a byte array.
:return: None :return: None
""" """
records = decoder.loads(data) # load the raw senml data records = cbor2.loads(data) # load the raw senml data
naming_map = { naming_map = {
"bn": -2, "bn": -2,
"bt": -3, "bt": -3,
@ -320,7 +319,7 @@ class SenmlPack(SenmlBase):
} }
converted = [] converted = []
self._build_rec_dict(naming_map, converted) self._build_rec_dict(naming_map, converted)
return encoder.dumps(converted) return cbor2.dumps(converted)
def add(self, item): def add(self, item):
""" """