Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 970e56c

Browse files
XykonXykon
committed
Updated release files for LOPY4
1 parent 2586dee commit 970e56c

File tree

5 files changed

+114
-22
lines changed

5 files changed

+114
-22
lines changed

‎Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
def buildVersion
22
def boards_to_build_1 = ["LoPy_868", "WiPy"]
33
def boards_to_build_2 = ["LoPy_915", "SiPy"]
4-
def boards_to_build_3 = ["FiPy_868", "GPy"]
5-
def boards_to_build_4 = ["FiPy_915"]
4+
def boards_to_build_3 = ["FiPy_868", "GPy" , "LoPy4_868"]
5+
def boards_to_build_4 = ["FiPy_915" , "LoPy4_915"]
66
def boards_to_test = ["FiPy_868"]
77
def remote_node = "UDOO"
88

@@ -131,10 +131,10 @@ def boardBuild(name) {
131131
def name_u = name.toUpperCase()
132132
def name_short = name_u.split('_')[0]
133133
def lora_band = ""
134-
if (name_u == "LOPY_868" || name_u == "FIPY_868") {
134+
if (name_u == "LOPY_868" || name_u == "FIPY_868" || name_u == "LOPY4_868") {
135135
lora_band = " LORA_BAND=USE_BAND_868"
136136
}
137-
else if (name_u == "LOPY_915" || name_u == "FIPY_915") {
137+
else if (name_u == "LOPY_915" || name_u == "FIPY_915" || name_u == "LOPY4_915") {
138138
lora_band = " LORA_BAND=USE_BAND_915"
139139
}
140140
def app_bin = name.toLowerCase() + '.bin'

‎esp32/Makefile

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ OEM ?= 0
2222
BTYPE ?= release
2323

2424
LORA_BAND ?= USE_BAND_868
25+
26+
BUILD = build/$(BOARD)/$(BTYPE)
2527
ifeq ($(BOARD), $(filter $(BOARD), LOPY FIPY))
2628
ifeq ($(LORA_BAND), USE_BAND_868)
2729
LORA_FREQ = 868
2830
else
2931
LORA_FREQ = 915
3032
endif
3133
BUILD = build/$(BOARD)_$(LORA_FREQ)/$(BTYPE)
32-
else
33-
LORA_FREQ =
34-
BUILD = build/$(BOARD)/$(BTYPE)
3534
endif
3635

3736
ifeq ($(BOARD), LOPY4)
@@ -41,9 +40,6 @@ ifeq ($(BOARD), LOPY4)
4140
LORA_FREQ = 915
4241
endif
4342
BUILD = build/$(BOARD)_$(LORA_FREQ)/$(BTYPE)
44-
else
45-
LORA_FREQ =
46-
BUILD = build/$(BOARD)/$(BTYPE)
4743
endif
4844

4945
FROZEN_MPY_DIR = frozen
@@ -81,18 +77,6 @@ LIBS = -L$(ESP_IDF_COMP_PATH)/esp32/lib -L$(ESP_IDF_COMP_PATH)/esp32/ld -L$(ESP_
8177
-lfreertos -ljson -ljsmn -llwip -lnewlib -lvfs -lopenssl -lmbedtls -lwpa_supplicant \
8278
-lxtensa-debug-module -lbt -lsdmmc -lsoc -lheap -u ld_include_panic_highint_hdl \
8379

84-
ifeq ($(BOARD), $(filter $(BOARD), FIPY))
85-
LIBS += sigfox/modsigfox_fipy.a
86-
endif
87-
88-
ifeq ($(BOARD), $(filter $(BOARD), LOPY4))
89-
LIBS += sigfox/modsigfox_lopy4.a
90-
endif
91-
92-
ifeq ($(BOARD), $(filter $(BOARD), SIPY))
93-
LIBS += sigfox/modsigfox.a
94-
endif
95-
9680
B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader \
9781
-L$(ESP_IDF_COMP_PATH)/esp32/lib -llog -lcore -lbootloader_support \
9882
-lspi_flash -lsoc -lmicro-ecc -lgcc -lstdc++ -lgcov

‎tests/basics/struct1.py.exp

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
5
2+
(-128, 65536)
3+
5
4+
(-128, 256)
5+
b'\x01\x00\x00\x00'
6+
b'\x00\x00\x00\x01'
7+
b'\x01\x00\x00\x00'
8+
b'\x00\x00\x00\x01'
9+
b'\x01\x00'
10+
b'\x00\x01'
11+
b'\x01'
12+
b'\x01'
13+
b'\x80\x00\x01\x00\x00'
14+
b'\x80\x00\x00\x01\x00'
15+
104
16+
104
17+
(b'foo\x00\x00\x00', 13330)
18+
b"foo\x00\x00\x00\x10'"
19+
True
20+
b'\xff\xff\xff\xff'
21+
b'\xff\xff\xff\xff'
22+
b'\xff\xff\xff\xff\xff\xff\xff\xff'
23+
b'\xff\xff\xff\xff\xff\xff\xff\xff'
24+
b'\xff\xff\xff\xff\xff\xff\xff\xff'
25+
b'\xff\xff\xff\xff\xff\xff\xff\xff'
26+
b'\xff\xff\xff\xff\xff\xff\xff\xff'
27+
b'\xff\xff\xff\xff\xff\xff\xff\xff'
28+
b'\x15\x81\xe9}\xf4\x10"\x11'
29+
b'\xeb~\x16\x82\x0b\xef\xdd\xee'
30+
b'\x11"\x10\xf4}\xe9\x81\x15'
31+
b'\xee\xdd\xef\x0b\x82\x16~\xeb'
32+
(6211610197754262546,)
33+
(1311768467284833366,)
34+
(-705918829886819310,)
35+
(-994074541928860586,)
36+
(4294967295,)
37+
(18446744073709551615,)
38+
b'\x00\x00\x00{'
39+
TypeError
40+
(102, 111, 111, 13330, -1)
41+
b'\x01\x02\x03'
42+
bytearray(b'>>>ABC<<<')
43+
bytearray(b'>>>DEF<<<')
44+
struct.error
45+
struct.error
46+
(52,)
47+
(54,)
48+
struct.error
49+
struct.error

‎tests/basics/struct2.py.exp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
0
2+
(b'',)
3+
b''
4+
2
5+
(b'12',)
6+
b'12'
7+
4
8+
(12849, 13363)
9+
b'\x02\x01\x03\x02'
10+
6
11+
(b'', b'0', 12849, 13363)
12+
b'a\x02\x01\x03\x02'

‎tests/basics/syntaxerror.py.exp

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
SyntaxError
2+
IndentationError
3+
SyntaxError
4+
SyntaxError
5+
SyntaxError
6+
SyntaxError
7+
IndentationError
8+
SyntaxError
9+
SyntaxError
10+
SyntaxError
11+
SyntaxError
12+
SyntaxError
13+
SyntaxError
14+
SyntaxError
15+
SyntaxError
16+
SyntaxError
17+
SyntaxError
18+
SyntaxError
19+
SyntaxError
20+
SyntaxError
21+
SyntaxError
22+
SyntaxError
23+
SyntaxError
24+
SyntaxError
25+
SyntaxError
26+
SyntaxError
27+
SyntaxError
28+
SyntaxError
29+
SyntaxError
30+
SyntaxError
31+
SyntaxError
32+
SyntaxError
33+
SyntaxError
34+
SyntaxError
35+
SyntaxError
36+
SyntaxError
37+
SyntaxError
38+
SyntaxError
39+
SyntaxError
40+
SyntaxError
41+
SyntaxError
42+
SyntaxError
43+
SyntaxError
44+
SyntaxError
45+
SyntaxError
46+
SyntaxError
47+
SyntaxError

0 commit comments

Comments
 (0)