8000 Rel 5 by peter-pycom · Pull Request #573 · pycom/pycom-micropython-sigfox · 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.

Rel 5 #573

Merged
merged 42 commits into from
Oct 27, 2021
Merged

Rel 5 #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
26a10b2
Update Pybytes to version 1.6.1
Xykon Nov 23, 2020
d600b20
Update pycom_version.h
Xykon Nov 23, 2020
742cc14
Update _pybytes_protocol.py
Xykon Nov 23, 2020
8340e1e
version 1.20.2.r3
peter-pycom Dec 23, 2020
3f690a5
Fix an issue that Bluetooth init() failed after deinit()
geza-pycom Dec 28, 2020
826e233
Add API create_128bit_le_uuid_from_string()
geza-pycom Oct 20, 2020
684e9da
Fix a bug causing multi-heap assert exception in modcoap and improve …
geza-pycom Dec 29, 2020
627e39c
removed exit 0 condition for tests
msariisik Jan 7, 2021
8cd6d21
revert back exit 0 condition on Jenkins
msariisik Jan 11, 2021
120f929
Rtc utime fix (#206)
gijsio Jan 11, 2021
f04187b
update version to 1.20.2.r4
peter-pycom Jan 11, 2021
af93a22
Merge pull request #215 from pycom/release_v1.20.2.r4
gijsio Jan 11, 2021
bee94a2
Merge remote-tracking branch 'public/Dev' into release_v1.20.2.r4
peter-pycom Jan 12, 2021
ffb0e1c
Merge pull request #515 from pycom/release_v1.20.2.r4_again
Xykon Jan 12, 2021
12e32a6
add gps coordinates to the pygate json status
gijsio Aug 27, 2020
c046f5f
fixes the re-initialization of lora OTAA
gijsio Aug 27, 2020
21af0b7
Revert "add gps coordinates to the pygate json status"
gijsio Aug 27, 2020
a5dff88
fixed the timeout
gijsio Aug 27, 2020
6153b01
removed commented code
gijsio Jan 15, 2021
144e161
Fix problem in mod_coap_resource_callback_enable() which forbids to d…
geza-pycom Jan 21, 2021
ed4e191
Lora reinit fix (#219)
gijsio Jan 25, 2021
9499afd
vfs_littlefs_file.c: Prevent double close of a file
robert-hh Jan 31, 2021
8baf148
vfs_littlefs_file.c: Move tagging files as closed.
robert-hh Mar 4, 2021
9253101
8000 Adjust the fix so calling other file operations (e.g. write, read etc…
geza-pycom Mar 7, 2021
39ca300
Adjust to be the same as FatFs
geza-pycom Mar 7, 2021
56dd0ed
Add the modified functionality to the regression tests
geza-pycom Mar 7, 2021
a37510c
Update Copyright header
Xykon Mar 9, 2021
a66cdec
sflash_diskio_littlefs.c: Enable block level wear-leveling
robert-hh Jan 14, 2021
bdebb49
sflash_diskio_littlefs.c: change block_cycles to 100
geza-pycom Mar 21, 2021
7d28bd1
mperror.c: Move noticing of the next heartbeat transition (#235)
geza-pycom Apr 10, 2021
46d4a31
LTE: fix conditional in lte_check_attached
Jan 20, 2021
aace45a
Define uart id as int instead of mp_obj
knagymate Feb 16, 2020
d6a17b1
machuart: change default to UART 1
peter-pycom Feb 19, 2021
4cf7273
fix mpy-cross build
peter-pycom Feb 19, 2021
efaea4d
thread: allocate internal mem
peter-pycom Jun 30, 2021
39de84e
Merge pull request #279 from pycom/thread_malloc
gijsio Jul 16, 2021
b596cea
micropython task: allocate internal ram
gijsio Jul 16, 2021
68c0063
Fix for the missing certificated in WPA2 Enterprise connection (#263)
VladPetrovici Jun 28, 2021
08cbc20
update pybytes 1.7.0 975e984
peter-pycom Sep 22, 2021
04a4454
bump version to 1.20.2.r5
peter-pycom Sep 22, 2021
e932a94
lora: Fix losing of multicast params
peter-pycom Oct 5, 2021
b3b1575
Merge branch 'Dev' of github.com:pycom/pycom-micropython-sigfox into …
peter-pycom Oct 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/sx127x/sx1272/sx1272.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is derived from the MicroPython project, http://micropython.org/
*
* Copyright (c) 2020, Pycom Limited and its licensors.
* Copyright (c) 2021, Pycom Limited and its licensors.
*
* This software is licensed under the GNU GPL version 3 or any later version,
* with permitted additional terms. For more information see the Pycom Licence
Expand Down
2 changes: 1 addition & 1 deletion drivers/sx127x/sx1276/sx1276.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is derived from the MicroPython project, http://micropython.org/
*
* Copyright (c) 2020, Pycom Limited and its licensors.
* Copyright (c) 2021, Pycom Limited and its licensors.
*
* This software is licensed under the GNU GPL version 3 or any later version,
* with permitted additional terms. For more information see the Pycom Licence
Expand Down
2 changes: 1 addition & 1 deletion drivers/sx1308/sx1308-config.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
4 changes: 2 additions & 2 deletions drivers/sx1308/sx1308-spi.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand All @@ -9,7 +9,7 @@
/*
* This file is derived from the MicroPython project, http://micropython.org/
*
* Copyright (c) 2018, Pycom Limited and its licensors.
* Copyright (c) 2021, Pycom Limited and its licensors.
*
* This software is licensed under the GNU GPL version 3 or any later version,
* with permitted additional terms. For more information see the Pycom Licence
Expand Down
4 changes: 2 additions & 2 deletions drivers/sx1308/sx1308-spi.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand All @@ -9,7 +9,7 @@
/*
* This file is derived from the MicroPython project, http://micropython.org/
*
* Copyright (c) 2018, Pycom Limited and its licensors.
* Copyright (c) 2021, Pycom Limited and its licensors.
*
* This software is licensed under the GNU GPL version 3 or any later version,
* with permitted additional terms. For more information see the Pycom Licence
Expand Down
2 changes: 1 addition & 1 deletion drivers/sx1308/sx1308.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
4 changes: 2 additions & 2 deletions drivers/sx1308/sx1308.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand All @@ -9,7 +9,7 @@
/*
* This file is derived from the MicroPython project, http://micropython.org/
*
* Copyright (c) 2018, Pycom Limited and its licensors.
* Copyright (c) 2021, Pycom Limited and its licensors.
*
* This software is licensed under the GNU GPL version 3 or any later version,
* with permitted additional terms. For more information see the Pycom Licence
Expand Down
2 changes: 1 addition & 1 deletion esp32/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright © 2020, Pycom Limited.
# Copyright © 2021, Pycom Limited.
#
# This software is licensed under the GNU GPL version 3 or any
# later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/app_sys_evt.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/application.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020, Pycom Limited.
# Copyright (c) 2021, Pycom Limited.
#
# This software is licensed under the GNU GPL version 3 or any
# later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/FIPY/mpconfigboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/GPY/mpconfigboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/LOPY/mpconfigboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/LOPY4/mpconfigboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/SIPY/mpconfigboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/WIPY/mpconfigboard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/esp32_prefix.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is derived from the MicroPython project, http://micropython.org/
*
* Copyright (c) 2020, Pycom Limited and its licensors.
* Copyright (c) 2021, Pycom Limited and its licensors.
*
* This software is licensed under the GNU GPL version 3 or any later version,
* with permitted additional terms. For more information see the Pycom Licence
Expand Down
2 changes: 1 addition & 1 deletion esp32/boards/make-pins.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This file is derived from the MicroPython project, http://micropython.org/
#
# Copyright (c) 2020, Pycom Limited and its licensors.
# Copyright (c) 2021, Pycom Limited and its licensors.
#
# This software is licensed under the GNU GPL version 3 or any later version,
# with permitted additional terms. For more information see the Pycom Licence
Expand Down
2 changes: 1 addition & 1 deletion esp32/bootloader/bootmgr.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/bootloader/bootmgr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/bootloader/mperror.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/fatfs/src/drivers/sd_diskio.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/fatfs/src/drivers/sd_diskio.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Pycom Limited.
* Copyright (c) 2021, Pycom Limited.
*
* This software is licensed under the GNU GPL version 3 or any
* later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/frozen/LTE/sqnsbrz.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020, Pycom Limited.
# Copyright (c) 2021, Pycom Limited.
#
# This software is licensed under the GNU GPL version 3 or any
# later version, with permitted additional terms. For more information
Expand Down
2 changes: 1 addition & 1 deletion esp32/frozen/LTE/sqnsupgrade.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
VERSION = "1.2.6"

# Copyright (c) 2020, Pycom Limited.
# Copyright (c) 2021, Pycom Limited.
#
# This software is licensed under the GNU GPL version 3 or any
# later version, with permitted additional terms. For more information
Expand Down
8 changes: 5 additions & 3 deletions esp32/frozen/Pybytes/_OTA.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Copyright (c) 2020, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand Down Expand Up @@ -63,10 +63,12 @@ def get_update_manifest(self, fwtype=None, token=None):
wmac = hexlify(machine.unique_id()).decode('ascii')
if fwtype == 'pymesh':
request_template = "manifest.json?current_ver={}&sysname={}&token={}&ota_slot={}&wmac={}&fwtype={}&current_fwtype={}"
req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype, 'pymesh' if hasattr(os.uname(),'pymesh') else 'pybytes')
current_fwtype = 'pymesh' if hasattr(os.uname(), 'pymesh') else 'pybytes'
req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype, current_fwtype)
elif fwtype == 'pygate':
request_template = "manifest.json?current_ver={}&sysname={}&ota_slot={}&wmac={}&fwtype={}&current_fwtype={}"
req = request_template.format(current_version, sysname, hex(pycom.ota_slot()), wmac.upper(), fwtype, 'pygate' if hasattr(os.uname(),'pygate') else 'pybytes')
current_fwtype = 'pygate' if hasattr(os.uname(), 'pygate') else 'pybytes'
req = request_template.format(current_version, sysname, hex(pycom.ota_slot()), wmac.upper(), fwtype, current_fwtype)
else:
request_template = "manifest.json?current_ver={}&sysname={}&wmac={}&ota_slot={}"
req = request_template.format(current_version, sysname, wmac, hex(pycom.ota_slot()))
Expand Down
2 changes: 1 addition & 1 deletion esp32/frozen/Pybytes/_coap.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Copyright (c) 2020, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand Down
28 changes: 19 additions & 9 deletions esp32/frozen/Pybytes/_flash_control_OTA.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Copyright (c) 2020, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand All @@ -17,10 +17,20 @@ class FCOTA:
def __init__(self):
pass

def is_folder(self, name):
try:
os.listdir(name)
return True
except:
return False

def is_file(self, name):
return not self.is_folder(name)

def update_file_content(self, path, newContent):
print_debug(2, 'Updating file [{}]'.format(path))

if '.' in path:
if self.is_file(path):
listfDir = path.split('/')
currentPath = '/'
for value in listfDir:
Expand All @@ -34,7 +44,7 @@ def update_file_content(self, path, newContent):
# check if dir exists
if value not in parentList:
# create dir
if '.' in currentPath:
if self.is_file(currentPath):
continue
os.mkdir(currentPath)

Expand All @@ -52,7 +62,7 @@ def update_file_content(self, path, newContent):
def delete_file(self, path):
print_debug(2, 'FCOTA deleting file [{}]'.format(path))
try:
if ('.' in path):
if self.is_file(path):
os.remove(path)
else:
targetedFiles = []
Expand All @@ -67,7 +77,7 @@ def delete_file(self, path):
while maxDepth >= 0:
for elem in targetedFiles:
if elem.count('/') == maxDepth:
if '.' in elem:
if self.is_file(elem):
os.remove(elem)
else:
os.rmdir(elem)
Expand All @@ -87,7 +97,7 @@ def convert_bytes(self, num):

def get_file_size(self, path):
print_debug(2, 'FCOTA getting file infos [{}]'.format(path))
if '.' in path:
if self.is_file(path):
fileInfo = os.stat(path)
print_debug(2, 'printing fileInfo tupple: ' + str(fileInfo))
return self.convert_bytes(fileInfo[6])
Expand All @@ -96,7 +106,7 @@ def get_file_size(self, path):
def get_file_content(self, path):
print_debug(2, 'FCOTA reading file [{}]'.format(path))

if '.' in path:
if self.is_file(path):
f = open(path, 'r')
content = f.read()
f.close()
Expand All @@ -113,7 +123,7 @@ def get_flash_hierarchy(self):
hierarchy = os.listdir()
folders = []
for elem in hierarchy:
if '.' not in elem:
if self.is_folder(elem):
folders.append(elem)

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

if '.' not in path:
if self.is_folder(path):
foldersToCheck.append(path)

j += 1
Expand Down
4 changes: 2 additions & 2 deletions esp32/frozen/Pybytes/_main_pybytes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

'''
Copyright (c) 2020, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand Down Expand Up @@ -96,4 +96,4 @@
# def custom_print(params):
# print("Custom method called")
# return [255, 20]
# pybytes.add_custom_method(0, custom_print)
# pybytes.add_custom_method(0, custom_print)
2 changes: 1 addition & 1 deletion esp32/frozen/Pybytes/_mqtt.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Copyright (c) 2020, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand Down
2 changes: 1 addition & 1 deletion esp32/frozen/Pybytes/_mqtt_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
umqtt is a simple MQTT client for MicroPython.
Original code: https://github.com/micropython/micropython-lib/tree/master/umqtt.simple

Copyright (c) 2020, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand Down
8 changes: 5 additions & 3 deletions esp32/frozen/Pybytes/_msg_handl.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Copyright (c) 2020< BDDE /span>, Pycom Limited.
Copyright (c) 2021, Pycom Limited.
This software is licensed under the GNU GPL version 3 or any
later version, with permitted additional terms. For more information
see the Pycom Licence v1.0 document supplied with this file, or
Expand Down Expand Up @@ -31,6 +31,7 @@ def __init__(
receive_timeout=3000,
reconnectMethod=None
):
print_debug(5, 'starting new MsgHandler')
self._host = ""
self._port = -1
self._sock = None
Expand Down Expand Up @@ -152,7 +153,8 @@ def _receive_packet(self):
try:
self._sock.setblocking(False)
msg_type = self._sock.recv(1)
except socket.error:
except socket.error as err:
print_debug(2, '_receive_packet() socket error: {}'.format(err))
self.disconnect()
self.reconnectMethod()
return False
Expand Down Expand Up @@ -213,7 +215,7 @@ def _send_packet(self, packet):
else:
print_debug(2, 'Packet sent. (Length: %d)' % written)
except socket.error as err:
print_debug(2, 'Socket send error {0}'.format(err))
print_debug(2, '_send_packet() socket error {0}'.format(err))
return False

return True if len(packet) == written else False
Expand Down
Loading
0