Skip to content

Commit 1d973a0

Browse files
tannewttannewt
authored
Merge pull request #2071 from dhalbert/shared-module-touchio
make nrf touchio be generic: now available for SAMD51 too
2 parents 18f441a + 7cc15e5 commit 1d973a0

File tree

42 files changed

+141
-137
lines changed

Some content is hidden

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

42 files changed

+141
-137
lines changed

‎locale/ID.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
11+
"POT-Creation-Date: 2019-08-22 15:20-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"
@@ -980,6 +980,10 @@ msgstr ""
980980
msgid "No hardware support on pin"
981981
msgstr "Tidak ada dukungan hardware untuk pin"
982982

983+
#: shared-module/touchio/TouchIn.c
984+
msgid "No pulldown on pin; 1Mohm recommended"
985+
msgstr ""
986+
983987
#: py/moduerrno.c
984988
msgid "No space left on device"
985989
msgstr ""
@@ -1329,9 +1333,6 @@ msgid "Unsupported pull value."
13291333
msgstr ""
13301334

13311335
#: ports/nrf/common-hal/bleio/Characteristic.c
1332-
msgid "Value length required fixed length"
1333-
msgstr ""
1334-
13351336
#: ports/nrf/common-hal/bleio/Descriptor.c
13361337
msgid "Value length != required fixed length"
13371338
msgstr ""

‎locale/circuitpython.pot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-08-21 14:18-0400\n"
12-
"POT-Creation-Date: 2019-08-19 10:22-0400\n"
11+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1312
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1413
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1514
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -966,6 +965,10 @@ msgstr ""
966965
msgid "No hardware support on pin"
967966
msgstr ""
968967

968+
#: shared-module/touchio/TouchIn.c
969+
msgid "No pulldown on pin; 1Mohm recommended"
970+
msgstr ""
971+
969972
#: py/moduerrno.c
970973
msgid "No space left on device"
971974
msgstr ""
@@ -1306,9 +1309,6 @@ msgid "Unsupported pull value."
13061309
msgstr ""
13071310

13081311
#: ports/nrf/common-hal/bleio/Characteristic.c
1309-
msgid "Value length required fixed length"
1310-
msgstr ""
1311-
13121312
#: ports/nrf/common-hal/bleio/Descriptor.c
13131313
msgid "Value length != required fixed length"
13141314
msgstr ""

‎locale/de_DE.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-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"
@@ -978,6 +978,10 @@ msgstr ""
978978
msgid "No hardware support on pin"
979979
msgstr "Keine Hardwareunterstützung an diesem Pin"
980980

981+
#: shared-module/touchio/TouchIn.c
982+
msgid "No pulldown on pin; 1Mohm recommended"
983+
msgstr ""
984+
981985
#: py/moduerrno.c
982986
msgid "No space left on device"
983987
msgstr "Kein Speicherplatz auf Gerät"
@@ -1336,9 +1340,6 @@ msgid "Unsupported pull value."
13361340
msgstr "Nicht unterstützter Pull-Wert"
13371341

13381342
#: ports/nrf/common-hal/bleio/Characteristic.c
1339-
msgid "Value length required fixed length"
1340-
msgstr ""
1341-
13421343
#: ports/nrf/common-hal/bleio/Descriptor.c
13431344
msgid "Value length != required fixed length"
13441345
msgstr ""

‎locale/en_US.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -965,6 +965,10 @@ msgstr ""
965965
msgid "No hardware support on pin"
966966
msgstr ""
967967

968+
#: shared-module/touchio/TouchIn.c
969+
msgid "No pulldown on pin; 1Mohm recommended"
970+
msgstr ""
971+
968972
#: py/moduerrno.c
969973
msgid "No space left on device"
970974
msgstr ""
@@ -1305,9 +1309,6 @@ msgid "Unsupported pull value."
13051309
msgstr ""
13061310

13071311
#: ports/nrf/common-hal/bleio/Characteristic.c
1308-
msgid "Value length required fixed length"
1309-
msgstr ""
1310-
13111312
#: ports/nrf/common-hal/bleio/Descriptor.c
13121313
msgid "Value length != required fixed length"
13131314
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -969,6 +969,10 @@ msgstr ""
969969
msgid "No hardware support on pin"
970970
msgstr ""
971971

972+
#: shared-module/touchio/TouchIn.c
973+
msgid "No pulldown on pin; 1Mohm recommended"
974+
msgstr ""
975+
972976
#: py/moduerrno.c
973977
msgid "No space left on device"
974978
msgstr ""
@@ -1309,9 +1313,6 @@ msgid "Unsupported pull value."
13091313
msgstr ""
13101314

13111315
#: ports/nrf/common-hal/bleio/Characteristic.c
1312-
msgid "Value length required fixed length"
1313-
msgstr ""
1314-
13151316
#: ports/nrf/common-hal/bleio/Descriptor.c
13161317
msgid "Value length != required fixed length"
13171318
msgstr ""

‎locale/es.po

Lines changed: 10 additions & 9 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -334,11 +334,6 @@ msgstr "El brillo no se puede ajustar"
334334
msgid "Buffer incorrect size. Should be %d bytes."
335335
msgstr "Tamaño de buffer incorrecto. Debe ser de %d bytes."
336336

337-
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
338-
#, c-format
339-
msgid "Buffer length %d too big. It must be less than %d"
340-
msgstr ""
341-
342337
#: shared-bindings/displayio/Display.c
343338
msgid "Buffer is not a bytearray."
344339
msgstr ""
@@ -347,6 +342,11 @@ msgstr ""
347342
msgid "Buffer is too small"
348343
msgstr ""
349344

345+
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
346+
#, c-format
347+
msgid "Buffer length %d too big. It must be less than %d"
348+
msgstr ""
349+
350350
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
351351
msgid "Buffer must be at least length 1"
352352
msgstr "Buffer debe ser de longitud 1 como minimo"
@@ -980,6 +980,10 @@ msgstr "Sin soporte de hardware en el pin clk"
980980
msgid "No hardware support on pin"
981981
msgstr "Sin soporte de hardware en pin"
982982

983+
#: shared-module/touchio/TouchIn.c
984+
msgid "No pulldown on pin; 1Mohm recommended"
985+
msgstr ""
986+
983987
#: py/moduerrno.c
984988
msgid "No space left on device"
985989
msgstr "No queda espacio en el dispositivo"
@@ -1346,9 +1350,6 @@ msgid "Unsupported pull value."
13461350
msgstr "valor pull no soportado."
13471351

13481352
#: ports/nrf/common-hal/bleio/Characteristic.c
1349-
msgid "Value length required fixed length"
1350-
msgstr ""
1351-
13521353
#: ports/nrf/common-hal/bleio/Descriptor.c
13531354
msgid "Value length != required fixed length"
13541355
msgstr ""

‎locale/fil.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <[email protected]>\n"
1313
"Language-Team: fil\n"
@@ -989,6 +989,10 @@ msgstr ""
989989
msgid "No hardware support on pin"
990990
msgstr "Walang support sa hardware ang pin"
991991

992+
#: shared-module/touchio/TouchIn.c
993+
msgid "No pulldown on pin; 1Mohm recommended"
994+
msgstr ""
995+
992996
#: py/moduerrno.c
993997
msgid "No space left on device"
994998
msgstr ""
@@ -1350,9 +1354,6 @@ msgid "Unsupported pull value."
13501354
msgstr "Hindi suportado ang pull value."
13511355

13521356
#: ports/nrf/common-hal/bleio/Characteristic.c
1353-
msgid "Value length required fixed length"
1354-
msgstr ""
1355-
13561357
#: ports/nrf/common-hal/bleio/Descriptor.c
13571358
msgid "Value length != required fixed length"
13581359
msgstr ""

‎locale/fr.po

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: 0.1\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-08-21 14:18-0400\n"
11+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1212
"PO-Revision-Date: 2019-04-14 20:05+0100\n"
1313
"Last-Translator: Pierrick Couturier <[email protected]>\n"
1414
"Language-Team: fr\n"
@@ -998,6 +998,10 @@ msgstr ""
998998
msgid "No hardware support on pin"
999999
msgstr "Pas de support matériel pour cette broche"
10001000

1001+
#: shared-module/touchio/TouchIn.c
1002+
msgid "No pulldown on pin; 1Mohm recommended"
1003+
msgstr ""
1004+
10011005
#: py/moduerrno.c
10021006
msgid "No space left on device"
10031007
msgstr "Il n'y a plus d'espace libre sur le périphérique"
@@ -1375,9 +1379,6 @@ msgid "Unsupported pull value."
13751379
msgstr "Valeur de tirage 'pull' non supportée."
13761380

13771381
#: ports/nrf/common-hal/bleio/Characteristic.c
1378-
msgid "Value length required fixed length"
1379-
msgstr ""
1380-
13811382
#: ports/nrf/common-hal/bleio/Descriptor.c
13821383
msgid "Value length != required fixed length"
13831384
msgstr ""

‎locale/it_IT.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
11+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <[email protected]>\n"
1414
"Language-Team: \n"
@@ -988,6 +988,10 @@ msgstr ""
988988
msgid "No hardware support on pin"
989989
msgstr "Nessun supporto hardware sul pin"
990990

991+
#: shared-module/touchio/TouchIn.c
992+
msgid "No pulldown on pin; 1Mohm recommended"
993+
msgstr ""
994+
991995
#: py/moduerrno.c
992996
msgid "No space left on device"
993997
msgstr "Non che spazio sul dispositivo"
@@ -1349,9 +1353,6 @@ msgid "Unsupported pull value."
13491353
msgstr "Valore di pull non supportato."
13501354

13511355
#: ports/nrf/common-hal/bleio/Characteristic.c
1352-
msgid "Value length required fixed length"
1353-
msgstr ""
1354-
13551356
#: ports/nrf/common-hal/bleio/Descriptor.c
13561357
msgid "Value length != required fixed length"
13571358
msgstr ""

‎locale/pl.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1111
"PO-Revision-Date: 2019-03-19 18:37-0700\n"
1212
"Last-Translator: Radomir Dopieralski <[email protected]>\n"
1313
"Language-Team: pl\n"
@@ -975,6 +975,10 @@ msgstr ""
975975
msgid "No hardware support on pin"
976976
msgstr "Brak sprzętowej obsługi na nóżce"
977977

978+
#: shared-module/touchio/TouchIn.c
979+
msgid "No pulldown on pin; 1Mohm recommended"
980+
msgstr ""
981+
978982
#: py/moduerrno.c
979983
msgid "No space left on device"
980984
msgstr "Brak miejsca"
@@ -1325,9 +1329,6 @@ msgid "Unsupported pull value."
13251329
msgstr "Zła wartość podciągnięcia."
13261330

13271331
#: ports/nrf/common-hal/bleio/Characteristic.c
1328-
msgid "Value length required fixed length"
1329-
msgstr ""
1330-
13311332
#: ports/nrf/common-hal/bleio/Descriptor.c
13321333
msgid "Value length != required fixed length"
13331334
msgstr ""

‎locale/pt_BR.po

Lines changed: 5 additions & 4 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: 2019-08-21 14:18-0400\n"
11+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1212
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -980,6 +980,10 @@ msgstr "Sem suporte de hardware no pino de clock"
980980
msgid "No hardware support on pin"
981981
msgstr "Nenhum suporte de hardware no pino"
982982

983+
#: shared-module/touchio/TouchIn.c
984+
msgid "No pulldown on pin; 1Mohm recommended"
985+
msgstr ""
986+
983987
#: py/moduerrno.c
984988
msgid "No space left on device"
985989
msgstr ""
@@ -1326,9 +1330,6 @@ msgid "Unsupported pull value."
13261330
msgstr ""
13271331

13281332
#: ports/nrf/common-hal/bleio/Characteristic.c
1329-
msgid "Value length required fixed length"
1330-
msgstr ""
1331-
13321333
#: ports/nrf/common-hal/bleio/Descriptor.c
13331334
msgid "Value length != required fixed length"
13341335
msgstr ""

‎locale/zh_Latn_pinyin.po

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: circuitpython-cn\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
1111
"PO-Revision-Date: 2019-04-13 10:10-0700\n"
1212
"Last-Translator: hexthat\n"
1313
"Language-Team: Chinese Hanyu Pinyin\n"
@@ -975,6 +975,10 @@ msgstr ""
975975
msgid "No hardware support on pin"
976976
msgstr "Méiyǒu zài yǐn jiǎo shàng de yìngjiàn zhīchí"
977977

978+
#: shared-module/touchio/TouchIn.c
979+
msgid "No pulldown on pin; 1Mohm recommended"
980+
msgstr ""
981+
978982
#: py/moduerrno.c
979983
msgid "No space left on device"
980984
msgstr "Shèbèi shàng méiyǒu kònggé"
@@ -1332,9 +1336,6 @@ msgid "Unsupported pull value."
13321336
msgstr "Bù zhīchí de lādòng zhí."
13331337

13341338
#: ports/nrf/common-hal/bleio/Characteristic.c
1335-
msgid "Value length required fixed length"
1336-
msgstr ""
1337-
13381339
#: ports/nrf/common-hal/bleio/Descriptor.c
13391340
msgid "Value length != required fixed length"
13401341
msgstr ""

‎ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ LONGINT_IMPL = MPZ
1414

1515
# No I2S on SAMD51G
1616
CIRCUITPY_AUDIOBUSIO = 0
17-
# No touch on SAMD51 yet
18-
CIRCUITPY_TOUCHIO = 0

‎ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JV_PM"
1414
CIRCUITPY_PS2IO = 1
1515
# No I2S on SAMD51G.
1616
CIRCUITPY_AUDIOBUSIO = 0
17-
# No touch on SAMD51 yet.
18-
CIRCUITPY_TOUCHIO = 0

0 commit comments

Comments
 (0)