Skip to content

Commit bb3ed3a

Browse files
hierophecthierophect
committed
Merge branch 'master' into stm32x7-setup
2 parents bb167f0 + 3a5f79a commit bb3ed3a

File tree

27 files changed

+580
-140
lines changed

27 files changed

+580
-140
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ jobs:
122122
fail-fast: false
123123
matrix:
124124
board:
125+
- "TG-Watch02A"
125126
- "aramcon_badge_2019"
126127
- "arduino_mkr1300"
127128
- "arduino_mkrzero"

‎.gitmodules

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
[submodule "tools/python-semver"]
3030
path = tools/python-semver
3131
url = https://github.com/k-bx/python-semver.git
32-
[submodule "lib/stm32lib"]
33-
path = lib/stm32lib
34-
url = https://github.com/micropython/stm32lib
35-
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
3632
[submodule "atmel-samd/asf4"]
3733
path = ports/atmel-samd/asf4
3834
url = https://github.com/adafruit/asf4.git
@@ -96,9 +92,6 @@
9692
[submodule "frozen/circuitpython-stage"]
9793
path = frozen/circuitpython-stage
9894
url = https://github.com/python-ugame/circuitpython-stage.git
99-
[submodule "ports/stm/stm32f4"]
100-
path = ports/stm/stm32f4
101-
url = https://github.com/adafruit/stm32f4.git
10295
[submodule "ports/cxd56/spresense-exported-sdk"]
10396
path = ports/cxd56/spresense-exported-sdk
10497
url = https://github.com/sonydevworld/spresense-exported-sdk.git
@@ -122,4 +115,7 @@
122115
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
123116
[submodule "frozen/Adafruit_CircuitPython_Requests"]
124117
path = frozen/Adafruit_CircuitPython_Requests
125-
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
118+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
119+
[submodule "ports/stm/st_driver"]
120+
path = ports/stm/st_driver
121+
url = https://github.com/hathach/st_driver.git

‎conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"ports/nrf/nrfx",
133133
"ports/nrf/peripherals",
134134
"ports/nrf/usb",
135-
"ports/stm/stm32f4",
135+
"ports/stm/st_driver",
136136
"ports/stm/peripherals",
137137
"ports/stm/ref",
138138
"ports/unix",

‎locale/ID.po

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
11+
"POT-Creation-Date: 2020-03-11 17:52-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -709,6 +709,7 @@ msgstr "Gagal untuk mengalokasikan buffer RX"
709709
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
710710
#: ports/cxd56/common-hal/pulseio/PulseIn.c
711711
#: ports/nrf/common-hal/pulseio/PulseIn.c
712+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
712713
#, c-format
713714
msgid "Failed to allocate RX buffer of %d bytes"
714715
msgstr "Gagal untuk megalokasikan buffer RX dari %d byte"
@@ -1165,6 +1166,10 @@ msgstr ""
11651166
msgid "Pin does not have ADC capabilities"
11661167
msgstr "Pin tidak mempunya kemampuan untuk ADC (Analog Digital Converter)"
11671168

1169+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1170+
msgid "Pin number already reserved by EXTI"
1171+
msgstr ""
1172+
11681173
#: py/builtinhelp.c
11691174
msgid "Plus any modules on the filesystem\n"
11701175
msgstr "Tambahkan module apapun pada filesystem\n"
@@ -1187,10 +1192,6 @@ msgstr ""
11871192
msgid "Pull not used when direction is output."
11881193
msgstr ""
11891194

1190-
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1191-
msgid "PulseIn not yet supported"
1192-
msgstr ""
1193-
11941195
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
11951196
msgid "PulseOut not supported on this chip"
11961197
msgstr ""
@@ -2231,7 +2232,8 @@ msgstr ""
22312232

22322233
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
22332234
#: ports/cxd56/common-hal/pulseio/PulseIn.c
2234-
#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c
2235+
#: ports/nrf/common-hal/pulseio/PulseIn.c
2236+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c py/obj.c
22352237
msgid "index out of range"
22362238
msgstr "index keluar dari jangkauan"
22372239

@@ -2718,6 +2720,7 @@ msgstr ""
27182720
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
27192721
#: ports/cxd56/common-hal/pulseio/PulseIn.c
27202722
#: ports/nrf/common-hal/pulseio/PulseIn.c
2723+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
27212724
msgid "pop from an empty PulseIn"
27222725
msgstr "Muncul dari PulseIn yang kosong"
27232726

@@ -2949,6 +2952,7 @@ msgstr ""
29492952

29502953
#: ports/atmel-samd/common-hal/busio/UART.c
29512954
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
2955+
#: shared-bindings/busio/UART.c
29522956
msgid "tx and rx cannot both be None"
29532957
msgstr "tx dan rx keduanya tidak boleh kosong"
29542958

‎locale/circuitpython.pot

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
11+
"POT-Creation-Date: 2020-03-11 17:52-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -698,6 +698,7 @@ msgstr ""
698698
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
699699
#: ports/cxd56/common-hal/pulseio/PulseIn.c
700700
#: ports/nrf/common-hal/pulseio/PulseIn.c
701+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
701702
#, c-format
702703
msgid "Failed to allocate RX buffer of %d bytes"
703704
msgstr ""
@@ -1153,6 +1154,10 @@ msgstr ""
11531154
msgid "Pin does not have ADC capabilities"
11541155
msgstr ""
11551156

1157+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1158+
msgid "Pin number already reserved by EXTI"
1159+
msgstr ""
1160+
11561161
#: py/builtinhelp.c
11571162
msgid "Plus any modules on the filesystem\n"
11581163
msgstr ""
@@ -1173,10 +1178,6 @@ msgstr ""
11731178
msgid "Pull not used when direction is output."
11741179
msgstr ""
11751180

1176-
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1177-
msgid "PulseIn not yet supported"
1178-
msgstr ""
1179-
11801181
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
11811182
msgid "PulseOut not supported on this chip"
11821183
msgstr ""
@@ -2207,7 +2208,8 @@ msgstr ""
22072208

22082209
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
22092210
#: ports/cxd56/common-hal/pulseio/PulseIn.c
2210-
#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c
2211+
#: ports/nrf/common-hal/pulseio/PulseIn.c
2212+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c py/obj.c
22112213
msgid "index out of range"
22122214
msgstr ""
22132215

@@ -2693,6 +2695,7 @@ msgstr ""
26932695
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
26942696
#: ports/cxd56/common-hal/pulseio/PulseIn.c
26952697
#: ports/nrf/common-hal/pulseio/PulseIn.c
2698+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
26962699
msgid "pop from an empty PulseIn"
26972700
msgstr ""
26982701

@@ -2923,6 +2926,7 @@ msgstr ""
29232926

29242927
#: ports/atmel-samd/common-hal/busio/UART.c
29252928
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
2929+
#: shared-bindings/busio/UART.c
29262930
msgid "tx and rx cannot both be None"
29272931
msgstr ""
29282932

‎locale/de_DE.po

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
10+
"POT-Creation-Date: 2020-03-11 17:52-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -702,6 +702,7 @@ msgstr "Konnte keinen RX Buffer allozieren"
702702
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
703703
#: ports/cxd56/common-hal/pulseio/PulseIn.c
704704
#: ports/nrf/common-hal/pulseio/PulseIn.c
705+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
705706
#, c-format
706707
msgid "Failed to allocate RX buffer of %d bytes"
707708
msgstr "Konnte keine RX Buffer mit %d allozieren"
@@ -1168,6 +1169,10 @@ msgstr "Zugang verweigert"
11681169
msgid "Pin does not have ADC capabilities"
11691170
msgstr "Pin hat keine ADC Funktionalität"
11701171

1172+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1173+
msgid "Pin number already reserved by EXTI"
1174+
msgstr ""
1175+
11711176
#: py/builtinhelp.c
11721177
msgid "Plus any modules on the filesystem\n"
11731178
msgstr "und alle Module im Dateisystem \n"
@@ -1190,10 +1195,6 @@ msgstr ""
11901195
msgid "Pull not used when direction is output."
11911196
msgstr "Pull wird nicht verwendet, wenn die Richtung output ist."
11921197

1193-
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1194-
msgid "PulseIn not yet supported"
1195-
msgstr ""
1196-
11971198
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
11981199
msgid "PulseOut not supported on this chip"
11991200
msgstr ""
@@ -2237,7 +2238,8 @@ msgstr ""
22372238

22382239
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
22392240
#: ports/cxd56/common-hal/pulseio/PulseIn.c
2240-
#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c
2241+
#: ports/nrf/common-hal/pulseio/PulseIn.c
2242+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c py/obj.c
22412243
msgid "index out of range"
22422244
msgstr "index außerhalb der Reichweite"
22432245

@@ -2731,6 +2733,7 @@ msgstr "pixel_shader muss displayio.Palette oder displayio.ColorConverter sein"
27312733
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
27322734
#: ports/cxd56/common-hal/pulseio/PulseIn.c
27332735
#: ports/nrf/common-hal/pulseio/PulseIn.c
2736+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
27342737
msgid "pop from an empty PulseIn"
27352738
msgstr "pop von einem leeren PulseIn"
27362739

@@ -2964,6 +2967,7 @@ msgstr ""
29642967

29652968
#: ports/atmel-samd/common-hal/busio/UART.c
29662969
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
2970+
#: shared-bindings/busio/UART.c
29672971
msgid "tx and rx cannot both be None"
29682972
msgstr "tx und rx können nicht beide None sein"
29692973

‎locale/en_US.po

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
10+
"POT-Creation-Date: 2020-03-11 17:52-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -698,6 +698,7 @@ msgstr ""
698698
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
699699
#: ports/cxd56/common-hal/pulseio/PulseIn.c
700700
#: ports/nrf/common-hal/pulseio/PulseIn.c
701+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
701702
#, c-format
702703
msgid "Failed to allocate RX buffer of %d bytes"
703704
msgstr ""
@@ -1153,6 +1154,10 @@ msgstr ""
11531154
msgid "Pin does not have ADC capabilities"
11541155
msgstr ""
11551156

1157+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1158+
msgid "Pin number already reserved by EXTI"
1159+
msgstr ""
1160+
11561161
#: py/builtinhelp.c
11571162
msgid "Plus any modules on the filesystem\n"
11581163
msgstr ""
@@ -1173,10 +1178,6 @@ msgstr ""
11731178
msgid "Pull not used when direction is output."
11741179
msgstr ""
11751180

1176-
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1177-
msgid "PulseIn not yet supported"
1178-
msgstr ""
1179-
11801181
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
11811182
msgid "PulseOut not supported on this chip"
11821183
msgstr ""
@@ -2207,7 +2208,8 @@ msgstr ""
22072208

22082209
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
22092210
#: ports/cxd56/common-hal/pulseio/PulseIn.c
2210-
#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c
2211+
#: ports/nrf/common-hal/pulseio/PulseIn.c
2212+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c py/obj.c
22112213
msgid "index out of range"
22122214
msgstr ""
22132215

@@ -2693,6 +2695,7 @@ msgstr ""
26932695
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
26942696
#: ports/cxd56/common-hal/pulseio/PulseIn.c
26952697
#: ports/nrf/common-hal/pulseio/PulseIn.c
2698+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
26962699
msgid "pop from an empty PulseIn"
26972700
msgstr ""
26982701

@@ -2923,6 +2926,7 @@ msgstr ""
29232926

29242927
#: ports/atmel-samd/common-hal/busio/UART.c
29252928
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
2929+
#: shared-bindings/busio/UART.c
29262930
msgid "tx and rx cannot both be None"
29272931
msgstr ""
29282932

‎locale/en_x_pirate.po

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
10+
"POT-Creation-Date: 2020-03-11 17:52-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -702,6 +702,7 @@ msgstr ""
702702
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
703703
#: ports/cxd56/common-hal/pulseio/PulseIn.c
704704
#: ports/nrf/common-hal/pulseio/PulseIn.c
705+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
705706
#, c-format
706707
msgid "Failed to allocate RX buffer of %d bytes"
707708
msgstr ""
@@ -1157,6 +1158,10 @@ msgstr ""
11571158
msgid "Pin does not have ADC capabilities"
11581159
msgstr "Belay that! Th' Pin be not ADC capable"
11591160

1161+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1162+
msgid "Pin number already reserved by EXTI"
1163+
msgstr ""
1164+
11601165
#: py/builtinhelp.c
11611166
msgid "Plus any modules on the filesystem\n"
11621167
msgstr ""
@@ -1177,10 +1182,6 @@ msgstr ""
11771182
msgid "Pull not used when direction is output."
11781183
msgstr ""
11791184

1180-
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
1181-
msgid "PulseIn not yet supported"
1182-
msgstr ""
1183-
11841185
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
11851186
msgid "PulseOut not supported on this chip"
11861187
msgstr ""
@@ -2211,7 +2212,8 @@ msgstr ""
22112212

22122213
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
22132214
#: ports/cxd56/common-hal/pulseio/PulseIn.c
2214-
#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c
2215+
#: ports/nrf/common-hal/pulseio/PulseIn.c
2216+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c py/obj.c
22152217
msgid "index out of range"
22162218
msgstr ""
22172219

@@ -2697,6 +2699,7 @@ msgstr ""
26972699
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
26982700
#: ports/cxd56/common-hal/pulseio/PulseIn.c
26992701
#: ports/nrf/common-hal/pulseio/PulseIn.c
2702+
#: ports/stm32f4/common-hal/pulseio/PulseIn.c
27002703
msgid "pop from an empty PulseIn"
27012704
msgstr ""
27022705

@@ -2927,6 +2930,7 @@ msgstr ""
29272930

29282931
#: ports/atmel-samd/common-hal/busio/UART.c
29292932
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
2933+
#: shared-bindings/busio/UART.c
29302934
msgid "tx and rx cannot both be None"
29312935
msgstr ""
29322936

0 commit comments

Comments
 (0)