Skip to content

Commit 4d1f3f4

Browse files
committed
Add more MCU.
1 parent b9e614b commit 4d1f3f4

File tree

2 files changed

+67
-18
lines changed

2 files changed

+67
-18
lines changed

test/hitl/hitl_config.json

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"uid": "41003B000E504E5457323020",
55
"debugger": "jlink",
66
"debugger_sn": "774470029",
7-
"device": "stm32l412kb",
7+
"device": "STM32L412KB",
88
"tests": [
99
{
1010
"name": "cdc_dual_ports",
@@ -23,6 +23,54 @@
2323
"firmware": "examples/device/dfu_runtime/_build/stm32l412nucleo/dfu_runtime.elf"
2424
}
2525
]
26+
},
27+
{
28+
"uid": "210041000C51343237303334",
29+
"debugger": "jlink",
30+
"debugger_sn": "770935966",
31+
"device": "STM32F746NG",
32+
"tests": [
33+
{
34+
"name": "cdc_dual_ports",
35+
"firmware": "examples/device/cdc_dual_ports/_build/stm32f746disco/cdc_dual_ports.elf"
36+
},
37+
{
38+
"name": "cdc_msc",
39+
"firmware": "examples/device/cdc_msc/_build/stm32f746disco/cdc_msc.elf"
40+
},
41+
{
42+
"name": "dfu",
43+
"firmware": "examples/device/dfu/_build/stm32f746disco/dfu.elf"
44+
},
45+
{
46+
"name": "dfu_runtime",
47+
"firmware": "examples/device/dfu_runtime/_build/stm32f746disco/dfu_runtime.elf"
48+
}
49+
]
50+
},
51+
{
52+
"uid": "0123456789ABCDEF",
53+
"debugger": "jlink",
54+
"debugger_sn": "727600775",
55+
"device": "LPC54608J512",
56+
"tests": [
57+
{
58+
"name": "cdc_dual_ports",
59+
"firmware": "examples/device/cdc_dual_ports/_build/lpcxpresso54628/cdc_dual_ports.elf"
60+
},
61+
{
62+
"name": "cdc_msc",
63+
"firmware": "examples/device/cdc_msc/_build/lpcxpresso54628/cdc_msc.elf"
64+
},
65+
{
66+
"name": "dfu",
67+
"firmware": "examples/device/dfu/_build/lpcxpresso54628/dfu.elf"
68+
},
69+
{
70+
"name": "dfu_runtime",
71+
"firmware": "examples/device/dfu_runtime/_build/lpcxpresso54628/dfu_runtime.elf"
72+
}
73+
]
2674
}
2775
]
28-
}
76+
}

test/hitl/hitl_test.py

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ def flash_jlink(sn, dev, firmware):
3939
f.close()
4040
ret = subprocess.run(f'JLinkExe -USB {sn} -device {dev} -if swd -JTAGConf -1,-1 -speed auto -NoGui 1 -ExitOnError 1 -CommandFile flash.jlink',
4141
shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
42-
os.remove('flash.jlink')
43-
assert ret.returncode == 0, 'Flash failed'
42+
stdout = ret.stdout.decode()
43+
os.remove('flash.jlink')
44+
assert ret.returncode == 0, 'Flash failed\n' + stdout
4445

4546
def test_cdc_dual_ports(id):
4647
port1 = f'/dev/ttyUSB_{id[-8:]}.00'
@@ -55,7 +56,7 @@ def test_cdc_dual_ports(id):
5556

5657
assert os.path.exists(port1) and os.path.exists(port2), \
5758
'Device not available'
58-
59+
5960
# Echo test
6061
ser1 = serial.Serial(port1)
6162
ser2 = serial.Serial(port2)
@@ -90,16 +91,16 @@ def test_cdc_msc(id):
9091

9192
assert os.path.exists(port) and os.path.exists(block), \
9293
'Device not available'
93-
94+
9495
# Echo test
95-
ser = serial.Serial(port)
96+
ser1 = serial.Serial(port)
9697

97-
ser.timeout = 1
98+
ser1.timeout = 1
9899

99100
str = b"test_str"
100-
ser.write(str)
101-
ser.flush()
102-
assert ser.read(100) == str, 'Port wrong data'
101+
ser1.write(str)
102+
ser1.flush()
103+
assert ser1.read(100) == str, 'Port wrong data'
103104

104105
# Block test
105106
f = open(block, 'rb')
@@ -124,12 +125,12 @@ def test_dfu(id):
124125
break
125126
time.sleep(1)
126127
timeout = timeout - 1
127-
128+
128129
assert timeout, 'Device not available'
129-
130+
130131
# Test upload
131132
try:
132-
os.remove('dfu0')
133+
os.remove('dfu0')
133134
os.remove('dfu1')
134135
except OSError:
135136
pass
@@ -148,7 +149,7 @@ def test_dfu(id):
148149
with open('dfu1') as f:
149150
assert 'Hello world from TinyUSB DFU! - Partition 1' in f.read(), 'Wrong uploaded data'
150151

151-
os.remove('dfu0')
152+
os.remove('dfu0')
152153
os.remove('dfu1')
153154

154155
print('dfu test done')
@@ -164,7 +165,7 @@ def test_dfu_runtime(id):
164165
break
165166
time.sleep(1)
166167
timeout = timeout - 1
167-
168+
168169
assert timeout, 'Device not available'
169170

170171
print('dfu_runtime test done')
@@ -173,11 +174,11 @@ def test_dfu_runtime(id):
173174
if __name__ == '__main__':
174175
with open(f'{os.path.dirname(__file__)}/hitl_config.json') as f:
175176
config = json.load(f)
176-
177+
177178
for device in config['devices']:
178179
print(f"Testing device:{device['device']}")
179180
for test in device['tests']:
180-
if device['debugger'] == 'jlink':
181+
if device['debugger'].lower() == 'jlink':
181182
flash_jlink(device['debugger_sn'], device['device'], test['firmware'])
182183
else:
183184
# ToDo

0 commit comments

Comments
 (0)