Skip to content

Countio #2827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
May 13, 2020
Merged

Countio #2827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bfa5cd9
refactor countio based on feedback
May 5, 2020
b431023
Merge remote-tracking branch 'adafruit/master' into Optical-Encoder-M…
May 5, 2020
0ecc515
added missing translation
May 5, 2020
d5c24b9
hallowing m0 - exclude countio
May 5, 2020
f63ee9f
excluded countio from other smaller boards
May 5, 2020
7f1be81
changed build variables as per advice
May 5, 2020
8961dd9
changed build variables as per advice
May 5, 2020
84c806a
updated descriptions and build variable
May 7, 2020
94ca233
Update py/circuitpy_mpconfig.mk
LearnWeaver May 7, 2020
e947e4e
removed duplicate build param
May 9, 2020
ee2cb70
merged master
May 12, 2020
22bf99c
Fixed underline in documentation
May 12, 2020
5e5461e
removed countio from catwan_usbstick build
May 12, 2020
c00f81c
changed branch on protomatter
May 12, 2020
62bdfb7
removed lib from catwan_usbstick - updated transalations overflowed
May 12, 2020
bc40034
Merge branch 'master' into Optical-Encoder-Module
tannewt May 12, 2020
277e8d5
Merge branch 'master' into Optical-Encoder-Module
tannewt May 13, 2020
80129c5
Disable countio on trinket haxpress
tannewt May 13, 2020
4612270
Only enable COUNTIO in full builds
tannewt May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added missing translation
  • Loading branch information
Daniel Pollard committed May 5, 2020
commit 0ecc5155441e79e9b82cff8e2ff8eff6ff74c91e
2 changes: 1 addition & 1 deletion locale/circuitpython.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-05 14:57+1000\n"
"POT-Creation-Date: 2020-05-05 15:46+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
7 changes: 6 additions & 1 deletion locale/sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-05 15:46+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -244,6 +244,7 @@ msgstr ""
msgid "3-arg pow() not supported"
msgstr ""

#: ports/atmel-samd/common-hal/countio/Counter.c
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
msgid "A hardware interrupt channel is already in use"
msgstr ""
Expand Down Expand Up @@ -1197,6 +1198,10 @@ msgstr ""
msgid "Pin does not have ADC capabilities"
msgstr ""

#: ports/atmel-samd/common-hal/countio/Counter.c
msgid "Pin must support hardware interrupts"
msgstr ""

#: ports/stm/common-hal/pulseio/PulseIn.c
msgid "Pin number already reserved by EXTI"
msgstr ""
Expand Down