kopia lustrzana https://github.com/micropython/micropython-lib
senml: Remove u-module prefix from imports.
Signed-off-by: Damien George <damien@micropython.org>pull/624/head
rodzic
b9741f6584
commit
295a9e300a
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
|||
|
||||
|
||||
from senml import *
|
||||
import utime as time
|
||||
import time
|
||||
|
||||
|
||||
pack = SenmlPack("device_name")
|
||||
|
|
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
|||
|
||||
|
||||
from senml import *
|
||||
import utime as time
|
||||
import time
|
||||
|
||||
|
||||
pack = SenmlPack("device")
|
||||
|
|
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
|||
|
||||
|
||||
from senml import *
|
||||
import utime as time
|
||||
import time
|
||||
|
||||
|
||||
pack = SenmlPack("device_name")
|
||||
|
|
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
|||
|
||||
|
||||
from senml import *
|
||||
import utime as time
|
||||
import time
|
||||
from cbor2 import decoder
|
||||
|
||||
pack = SenmlPack("device_name")
|
||||
|
|
|
@ -26,7 +26,7 @@ THE SOFTWARE.
|
|||
|
||||
from senml import *
|
||||
|
||||
import utime as time
|
||||
import time
|
||||
|
||||
|
||||
class Coordinates(SenmlRecord):
|
||||
|
|
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
|||
|
||||
|
||||
from senml import *
|
||||
import utime as time
|
||||
import time
|
||||
|
||||
gateway_pack = SenmlPack("gateway")
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ THE SOFTWARE.
|
|||
|
||||
|
||||
from senml import *
|
||||
import utime as time
|
||||
import time
|
||||
|
||||
pack = SenmlPack("device_name")
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ THE SOFTWARE.
|
|||
|
||||
from senml.senml_record import SenmlRecord
|
||||
from senml.senml_base import SenmlBase
|
||||
import ujson
|
||||
import json
|
||||
from cbor2 import encoder
|
||||
from cbor2 import decoder
|
||||
|
||||
|
@ -166,7 +166,7 @@ class SenmlPack(SenmlBase):
|
|||
:param data: a string containing json data.
|
||||
:return: None, will r
|
||||
"""
|
||||
records = ujson.loads(data) # load the raw senml data
|
||||
records = json.loads(data) # load the raw senml data
|
||||
self._process_incomming_data(records, SenmlPack.json_mappings)
|
||||
|
||||
def _process_incomming_data(self, records, naming_map):
|
||||
|
@ -242,7 +242,7 @@ class SenmlPack(SenmlBase):
|
|||
"""
|
||||
converted = []
|
||||
self._build_rec_dict(SenmlPack.json_mappings, converted)
|
||||
return ujson.dumps(converted)
|
||||
return json.dumps(converted)
|
||||
|
||||
def _build_rec_dict(self, naming_map, appendTo):
|
||||
"""
|
||||
|
|
|
@ -24,7 +24,7 @@ THE SOFTWARE.
|
|||
"""
|
||||
|
||||
|
||||
import ubinascii
|
||||
import binascii
|
||||
from senml.senml_base import SenmlBase
|
||||
|
||||
|
||||
|
@ -229,7 +229,7 @@ class SenmlRecord(SenmlBase):
|
|||
elif naming_map["vb"] in raw:
|
||||
val = raw[naming_map["vb"]]
|
||||
elif naming_map["vd"] in raw:
|
||||
val = ubinascii.a2b_base64(raw[naming_map["vb"]])
|
||||
val = binascii.a2b_base64(raw[naming_map["vb"]])
|
||||
else:
|
||||
val = None
|
||||
self.value = val
|
||||
|
|
Ładowanie…
Reference in New Issue