Skip to content

Commit

Permalink
Merge branch 'main' into cardputer_keyboard
Browse files Browse the repository at this point in the history
  • Loading branch information
CDarius committed Mar 12, 2024
2 parents c5c78d3 + 6a07412 commit b0f67be
Show file tree
Hide file tree
Showing 11 changed files with 226 additions and 35 deletions.
2 changes: 1 addition & 1 deletion lib/tlsf
Submodule tlsf updated 1 files
+8 −3 tlsf.c
9 changes: 5 additions & 4 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2286,6 +2286,11 @@ msgstr ""
msgid "You pressed the BOOT button at start up"
msgstr ""

#: ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/mpconfigboard.h
#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
msgid "You pressed the BOOT button at start up."
msgstr ""

#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
msgid "You pressed the GPIO0 button at start up."
msgstr ""
Expand All @@ -2302,10 +2307,6 @@ msgstr ""
msgid "You pressed the VOLUME button at start up."
msgstr ""

#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
msgid "You pressed the boot button at start up."
msgstr ""

#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
Expand Down
58 changes: 33 additions & 25 deletions locale/de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
"PO-Revision-Date: 2024-01-07 16:06+0000\n"
"Last-Translator: Luc <some_physics@live.com>\n"
"PO-Revision-Date: 2024-03-11 09:56+0000\n"
"Last-Translator: Sokromatrix <kroschewski1971@gmail.com>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.4-dev\n"
"X-Generator: Weblate 5.5-dev\n"

#: main.c
msgid ""
Expand All @@ -37,6 +37,9 @@ msgid ""
"Please file an issue with your program at github.com/adafruit/circuitpython/"
"issues."
msgstr ""
"\n"
"Reiche bitte ein Problem mit deinem Programm bei github.com/adafruit/"
"circuitpython/issues ein."

#: supervisor/shared/safe_mode.c
msgid ""
Expand Down Expand Up @@ -97,11 +100,12 @@ msgstr "%q und %q müssen unterschiedlich sein"

#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
msgid "%q and %q must share a clock unit"
msgstr ""
msgstr "%q und %q müssen eine Uhreneinheit teilen"

#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
msgid "%q cannot be changed once mode is set to %q"
msgstr ""
"%q und %q können nicht geändert werden, sobald der Modus auf %q gesetzt ist"

#: shared-bindings/microcontroller/Pin.c
msgid "%q contains duplicate pins"
Expand Down Expand Up @@ -438,7 +442,7 @@ msgstr "'yield' außerhalb einer Funktion"

#: py/compile.c
msgid "* arg after **"
msgstr ""
msgstr "* arg nach **"

#: py/compile.c
msgid "*x must be assignment target"
Expand Down Expand Up @@ -866,7 +870,7 @@ msgstr "Dem fmt Block muss ein Datenblock folgen"

#: shared-module/jpegio/JpegDecoder.c
msgid "Data format error (may be broken data)"
msgstr ""
msgstr "Datenformatfehler (Möglicherweise beschädigte Daten)"

#: ports/espressif/common-hal/_bleio/Adapter.c
#: ports/nrf/common-hal/_bleio/Adapter.c
Expand Down Expand Up @@ -1149,7 +1153,7 @@ msgstr "Unzureichende Verschlüsselung"

#: shared-module/jpegio/JpegDecoder.c
msgid "Insufficient memory pool for the image"
msgstr ""
msgstr "Unzureichender Speicherpool für das Bild"

#: shared-module/jpegio/JpegDecoder.c
msgid "Insufficient stream input buffer"
Expand Down Expand Up @@ -1184,7 +1188,7 @@ msgstr "Interner Fehler #%d"
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
#: ports/cxd56/common-hal/pulseio/PulseIn.c shared-bindings/pwmio/PWMOut.c
msgid "Internal resource(s) in use"
msgstr ""
msgstr "Interne Ressource(n) in Benutzung"

#: supervisor/shared/safe_mode.c
msgid "Internal watchdog timer expired."
Expand All @@ -1196,7 +1200,7 @@ msgstr "Interrupt Fehler."

#: shared-module/jpegio/JpegDecoder.c
msgid "Interrupted by output function"
msgstr ""
msgstr "Unterbrochen durch Ausgabefunktion"

#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
Expand Down Expand Up @@ -1442,7 +1446,7 @@ msgstr "Keine IP"
#: ports/cxd56/common-hal/microcontroller/__init__.c
#: ports/mimxrt10xx/common-hal/microcontroller/__init__.c
msgid "No bootloader present"
msgstr ""
msgstr "Kein Bootloader vorhanden"

#: shared-module/usb/core/Device.c
msgid "No configuration set"
Expand Down Expand Up @@ -1538,7 +1542,7 @@ msgstr "Spielt nicht ab"

#: shared-module/jpegio/JpegDecoder.c
msgid "Not supported JPEG standard"
msgstr ""
msgstr "Nicht unterstützter JPEG-Standard"

#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
#, c-format
Expand Down Expand Up @@ -1680,7 +1684,7 @@ msgstr "PWM-Stück-Kanal A wird bereits verwendet"

#: shared-module/jpegio/JpegDecoder.c
msgid "Parameter error"
msgstr ""
msgstr "Parameter-Fehler"

#: ports/espressif/common-hal/audiobusio/__init__.c
msgid "Peripheral in use"
Expand Down Expand Up @@ -1749,6 +1753,8 @@ msgstr "Polygone brauchen mindestens 3 Punkte"
#: supervisor/shared/safe_mode.c
msgid "Power dipped. Make sure you are providing enough power."
msgstr ""
"Die Stromversorgung ist abgesackt. Stelle sicher, dass du genug Strom "
"bereitstellst."

#: shared-bindings/_bleio/Adapter.c
msgid "Prefix buffer must be on the heap"
Expand Down Expand Up @@ -1791,7 +1797,7 @@ msgstr "RISE_AND_FALL ist auf diesem Chip nicht verfügbar"

#: shared-module/displayio/OnDiskBitmap.c
msgid "RLE-compressed BMP not supported"
msgstr ""
msgstr "RLE-komprimiertes BMP ist nicht unterstützt"

#: ports/stm/common-hal/os/__init__.c
msgid "RNG DeInit Error"
Expand Down Expand Up @@ -2362,7 +2368,7 @@ msgstr "Der VOLUME-Knopf wurde beim Starten gedrückt."

#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
msgid "You pressed the boot button at start up."
msgstr ""
msgstr "Der Boot-Knopf wurde beim Starten gedrückt."

#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
Expand Down Expand Up @@ -2516,7 +2522,7 @@ msgstr "Der binäre Operator %q ist nicht implementiert"

#: shared-module/bitmapfilter/__init__.c
msgid "bitmap size and depth must match"
msgstr ""
msgstr "Bitmap-Größen und -Tiefe müssen übereinstimmen"

#: shared-bindings/bitmaptools/__init__.c
msgid "bitmap sizes must match"
Expand Down Expand Up @@ -2824,7 +2830,7 @@ msgstr "Vergleich von int und uint"

#: py/objcomplex.c
msgid "complex divide by zero"
msgstr ""
msgstr "komplexe Division durch null"

#: py/objfloat.c py/parsenum.c
msgid "complex values not supported"
Expand Down Expand Up @@ -3235,7 +3241,7 @@ msgstr "Eingabe- und Ausgabedimensionen unterscheiden sich"

#: extmod/ulab/code/numpy/vector.c
msgid "input and output shapes differ"
msgstr ""
msgstr "Eingabe- und Ausgabeformen unterscheiden sich"

#: extmod/ulab/code/numpy/create.c
msgid "input argument must be an integer, a tuple, or a list"
Expand All @@ -3259,7 +3265,7 @@ msgstr "Eingabe dtype muss float oder complex sein"

#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
msgstr "Eingabe ist nicht iterierbar"

#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
Expand Down Expand Up @@ -3503,15 +3509,15 @@ msgstr "Speicherzuweisung fehlgeschlagen, der Heap ist gesperrt"

#: py/objarray.c
msgid "memoryview offset too large"
msgstr ""
msgstr "memoryview-Versatz zu groß"

#: py/objarray.c
msgid "memoryview: length is not a multiple of itemsize"
msgstr "memoryview: length ist kein Vielfaches von itemize"

#: extmod/modtime.c
msgid "mktime needs a tuple of length 8 or 9"
msgstr ""
msgstr "mktime braucht ein Tupel der Länge 8 oder 9"

#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "mode must be complete, or reduced"
Expand Down Expand Up @@ -3571,7 +3577,7 @@ msgstr "natives yield"

#: extmod/ulab/code/ndarray.c
msgid "ndarray length overflows"
msgstr ""
msgstr "ndarray-Länge fließt über"

#: py/runtime.c
#, c-format
Expand Down Expand Up @@ -3827,7 +3833,7 @@ msgstr "Ausgabe-Array ist zu klein"

#: extmod/ulab/code/numpy/vector.c
msgid "out keyword is not supported for complex dtype"
msgstr ""
msgstr "out-Schlüsselwort wird nicht unterstützt für komplexen dtype"

#: extmod/ulab/code/numpy/vector.c
msgid "out keyword is not supported for function"
Expand Down Expand Up @@ -4057,7 +4063,7 @@ msgstr "stream operation ist nicht unterstützt"

#: py/objarray.c py/objstr.c
msgid "string argument without an encoding"
msgstr ""
msgstr "String-Argument ohne Encoding"

#: py/objstrunicode.c
msgid "string index out of range"
Expand Down Expand Up @@ -4264,7 +4270,7 @@ msgstr "nicht unterstützte Xtensa-Anweisung '%s' mit %d Argumenten"

#: shared-module/bitmapfilter/__init__.c
msgid "unsupported bitmap depth"
msgstr ""
msgstr "nicht unterstützte Bitmap-Tiefe"

#: shared-module/gifio/GifWriter.c
msgid "unsupported colorspace for GifWriter"
Expand Down Expand Up @@ -4310,13 +4316,15 @@ msgstr "Wert außerhalb des Zielbereiches"

#: extmod/moddeflate.c
msgid "wbits"
msgstr ""
msgstr "wbits"

#: shared-bindings/bitmapfilter/__init__.c
msgid ""
"weights must be a sequence with an odd square number of elements (usually 9 "
"or 25)"
msgstr ""
"Gewichte müssen eine Sequenz mit einer ungeraden quadratischen Anzahl an "
"Elementen sein (normalerweise 9 oder 25)"

#: shared-bindings/bitmapfilter/__init__.c
msgid "weights must be an object of type %q, %q, %q, or %q, not %q "
Expand Down
4 changes: 2 additions & 2 deletions locale/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
"PO-Revision-Date: 2024-02-22 14:16+0000\n"
"PO-Revision-Date: 2024-03-11 09:56+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: \n"
"Language: pt_BR\n"
Expand Down Expand Up @@ -105,7 +105,7 @@ msgstr "%q e %q devem compartilhar uma unidade de clock"

#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
msgid "%q cannot be changed once mode is set to %q"
msgstr ""
msgstr "%q não pode ser alterado quando o modo é definido como %q"

#: shared-bindings/microcontroller/Pin.c
msgid "%q contains duplicate pins"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2024 Dan Halbert for Adafruit Industries
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
if (pin_number == 20) {
// Turn on I2C power by default.
gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
gpio_set_level(pin_number, true);
return true;
}

return false;
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2024 Dan Halbert for Adafruit Industries
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

// Micropython setup

#define MICROPY_HW_BOARD_NAME "Adafruit Feather ESP32-C6 4MB Flash No PSRAM"
#define MICROPY_HW_MCU_NAME "ESP32C6"

#define MICROPY_HW_NEOPIXEL (&pin_GPIO9)

#define MICROPY_HW_LED_STATUS (&pin_GPIO15)

#define CIRCUITPY_BOARD_I2C (1)
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO18, .sda = &pin_GPIO19}}

#define CIRCUITPY_BOARD_SPI (1)
#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO21, .mosi = &pin_GPIO22, .miso = &pin_GPIO23}}

// TXD0 and RXD0
#define CIRCUITPY_BOARD_UART (1)
#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO16, .rx = &pin_GPIO17}}

// For entering safe mode, use BOOT button
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)

// Explanation of how a user got into safe mode
#define BOARD_USER_SAFE_MODE_ACTION MP_ERROR_TEXT("You pressed the BOOT button at start up.")
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CIRCUITPY_CREATOR_ID = 0x0000239A
CIRCUITPY_CREATION_ID = 0x00C60001

IDF_TARGET = esp32c6

CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Loading

0 comments on commit b0f67be

Please sign in to comment.