Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e2b7fe3
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Oct 22, 2020
e2c833a
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Oct 23, 2020
3d5c77c
Merge pull request #35 from adafruit/main
DavePutz Dec 10, 2020
1d37d3f
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 15, 2020
10d735d
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 16, 2020
737828c
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 22, 2020
f814a34
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 22, 2020
9c14593
Merge pull request #36 from adafruit/main
DavePutz Dec 28, 2020
9e559ac
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Jan 1, 2021
43f93b0
release and pre-release FeatherS2 NSync
askpatrickw Jan 1, 2021
220501e
dupe LED entries
askpatrickw Jan 1, 2021
2ce0720
changes based on UM's input
askpatrickw Jan 2, 2021
9d5587f
Translated using Weblate (Indonesian)
oonid Jan 2, 2021
8c8961a
Merge pull request #3 from adafruit/main
bwshockley Jan 3, 2021
9286f26
Added CP Dotstart Lib to Build
bwshockley Jan 3, 2021
d0e5499
Merge pull request #3914 from askpatrickw/feathers2-Nsync
ladyada Jan 3, 2021
d8721e3
Merge branch 'origin/main' into Weblate.
weblate Jan 3, 2021
2a5f3de
Merge pull request #3608 from adafruit/6.0.x
jepler Oct 27, 2020
10f178d
Fixed incorrect pin assignment on header
UnexpectedMaker Jan 3, 2021
46ec95d
Merge pull request #3925 from UnexpectedCircuitPython/main
ladyada Jan 4, 2021
dfcdad3
Merge branch 'origin/main' into Weblate.
weblate Jan 4, 2021
dcf88e1
Merge pull request #3923 from bwshockley/Add_dotstar_mini_sam_m4
ladyada Jan 4, 2021
4a9f33a
Merge branch 'origin/main' into Weblate.
weblate Jan 4, 2021
09bf584
ulab: update to 1.6.0
jepler Jan 4, 2021
f87ce01
make translate
jepler Jan 4, 2021
f6f1ef7
Merge pull request #3929 from jepler/update-ulab3
dhalbert Jan 4, 2021
d2c71fd
Merge branch 'origin/main' into Weblate.
weblate Jan 4, 2021
4135ccb
Update translation files
weblate Jan 4, 2021
bbd4de3
Add adafruit_bus_device to CPX builds.
kattni Jan 4, 2021
76e9f49
Merge pull request #37 from adafruit/main
DavePutz Jan 4, 2021
ce55822
Fix size of memset in board_reset_user_neopixels()
DavePutz Jan 4, 2021
69de4f9
Merge pull request #3932 from kattni/circuit-playground-bus-device
dhalbert Jan 5, 2021
0057e1d
Translated using Weblate (Portuguese (Brazil))
wtuemura Jan 5, 2021
7943272
Translated using Weblate (Swedish)
bergdahl Jan 4, 2021
03a6db3
Merge branch 'origin/main' into Weblate.
weblate Jan 5, 2021
9eb2ca0
Update translation files
weblate Jan 5, 2021
590fe8e
Merge pull request #3934 from DavePutz/issue_3807
dhalbert Jan 5, 2021
8c25f54
Merge branch 'origin/main' into Weblate.
weblate Jan 5, 2021
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
2 changes: 1 addition & 1 deletion extmod/ulab
Submodule ulab updated 101 files
32 changes: 18 additions & 14 deletions locale/circuitpython.pot
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-12-22 22:54+0530\n"
"POT-Creation-Date: 2021-01-04 12:55-0600\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 @@ -1863,10 +1863,6 @@ msgstr ""
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
msgid "TouchAlarm not available in light sleep"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down Expand Up @@ -2502,6 +2498,10 @@ msgstr ""
msgid "data must be of equal length"
msgstr ""

#: extmod/ulab/code/ndarray.c
msgid "data type not understood"
msgstr ""

#: py/parsenum.c
msgid "decimal numbers not supported"
msgstr ""
Expand Down Expand Up @@ -2812,7 +2812,7 @@ msgid "input and output shapes are not compatible"
msgstr ""

#: extmod/ulab/code/ulab_create.c
msgid "input argument must be an integer or a 2-tuple"
msgid "input argument must be an integer, a tuple, or a list"
msgstr ""

#: extmod/ulab/code/fft/fft.c
Expand Down Expand Up @@ -3055,6 +3055,10 @@ msgstr ""
msgid "maxiter should be > 0"
msgstr ""

#: extmod/ulab/code/numerical/numerical.c
msgid "median argument must be an ndarray"
msgstr ""

#: py/runtime.c
#, c-format
msgid "memory allocation failed, allocating %u bytes"
Expand Down Expand Up @@ -3284,10 +3288,6 @@ msgstr ""
msgid "operation is implemented for 1D Boolean arrays only"
msgstr ""

#: extmod/ulab/code/numerical/numerical.c
msgid "operation is not implemented for flattened array"
msgstr ""

#: extmod/ulab/code/numerical/numerical.c
msgid "operation is not implemented on ndarrays"
msgstr ""
Expand Down Expand Up @@ -3631,6 +3631,10 @@ msgstr ""
msgid "too many arguments provided with the given format"
msgstr ""

#: extmod/ulab/code/ulab_create.c
msgid "too many dimensions"
msgstr ""

#: extmod/ulab/code/ndarray.c
msgid "too many indices"
msgstr ""
Expand All @@ -3640,6 +3644,10 @@ msgstr ""
msgid "too many values to unpack (expected %d)"
msgstr ""

#: extmod/ulab/code/approx/approx.c
msgid "trapz is defined for 1D arrays"
msgstr ""

#: extmod/ulab/code/approx/approx.c
msgid "trapz is defined for 1D arrays of equal length"
msgstr ""
Expand All @@ -3648,10 +3656,6 @@ msgstr ""
msgid "trigger level must be 0 or 1"
msgstr ""

#: extmod/ulab/code/linalg/linalg.c
msgid "tuple index out of range"
msgstr ""

#: py/obj.c
msgid "tuple/list has wrong length"
msgstr ""
Expand Down
3 changes: 3 additions & 0 deletions ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ LONGINT_IMPL = MPZ
CIRCUITPY_AUDIOBUSIO = 0

CIRCUITPY_BITBANG_APA102 = 1

#Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#define MICROPY_HW_MCU_NAME "ESP32S2"

#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)

#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")

#define AUTORESET_DELAY_MS 500
Expand Down
22 changes: 10 additions & 12 deletions ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },

{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO14) },
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO14) },

{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
Expand Down Expand Up @@ -82,18 +82,16 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO11) },

{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, // Blue LED

{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // APA102
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) }, // APA102

{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) }, // Second LDO Enable control
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, // Second LDO Enable control

{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },

{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor

{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,13 @@

// #define MICROPY_HW_APA102_MOSI (&pin_GPIO40)
// #define MICROPY_HW_APA102_SCK (&pin_GPIO45)

#define DEFAULT_I2C_BUS_SCL (&pin_GPIO38)
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)

#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)

#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
24 changes: 11 additions & 13 deletions ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },

{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO14) },
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO14) },

{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
Expand All @@ -26,7 +25,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
{ MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },

{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
{ MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },

Expand Down Expand Up @@ -83,17 +82,16 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO11) },

{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, // Blue LED

{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // APA102
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) }, // APA102

{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) }, // Second LDO Enable control
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, // Second LDO Enable control

{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor

{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
Expand Down