8000 Merge pull request #573 from pycom/rel_5 · pycom/pycom-micropython-sigfox@1b1e869 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 1b1e869

Browse files
peter-pycompeter-pycom
authored
Merge pull request #573 from pycom/rel_5
Rel 5
2 parents 466e52e + b3b1575 commit 1b1e869

28 files changed

+428
-96
lines changed

‎esp32/frozen/Pybytes/_OTA.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ def get_update_manifest(self, fwtype=None, token=None):
6363
wmac = hexlify(machine.unique_id()).decode('ascii')
6464
if fwtype == 'pymesh':
6565
request_template = "manifest.json?current_ver={}&sysname={}&token={}&ota_slot={}&wmac={}&fwtype={}&current_fwtype={}"
66-
req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype, 'pymesh' if hasattr(os.uname(),'pymesh') else 'pybytes')
66+
current_fwtype = 'pymesh' if hasattr(os.uname(), 'pymesh') else 'pybytes'
67+
req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype, current_fwtype)
6768
elif fwtype == 'pygate':
6869
request_template = "manifest.json?current_ver={}&sysname={}&ota_slot={}&wmac={}&fwtype={}&current_fwtype={}"
69-
req = request_template.format(current_version, sysname, hex(pycom.ota_slot()), wmac.upper(), fwtype, 'pygate' if hasattr(os.uname(),'pygate') else 'pybytes')
70+
current_fwtype = 'pygate' if hasattr(os.uname(), 'pygate') else 'pybytes'
71+
req = request_template.format(current_version, sysname, hex(pycom.ota_slot()), wmac.upper(), fwtype, current_fwtype)
7072
else:
7173
request_template = "manifest.json?current_ver={}&sysname={}&wmac={}&ota_slot={}"
7274
req = request_template.format(current_version, sysname, wmac, hex(pycom.ota_slot()))

‎esp32/frozen/Pybytes/_flash_control_OTA.py

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,20 @@ class FCOTA:
1717
def __init__(self):
1818
pass
1919

20+
def is_folder(self, name):
21+
try:
22+
os.listdir(name)
23+
return True
24+
except:
25+
return False
26+
27+
def is_file(self, name):
28+
return not self.is_folder(name)
29+
2030
def update_file_content(self, path, newContent):
2131
print_debug(2, 'Updating file [{}]'.format(path))
2232

23-
if '.' in path:
33+
if self.is_file(path):
2434
listfDir = path.split('/')
2535
currentPath = '/'
2636
for value F438 in listfDir:
@@ -34,7 +44,7 @@ def update_file_content(self, path, newContent):
3444
# check if dir exists
3545
if value not in parentList:
3646
# create dir
37-
if '.' in currentPath:
47+
if self.is_file(currentPath):
3848
continue
3949
os.mkdir(currentPath)
4050

@@ -52,7 +62,7 @@ def update_file_content(self, path, newContent):
5262
def delete_file(self, path):
5363
print_debug(2, 'FCOTA deleting file [{}]'.format(path))
5464
try:
55-
if ('.' in path):
65+
if self.is_file(path):
5666
os.remove(path)
5767
else:
5868
targetedFiles = []
@@ -67,7 +77,7 @@ def delete_file(self, path):
6777
while maxDepth >= 0:
6878
for elem in targetedFiles:
6979
if elem.count('/') == maxDepth:
70-
if '.' in elem:
80+
if self.is_file(elem):
7181
os.remove(elem)
7282
else:
7383
os.rmdir(elem)
@@ -87,7 +97,7 @@ def convert_bytes(self, num):
8797

8898
def get_file_size(self, path):
8999
print_debug(2, 'FCOTA getting file infos [{}]'.format(path))
90-
if '.' in path:
100+
if self.is_file(path):
91101
fileInfo = os.stat(path)
92102
print_debug(2, 'printing fileInfo tupple: ' + str(fileInfo))
93103
return self.convert_bytes(fileInfo[6])
@@ -96,7 +106,7 @@ def get_file_size(self, path):
96106
def get_file_content(self, path):
97107
print_debug(2, 'FCOTA reading file [{}]'.format(path))
98108

99-
if '.' in path:
109+
if self.is_file(path):
100110
f = open(path, 'r')
101111
content = f.read()
102112
f.close()
@@ -113,7 +123,7 @@ def get_flash_hierarchy(self):
113123
hierarchy = os.listdir()
114124
folders = []
115125
for elem in hierarchy:
116-
if '.' not in elem:
126+
if self.is_folder(elem):
117127
folders.append(elem)
118128

119129
while len(folders) > 0:
@@ -130,7 +140,7 @@ def get_flash_hierarchy(self):
130140
path = folders[i] + '/' + subFolders[j]
131141
hierarchy.append(path)
132142

133-
if '.' not in path:
143+
if self.is_folder(path):
134144
foldersToCheck.append(path)
135145

136146
j += 1

‎esp32/frozen/Pybytes/_main_pybytes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@
9696
# def custom_print(params):
9797
# print("Custom method called")
9898
# return [255, 20]
99-
# pybytes.add_custom_method(0, custom_print)
99+
# pybytes.add_custom_method(0, custom_print)

‎esp32/frozen/Pybytes/_msg_handl.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def __init__(
3131
receive_timeout=3000,
3232
reconnectMethod=None
3333
):
34+
print_debug(5, 'starting new MsgHandler')
3435
self._host = ""
3536
self._port = -1
3637
self._sock = None
@@ -152,7 +153,8 @@ def _receive_packet(self):
152153
try:
153154
self._sock.setblocking(False)
154155
msg_type = self._sock.recv(1)
155-
except socket.error:
156+
except socket.error as err:
157+
print_debug(2, '_receive_packet() socket error: {}'.format(err))
156158
self.disconnect()
157159
self.reconnectMethod()
158160
return False
@@ -213,7 +215,7 @@ def _send_packet(self, packet):
213215
else:
214216
print_debug(2, 'Packet sent. (Length: %d)' % written)
215217
except socket.error as err:
216-
print_debug(2, 'Socket send error {0}'.format(err))
218+
print_debug(2, '_send_packet() socket error {0}'.format(err))
217219
return False
218220

219221
return True if len(packet) == written else False

‎esp32/frozen/Pybytes/_pybytes.py

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@
1111
import time
1212
import pycom
1313
import sys
14+
import gc
1415
from network import WLAN
1516
from binascii import hexlify, a2b_base64
16-
from machine import Timer, deepsleep, pin_sleep_wakeup, unique_id
17+
from machine import Timer, deepsleep, pin_sleep_wakeup, unique_id, pygate_init, RTC, pygate_debug_level, reset
1718

1819
try:
1920
from periodical_pin import PeriodicalPin
2021
except:
2122
from _periodical_pin import PeriodicalPin
2223

2324
try:
24-
from pybytes_debug import print_debug
25+
from pybytes_debug import print_debug, DEBUG
2526
except:
26-
from _pybytes_debug import print_debug
27+
from _pybytes_debug import print_debug, DEBUG
2728

2829
try:
2930
from pybytes_config_reader import PybytesConfigReader
@@ -36,7 +37,7 @@ class Pybytes:
3637
WAKEUP_ALL_LOW = const(0) # noqa: F821
3738
WAKEUP_ANY_HIGH = const(1) # noqa: F821
3839

39-
def __init__(self, config, activation=False, autoconnect=False):
40+
def __init__(self, config, activation=False, autoconnect=False, user_callback=None):
4041
self.__frozen = globals().get('__name__') == '_pybytes'
4142
self.__activation = activation
4243
self.__custom_message_callback = None
@@ -45,11 +46,15 @@ def __init__(self, config, activation=False, autoconnect=False):
4546
self.__smart_config = False
4647
self.__conf = {}
4748
self.__pymesh = None
49+
self.__user_callback = user_callback
4850

4951
if not self.__activation:
5052
self.__conf = config
5153
self.__conf_reader = PybytesConfigReader(config)
5254
pycom.wifi_on_boot(False, True)
55+
if pycom.lte_modem_en_on_boot():
56+
pycom.lte_modem_en_on_boot(False)
57+
reset()
5358

5459
self.__check_dump_ca()
5560
self.__create_pybytes_connection(self.__conf)
@@ -66,7 +71,7 @@ def __create_pybytes_connection(self, conf):
6671
except:
6772
from _pybytes_connection import PybytesConnection
6873

69-
self.__pybytes_connection = PybytesConnection(conf, self.__recv_message)
74+
self.__pybytes_connection = PybytesConnection(conf, self.__recv_message, user_callback=self.__user_callback)
7075

7176
def __check_config(self):
7277
try:
@@ -155,9 +160,9 @@ def send_node_signal(self, signal_number, value, token):
155160
topic = 'br/{}'.format(token)
156161
self.__pybytes_connection.__pybytes_protocol.send_pybytes_custom_method_values(signal_number, [value], topic)
157162

158-
def send_signal(self, signal_number, value):
163+
def send_signal(self, signal_number, value, nomesh=False):
159164
self.__check_init()
160-
if self.__pymesh:
165+
if self.__pymesh and not nomesh:
161166
self.__pymesh.unpack_pymesh_message(signal_number, value)
162167
else:
163168
self.__pybytes_connection.__pybytes_protocol.send_pybytes_custom_method_values(signal_number, [value])
@@ -280,11 +285,51 @@ def connect(self):
280285
from _pybytes_pymesh_config import PybytesPymeshConfig
281286
self.__pymesh = PybytesPymeshConfig(self)
282287
self.__pymesh.pymesh_init()
288+
elif hasattr(os.uname(), 'pygate') and self.get_config('gateway'):
289+
# PYGATE FIRMWARE VERSION
290+
buf = None
291+
try:
292+
with open('/flash/pybytes_pygate_config.json','r') as fp:
293+
buf = fp.read()
294+
except Exception as e:
295+
print_debug(5, e)
296+
print('pybytes_pygate_config.json file is missing or has wrong format')
297+
return
298+
299+
try:
300+
print('Syncing RTC via ntp...', end='')
301+
rtc = RTC()
302+
if not rtc.synced():
303+
rtc.ntp_sync(server="pool.ntp.org")
304+
to_s = 20
305+
while not rtc.synced() and to_s > 0:
306+
print('.', end='')
307+
time.sleep(1)
308+
to_s -= 1
309+
if not rtc.synced():
310+
print('RTC sync failed. Gateway will not work')
311+
return
312+
print(" RTC synced")
313+
314+
except Exception as e:
315+
print_debug(5, e)
316+
print('RTC sync failed. Gateway will not work')
317+
return
318+ 2E17
319+
try:
320+
gc.collect()
321+
if not DEBUG:
322+
pygate_debug_level(0)
323+
pygate_init(buf)
324+
except Exception as e:
325+
print('Pygate failed to start', e)
326+
return
283327
else:
284328
print('ERROR! Could not connect to Pybytes!')
285329

286330
except Exception as ex:
287331
print("Unable to connect to Pybytes: {}".format(ex))
332+
sys.print_exception(ex)
288333

289334
def write_config(self, file='/flash/pybytes_config.json', silent=False):
290335
try:
@@ -428,6 +473,12 @@ def deepsleep(self, ms, pins=None, mode=None, enable_pull=None):
428473
self.disconnect()
429474
deepsleep(ms)
430475

476+
def message_queue_len(self):
477+
try:
478+
return len(pybytes.__pybytes_connection.__connection.__mqtt._msgHandler._output_queue)
479+
except:
480+
return None
481+
431482
def dump_ca(self, ca_file='/flash/cert/pycom-ca.pem'):
432483
try:
433484
from _pybytes_ca import PYBYTES_CA

‎esp32/frozen/Pybytes/_pybytes_connection.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747

4848
class PybytesConnection:
49-
def __init__(self, config, message_callback):
49+
def __init__(self, config, message_callback, user_callback=None):
5050
if config is not None:
5151
self.__conf = config
5252
self.__conf_reader = PybytesConfigReader(config)
@@ -61,7 +61,8 @@ def __init__(self, config, message_callback):
6161
self.__mqtt_download_topic = "d" + self.__device_id
6262
self.__mqtt_upload_topic = "u" + self.__device_id
6363
self.__pybytes_protocol = PybytesProtocol(
64-
config, message_callback, pybytes_connection=self
64+
config, message_callback, pybytes_connection=self,
65+
user_callback=user_callback
6566
)
6667
self.__connection = None
6768
self.__connection_status = constants.__CONNECTION_STATUS_DISCONNECTED

‎esp32/frozen/Pybytes/_pybytes_constants.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class constants:
7575
__TYPE_PYMESH = 0x0D
7676
__TYPE_PYBYTES = 0x0E
7777
__TYPE_ML = 0x0F
78+
__TYPE_USER = 0x08
7879
__PYBYTES_PROTOCOL = ">B%ds"
7980
__PYBYTES_PROTOCOL_PING = ">B"
8081
__PYBYTES_INTERNAL_PROTOCOL = ">BBH"
@@ -100,6 +101,8 @@ class constants:
100101
__FCOTA_PING = 0x03
101102
__FCOTA_COMMAND_FILE_DELETE = 0x04
102103
__FCOTA_COMMAND_FILE_UPDATE_NO_RESET = 0x05
104+
__FCOTA_COMMAND_GATEWAY_DEPLOY = 0x06
105+
__FCOTA_COMMAND_TOGGLE_GATEWAY = 0x07
103106

104107
__DEVICE_TYPE_WIPY = 0x00
105108
__DEVICE_TYPE_LOPY = 0x01

‎esp32/frozen/Pybytes/_pybytes_debug.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import os
1010
import pycom # pylint: disable=import-error
11+
import _thread
12+
import time
1113

1214
from machine import RTC
1315
from time import timezone
@@ -22,7 +24,11 @@
2224
def print_debug(level, msg):
2325
"""Print log messages into console."""
2426
if DEBUG is not None and level <= DEBUG:
25-
print(msg)
27+
print("[{:15.3f}] [{:10d}] {}".format(
28+
time.ticks_ms() / 1000,
29+
_thread.get_ident(),
30+
msg
31+
))
2632

2733

2834
def print_debug_local(level, msg):

‎esp32/frozen/Pybytes/_pybytes_library.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,13 @@ def pack_info_message(self, releaseVersion=None):
9494

9595
if hasattr(os.uname(), 'pymesh'):
9696
body.append(constants.__FWTYPE_PYMESH)
97+
print_debug(4, "pymesh")
9798
elif hasattr(os.uname(), 'pygate'):
9899
body.append(constants.__FWTYPE_PYGATE)
100+
print_debug(4, "pygate")
99101
else:
100102
body.append(constants.__FWTYPE_DEFAULT)
103+
print_debug(4, "pybytes")
101104

102105
return self.__pack_message(constants.__TYPE_INFO, body)
103106

0 commit comments

Comments
 (0)
0