djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Hosted Weblate 2021-05-08 15:47:32 +02:00
commit affc9da56c
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/atmel-samd/asf4_conf/samd21/hpl_gclk_config.h
View File

@ -1,4 +1,4 @@
// Circuit Python SAMD21 clock tree: // CircuitPython SAMD21 clock tree:
// DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK0, GCLK1 // DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK0, GCLK1
// GCLK0 (48MHz) -> peripherals // GCLK0 (48MHz) -> peripherals
// GLCK1 (48MHz divided by 150 = 320Khz) -> DAC peripheral (DAC requires 350KHz or lower) // GLCK1 (48MHz divided by 150 = 320Khz) -> DAC peripheral (DAC requires 350KHz or lower)

2
ports/atmel-samd/asf4_conf/samd51/hpl_gclk_config.h
View File

@ -1,4 +1,4 @@
// Circuit Python SAMD51 clock tree: // CircuitPython SAMD51 clock tree:
// DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6 // DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6
// GCLK1 (48MHz) -> 48 MHz peripherals // GCLK1 (48MHz) -> 48 MHz peripherals
// GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0 // GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0

2
ports/atmel-samd/asf4_conf/same51/hpl_gclk_config.h
View File

@ -1,4 +1,4 @@
// Circuit Python SAMD51 clock tree: // CircuitPython SAMD51 clock tree:
// DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6 // DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6
// GCLK1 (48MHz) -> 48 MHz peripherals // GCLK1 (48MHz) -> 48 MHz peripherals
// GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0 // GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0

2
ports/atmel-samd/asf4_conf/same54/hpl_gclk_config.h
View File

@ -1,4 +1,4 @@
// Circuit Python SAMD51 clock tree: // CircuitPython SAMD51 clock tree:
// DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6 // DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6
// GCLK1 (48MHz) -> 48 MHz peripherals // GCLK1 (48MHz) -> 48 MHz peripherals
// GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0 // GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0

2
ports/nrf/boards/common.template.ld
View File

@ -136,7 +136,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >APP_RAM } >APP_RAM
/* Remove exception unwinding information, since Circuit Python /* Remove exception unwinding information, since CircuitPython
does not support this GCC feature. */ does not support this GCC feature. */
/DISCARD/ : /DISCARD/ :
{ {

2
ports/nrf/common-hal/rtc/RTC.c
View File

@ -42,7 +42,7 @@ __attribute__((section(".uninitialized"))) static uint32_t rtc_offset[3];
// the system crashes or reboots, these values will remain undisturbed and the // the system crashes or reboots, these values will remain undisturbed and the
// RTC offset will remain valid. // RTC offset will remain valid.
// //
// If Circuit Python is updated or these symbols shift around, the prefix and // If CircuitPython is updated or these symbols shift around, the prefix and
// suffix will no longer match, and the time will no longer be valid. // suffix will no longer match, and the time will no longer be valid.
#define RTC_OFFSET_CHECK_PREFIX 0x25ea7e2a #define RTC_OFFSET_CHECK_PREFIX 0x25ea7e2a
#define RTC_OFFSET_CHECK_SUFFIX 0x2b80b69e #define RTC_OFFSET_CHECK_SUFFIX 0x2b80b69e

2
ports/nrf/supervisor/port.c
View File

@ -282,7 +282,7 @@ void reset_cpu(void) {
} }
// The uninitialized data section is placed directly after BSS, under the theory // The uninitialized data section is placed directly after BSS, under the theory
// that Circuit Python has a lot more .data and .bss than the bootloader. As a // that CircuitPython has a lot more .data and .bss than the bootloader. As a
// result, this section is less likely to be tampered with by the bootloader. // result, this section is less likely to be tampered with by the bootloader.
extern uint32_t _euninitialized; extern uint32_t _euninitialized;

2
shared-bindings/_pixelbuf/PixelBuf.c
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-bindings/_pixelbuf/PixelBuf.h
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-bindings/_pixelbuf/__init__.c
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-bindings/_pixelbuf/__init__.h
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-bindings/aesio/aes.c
View File

@ -28,7 +28,7 @@
//| from binascii import hexlify //| from binascii import hexlify
//| //|
//| key = b'Sixteen byte key' //| key = b'Sixteen byte key'
//| inp = b'Circuit Python!!' # Note: 16-bytes long //| inp = b'CircuitPython!!!' # Note: 16-bytes long
//| outp = bytearray(len(inp)) //| outp = bytearray(len(inp))
//| cipher = aesio.AES(key, aesio.mode.MODE_ECB) //| cipher = aesio.AES(key, aesio.mode.MODE_ECB)
//| cipher.encrypt_into(inp, outp) //| cipher.encrypt_into(inp, outp)

2
shared-bindings/bitops/__init__.c
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-bindings/bitops/__init__.h
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-module/_pixelbuf/PixelBuf.c
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-module/_pixelbuf/PixelBuf.h
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-module/bitops/__init__.c
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
shared-module/bitops/__init__.h
View File

@ -1,5 +1,5 @@
/* /*
* This file is part of the Circuit Python project, https://github.com/adafruit/circuitpython * This file is part of the CircuitPython project, https://github.com/adafruit/circuitpython
* *
* The MIT License (MIT) * The MIT License (MIT)
* *

2
tools/cpboard.py
View File

@ -630,7 +630,7 @@ def print_error_exit(args, e):
def main(): def main():
import argparse import argparse
cmd_parser = argparse.ArgumentParser(description="Circuit Python Board Tool") cmd_parser = argparse.ArgumentParser(description="CircuitPython Board Tool")
cmd_parser.add_argument("board", help="build_name, vid:pid or /dev/tty") cmd_parser.add_argument("board", help="build_name, vid:pid or /dev/tty")
cmd_parser.add_argument("-f", "--firmware", help="upload UF2 firmware file") cmd_parser.add_argument("-f", "--firmware", help="upload UF2 firmware file")
cmd_parser.add_argument("-c", "--command", help="program passed in as string") cmd_parser.add_argument("-c", "--command", help="program passed in as string")