Skip to content

Commit 532e1f4

Browse files
TomSawTomSaw
committed
Merge remote-tracking branch 'upstream/develop' into rewrite-graphics-API
2 parents ecf3c5c + 6057873 commit 532e1f4

70 files changed

Lines changed: 2526 additions & 143 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/linux.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,14 @@ jobs:
6868
if: always()
6969
run: |
7070
(cd examples && ../tools/scripts/examples_compile.py generic)
71-
- name: Examples SAM Devices
71+
- name: Examples SAMD Devices
7272
if: always()
7373
run: |
7474
(cd examples && ../tools/scripts/examples_compile.py samd)
75+
- name: Examples SAMG Devices
76+
if: always()
77+
run: |
78+
(cd examples && ../tools/scripts/examples_compile.py samg55_xplained_pro)
7579
- name: Execute Python Scripts
7680
if: always()
7781
run: |
@@ -127,7 +131,7 @@ jobs:
127131
- name: Examples STM32H7 Series
128132
if: always()
129133
run: |
130-
(cd examples && ../tools/scripts/examples_compile.py nucleo_h743zi nucleo_h723zg)
134+
(cd examples && ../tools/scripts/examples_compile.py nucleo_h743zi nucleo_h723zg stm32h750vbt6_devebox)
131135
132136
stm32f4-examples-1:
133137
runs-on: ubuntu-20.04

‎README.md‎

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ git clone --recurse-submodules --jobs 8 https://github.com/modm-io/modm.git
7474

7575
## Microcontrollers
7676

77-
modm can create a HAL for <!--allcount-->3172<!--/allcount--> devices of these vendors:
77+
modm can create a HAL for <!--allcount-->3175<!--/allcount--> devices of these vendors:
7878

7979
- STMicroelectronics STM32: <!--stmcount-->2621<!--/stmcount--> devices.
80-
- Microchip SAM: <!--samcount-->163<!--/samcount--> devices.
80+
- Microchip SAM: <!--samcount-->166<!--/samcount--> devices.
8181
- Microchip AVR: <!--avrcount-->388<!--/avrcount--> devices.
8282

8383
Here is a table with all device families and the peripheral drivers they support:
@@ -96,7 +96,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
9696
<tr>
9797
<th align="center"></th>
9898
<th align="center" colspan="12">STM32</th>
99-
<th align="center" colspan="1">SAM</th>
99+
<th align="center" colspan="2">SAM</th>
100100
<th align="center" colspan="3">AT</th>
101101
</tr><tr>
102102
<th align="left">Peripheral</th>
@@ -113,6 +113,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
113113
<th align="center">L1</th>
114114
<th align="center">L4</th>
115115
<th align="center">D21</th>
116+
<th align="center">G</th>
116117
<th align="center">90</th>
117118
<th align="center">Mega</th>
118119
<th align="center">Tiny</th>
@@ -132,6 +133,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
132133
<td align="center">✅</td>
133134
<td align="center">○</td>
134135
<td align="center">○</td>
136+
<td align="center">○</td>
135137
<td align="center">✅</td>
136138
<td align="center">✅</td>
137139
</tr><tr>
@@ -149,6 +151,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
149151
<td align="center">✗</td>
150152
<td align="center">✅</td>
151153
<td align="center">✗</td>
154+
<td align="center">✗</td>
152155
<td align="center">○</td>
153156
<td align="center">○</td>
154157
<td align="center">✗</td>
@@ -167,6 +170,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
167170
<td align="center">○</td>
168171
<td align="center">✅</td>
169172
<td align="center">○</td>
173+
<td align="center">✗</td>
170174
<td align="center">○</td>
171175
<td align="center">○</td>
172176
<td align="center">○</td>
@@ -186,6 +190,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
186190
<td align="center">✅</td>
187191
<td align="center">○</td>
188192
<td align="center">✗</td>
193+
<td align="center">✗</td>
189194
<td align="center">○</td>
190195
<td align="center">✗</td>
191196
</tr><tr>
@@ -206,6 +211,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
206211
<td align="center">✗</td>
207212
<td align="center">✗</td>
208213
<td align="center">✗</td>
214+
<td align="center">✗</td>
209215
</tr><tr>
210216
<td align="left">Ethernet</td>
211217
<td align="center">✗</td>
@@ -224,6 +230,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
224230
<td align="center">✗</td>
225231
<td align="center">✗</td>
226232
<td align="center">✗</td>
233+
<td align="center">✗</td>
227234
</tr><tr>
228235
<td align="left">External Interrupt</td>
229236
<td align="center">✅</td>
@@ -242,6 +249,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
242249
<td align="center">✅</td>
243250
<td align="center">✅</td>
244251
<td align="center">✅</td>
252+
<td align="center">✅</td>
245253
</tr><tr>
246254
<td align="left">External Memory</td>
247255
<td align="center">✗</td>
@@ -260,6 +268,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
260268
<td align="center">✗</td>
261269
<td align="center">✗</td>
262270
<td align="center">✗</td>
271+
<td align="center">✗</td>
263272
</tr><tr>
264273
<td align="left">GPIO</td>
265274
<td align="center">✅</td>
@@ -278,6 +287,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
278287
<td align="center">✅</td>
279288
<td align="center">✅</td>
280289
<td align="center">✅</td>
290+
<td align="center">✅</td>
281291
</tr><tr>
282292
<td align="left">I<sup>2</sup>C</td>
283293
<td align="center">✅</td>
@@ -293,6 +303,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
293303
<td align="center">✅</td>
294304
<td align="center">✅</td>
295305
<td align="center">○</td>
306+
<td align="center">○</td>
296307
<td align="center">✅</td>
297308
<td align="center">✅</td>
298309
<td align="center">✅</td>
@@ -314,6 +325,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
314325
<td align="center">✗</td>
315326
<td align="center">✗</td>
316327
<td align="center">✗</td>
328+
<td align="center">✗</td>
317329
</tr><tr>
318330
<td align="left">Random Generator</td>
319331
<td align="center">✗</td>
@@ -332,6 +344,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
332344
<td align="center">✗</td>
333345
<td align="center">✗</td>
334346
<td align="center">✗</td>
347+
<td align="center">✗</td>
335348
</tr><tr>
336349
<td align="left">SPI</td>
337350
<td align="center">✅</td>
@@ -350,6 +363,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
350363
<td align="center">✅</td>
351364
<td align="center">✅</td>
352365
<td align="center">✅</td>
366+
<td align="center">✅</td>
353367
</tr><tr>
354368
<td align="left">System Clock</td>
355369
<td align="center">✅</td>
@@ -368,6 +382,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
368382
<td align="center">✗</td>
369383
<td align="center">✗</td>
370384
<td align="center">✗</td>
385+
<td align="center">✗</td>
371386
</tr><tr>
372387
<td align="left">Timer</td>
373388
<td align="center">✅</td>
@@ -386,6 +401,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
386401
<td align="center">○</td>
387402
<td align="center">○</td>
388403
<td align="center">○</td>
404+
<td align="center">○</td>
389405
</tr><tr>
390406
<td align="left">UART</td>
391407
<td align="center">✅</td>
@@ -401,6 +417,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
401417
<td align="center">✅</td>
402418
<td align="center">✅</td>
403419
<td align="center">✅</td>
420+
<td align="center">○</td>
404421
<td align="center">✅</td>
405422
<td align="center">✅</td>
406423
<td align="center">○</td>
@@ -422,6 +439,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
422439
<td align="center">✗</td>
423440
<td align="center">✗</td>
424441
<td align="center">✗</td>
442+
<td align="center">✗</td>
425443
</tr><tr>
426444
<td align="left">USB</td>
427445
<td align="center">✅</td>
@@ -437,6 +455,7 @@ Please [discover modm's peripheral drivers for your specific device][discover].
437455
<td align="center">✅</td>
438456
<td align="center">✅</td>
439457
<td align="center">✅</td>
458+
<td align="center">✅</td>
440459
<td align="center">✗</td>
441460
<td align="center">✗</td>
442461
<td align="center">✗</td>
@@ -468,63 +487,66 @@ We have out-of-box support for many development boards including documentation.
468487
<td align="center"><a href="https://modm.io/reference/module/modm-board-blue-pill-f103">Blue Pill F103</a></td>
469488
<td align="center"><a href="https://modm.io/reference/module/modm-board-devebox-stm32f4xx">DEVEBOX-STM32F4XX</a></td>
470489
</tr><tr>
490+
<td align="center"><a href="https://modm.io/reference/module/modm-board-devebox-stm32h750vb">DEVEBOX-STM32H750VB</a></td>
471491
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f051r8">DISCO-F051R8</a></td>
472492
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f072rb">DISCO-F072RB</a></td>
473493
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f100rb">DISCO-F100RB</a></td>
474-
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f303vc">DISCO-F303VC</a></td>
475494
</tr><tr>
495+
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f303vc">DISCO-F303VC</a></td>
476496
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f407vg">DISCO-F407VG</a></td>
477497
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f429zi">DISCO-F429ZI</a></td>
478498
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f469ni">DISCO-F469NI</a></td>
479-
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f746ng">DISCO-F746NG</a></td>
480499
</tr><tr>
500+
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f746ng">DISCO-F746NG</a></td>
481501
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-f769ni">DISCO-F769NI</a></td>
482502
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-l152rc">DISCO-L152RC</a></td>
483503
<td align="center"><a href="https://modm.io/reference/module/modm-board-disco-l476vg">DISCO-L476VG</a></td>
484-
<td align="center"><a href="https://modm.io/reference/module/modm-board-feather-m0">FEATHER-M0</a></td>
485504
</tr><tr>
505+
<td align="center"><a href="https://modm.io/reference/module/modm-board-feather-m0">FEATHER-M0</a></td>
486506
<td align="center"><a href="https://modm.io/reference/module/modm-board-mega-2560-pro">MEGA-2560-PRO</a></td>
487507
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f031k6">NUCLEO-F031K6</a></td>
488508
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f042k6">NUCLEO-F042K6</a></td>
489-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f072rb">NUCLEO-F072RB</a></td>
490509
</tr><tr>
510+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f072rb">NUCLEO-F072RB</a></td>
491511
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f091rc">NUCLEO-F091RC</a></td>
492512
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f103rb">NUCLEO-F103RB</a></td>
493513
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f303k8">NUCLEO-F303K8</a></td>
494-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f303re">NUCLEO-F303RE</a></td>
495514
</tr><tr>
515+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f303re">NUCLEO-F303RE</a></td>
496516
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f334r8">NUCLEO-F334R8</a></td>
497517
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f401re">NUCLEO-F401RE</a></td>
498518
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f411re">NUCLEO-F411RE</a></td>
499-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f429zi">NUCLEO-F429ZI</a></td>
500519
</tr><tr>
520+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f429zi">NUCLEO-F429ZI</a></td>
501521
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f439zi">NUCLEO-F439ZI</a></td>
502522
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f446re">NUCLEO-F446RE</a></td>
503523
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f446ze">NUCLEO-F446ZE</a></td>
504-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f746zg">NUCLEO-F746ZG</a></td>
505524
</tr><tr>
525+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f746zg">NUCLEO-F746ZG</a></td>
506526
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-f767zi">NUCLEO-F767ZI</a></td>
507527
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-g071rb">NUCLEO-G071RB</a></td>
508528
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-g431kb">NUCLEO-G431KB</a></td>
509-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-g431rb">NUCLEO-G431RB</a></td>
510529
</tr><tr>
530+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-g431rb">NUCLEO-G431RB</a></td>
511531
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-g474re">NUCLEO-G474RE</a></td>
512532
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-h723zg">NUCLEO-H723ZG</a></td>
513533
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-h743zi">NUCLEO-H743ZI</a></td>
514-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l031k6">NUCLEO-L031K6</a></td>
515534
</tr><tr>
535+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l031k6">NUCLEO-L031K6</a></td>
516536
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l152re">NUCLEO-L152RE</a></td>
517537
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l432kc">NUCLEO-L432KC</a></td>
518538
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l452re">NUCLEO-L452RE</a></td>
519-
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l476rg">NUCLEO-L476RG</a></td>
520539
</tr><tr>
540+
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l476rg">NUCLEO-L476RG</a></td>
521541
<td align="center"><a href="https://modm.io/reference/module/modm-board-nucleo-l496zg-p">NUCLEO-L496ZG-P</a></td>
522542
<td align="center"><a href="https://modm.io/reference/module/modm-board-olimexino-stm32">OLIMEXINO-STM32</a></td>
523543
<td align="center"><a href="https://modm.io/reference/module/modm-board-raspberrypi">Raspberry Pi</a></td>
524-
<td align="center"><a href="https://modm.io/reference/module/modm-board-samd21-mini">SAMD21-MINI</a></td>
525544
</tr><tr>
545+
<td align="center"><a href="https://modm.io/reference/module/modm-board-samd21-mini">SAMD21-MINI</a></td>
546+
<td align="center"><a href="https://modm.io/reference/module/modm-board-samg55-xplained-pro">SAMG55-XPLAINED-PRO</a></td>
526547
<td align="center"><a href="https://modm.io/reference/module/modm-board-stm32_f4ve">STM32-F4VE</a></td>
527548
<td align="center"><a href="https://modm.io/reference/module/modm-board-stm32f030_demo">STM32F030-DEMO</a></td>
549+
</tr><tr>
528550
<td align="center"><a href="https://modm.io/reference/module/modm-board-srxe">Smart Response XE</a></td>
529551
</tr>
530552
</table>
@@ -613,20 +635,21 @@ you specific needs.
613635
<td align="center"><a href="https://modm.io/reference/module/modm-driver-sk9822">SK9822</a></td>
614636
<td align="center"><a href="https://modm.io/reference/module/modm-driver-ssd1306">SSD1306</a></td>
615637
</tr><tr>
638+
<td align="center"><a href="https://modm.io/reference/module/modm-driver-st7586s">ST7586S</a></td>
616639
<td align="center"><a href="https://modm.io/reference/module/modm-driver-stts22h">STTS22H</a></td>
617640
<td align="center"><a href="https://modm.io/reference/module/modm-driver-stusb4500">STUSB4500</a></td>
618641
<td align="center"><a href="https://modm.io/reference/module/modm-driver-sx1276">SX1276</a></td>
619642
<td align="center"><a href="https://modm.io/reference/module/modm-driver-tcs3414">TCS3414</a></td>
620643
<td align="center"><a href="https://modm.io/reference/module/modm-driver-tcs3472">TCS3472</a></td>
621-
<td align="center"><a href="https://modm.io/reference/module/modm-driver-tlc594x">TLC594X</a></td>
622644
</tr><tr>
645+
<td align="center"><a href="https://modm.io/reference/module/modm-driver-tlc594x">TLC594X</a></td>
623646
<td align="center"><a href="https://modm.io/reference/module/modm-driver-tmp102">TMP102</a></td>
624647
<td align="center"><a href="https://modm.io/reference/module/modm-driver-tmp175">TMP175</a></td>
625648
<td align="center"><a href="https://modm.io/reference/module/modm-driver-touch2046">TOUCH2046</a></td>
626649
<td align="center"><a href="https://modm.io/reference/module/modm-driver-vl53l0">VL53L0</a></td>
627650
<td align="center"><a href="https://modm.io/reference/module/modm-driver-vl6180">VL6180</a></td>
628-
<td align="center"><a href="https://modm.io/reference/module/modm-driver-ws2812">WS2812</a></td>
629651
</tr><tr>
652+
<td align="center"><a href="https://modm.io/reference/module/modm-driver-ws2812">WS2812</a></td>
630653
</tr>
631654
</table>
632655
<!--/drivertable-->

‎examples/samg55_xplained_pro/blink/main.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#include "modm/board.hpp"
2+
3+
using namespace modm::platform;
4+
5+
int main() {
6+
Board::initialize();
7+
8+
while(true) {
9+
Board::Led::toggle();
10+
modm::delay_ms(500);
11+
}
12+
13+
}

‎examples/samg55_xplained_pro/blink/project.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<library>
2+
<extends>modm:samg55-xplained-pro</extends>
3+
<options>
4+
<option name="modm:build:build.path">../../../build/samg55_xplained_pro/blink</option>
5+
</options>
6+
<modules>
7+
<module>modm:build:scons</module>
8+
</modules>
9+
</library>

‎examples/samg55_xplained_pro/spi-loopback/main.cpp‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#include <modm/board.hpp>
2+
3+
using namespace modm::platform;
4+
5+
int main() {
6+
// Test SPI send and receive in loopback mode. If we receive the expected
7+
// characters back, flash slowly. Otherwise, flash fast.
8+
Board::initialize();
9+
10+
SpiMaster0::connect<GpioB0::Sck, GpioA9::Miso, GpioA10::Mosi>();
11+
SpiMaster0::initialize<Board::SystemClock, 1_MHz>();
12+
13+
SpiMaster0::setLocalLoopback(true);
14+
15+
while (true)
16+
{
17+
uint32_t flash_time_ms;
18+
uint8_t tx[] = {0xa5, 0x21};
19+
uint8_t rx[2];
20+
21+
SpiMaster0::transferBlocking(tx, rx, 2);
22+
23+
if(rx[0] == 0xa5 && rx[1] == 0x21) {
24+
flash_time_ms = 500;
25+
} else {
26+
flash_time_ms = 100;
27+
}
28+
29+
for(uint32_t i=0; i<5; i++) {
30+
Board::Led::set();
31+
modm::delay_ms(flash_time_ms);
32+
Board::Led::reset();
33+
modm::delay_ms(flash_time_ms);
34+
}
35+
}
36+
}

‎examples/samg55_xplained_pro/spi-loopback/project.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<library>
2+
<extends>modm:samg55-xplained-pro</extends>
3+
<options>
4+
<option name="modm:build:project.name">samg-spi-demo</option>
5+
<option name="modm:build:build.path">../../../build/samg55_xplained_pro/spi-loopback</option>
6+
</options>
7+
<modules>
8+
<module>modm:build:scons</module>
9+
<module>modm:platform:spi:0</module>
10+
</modules>
11+
</library>

0 commit comments

Comments
 (0)