Skip to content

Commit c9bc877

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into esp-spi-pinclaim
2 parents 59458a9 + e778fc1 commit c9bc877

File tree

22 files changed

+818
-8
lines changed

22 files changed

+818
-8
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ jobs:
199199
- "clue_nrf52840_express"
200200
- "cp32-m4"
201201
- "cp_sapling_m0"
202+
- "cp_sapling_m0_spiflash"
202203
- "datalore_ip_m4"
203204
- "datum_distance"
204205
- "datum_imu"

‎lib/tinyusb

Submodule tinyusb updated 226 files

‎locale/circuitpython.pot

Lines changed: 5 additions & 1 deletion
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: 2020-11-23 10:10-0600\n"
11+
"POT-Creation-Date: 2020-11-11 16:30+0530\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"
@@ -1262,6 +1262,10 @@ msgstr ""
12621262
msgid "Must use a multiple of 6 rgb pins, not %d"
12631263
msgstr ""
12641264

1265+
#: ports/esp32s2/common-hal/nvm/ByteArray.c
1266+
msgid "NVS Error"
1267+
msgstr ""
1268+
12651269
#: py/parse.c
12661270
msgid "Name too long"
12671271
msgstr ""

‎ports/atmel-samd/boards/cp_sapling_m0_spiflash/board.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "boards/board.h"
28+
#include "common-hal/microcontroller/Pin.h"
29+
#include "supervisor/shared/board.h"
30+
#include "hal/include/hal_gpio.h"
31+
32+
void board_init(void) {
33+
}
34+
35+
bool board_requests_safe_mode(void) {
36+
return false;
37+
}
38+
39+
void reset_board(void) {
40+
}

‎ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.h

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#define MICROPY_HW_BOARD_NAME "CP Sapling M0 w/ SPI Flash"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_NEOPIXEL (&pin_PA15)
5+
6+
#define MICROPY_PORT_A (0)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define SPI_FLASH_MOSI_PIN &pin_PA18
11+
#define SPI_FLASH_MISO_PIN &pin_PA17
12+
#define SPI_FLASH_SCK_PIN &pin_PA19
13+
#define SPI_FLASH_CS_PIN &pin_PA22
14+
15+
#define IGNORE_PIN_PA02 1
16+
#define IGNORE_PIN_PA03 1
17+
#define IGNORE_PIN_PA04 1
18+
#define IGNORE_PIN_PA05 1
19+
#define IGNORE_PIN_PA06 1
20+
#define IGNORE_PIN_PA07 1
21+
#define IGNORE_PIN_PA12 1
22+
#define IGNORE_PIN_PA13 1
23+
#define IGNORE_PIN_PA14 1
24+
#define IGNORE_PIN_PA20 1
25+
#define IGNORE_PIN_PA21 1
26+
// USB is always used internally so skip the pin objects for it.
27+
#define IGNORE_PIN_PA24 1
28+
#define IGNORE_PIN_PA25 1
29+
#define IGNORE_PIN_PA27 1
30+
#define IGNORE_PIN_PA28 1
31+
#define IGNORE_PIN_PA30 1
32+
#define IGNORE_PIN_PA31 1
33+
#define IGNORE_PIN_PB01 1
34+
#define IGNORE_PIN_PB02 1
35+
#define IGNORE_PIN_PB03 1
36+
#define IGNORE_PIN_PB04 1
37+
#define IGNORE_PIN_PB05 1
38+
#define IGNORE_PIN_PB06 1
39+
#define IGNORE_PIN_PB07 1
40+
#define IGNORE_PIN_PB08 1
41+
#define IGNORE_PIN_PB09 1
42+
#define IGNORE_PIN_PB10 1
43+
#define IGNORE_PIN_PB11 1
44+
#define IGNORE_PIN_PB12 1
45+
#define IGNORE_PIN_PB13 1
46+
#define IGNORE_PIN_PB14 1
47+
#define IGNORE_PIN_PB15 1
48+
#define IGNORE_PIN_PB16 1
49+
#define IGNORE_PIN_PB17 1
50+
#define IGNORE_PIN_PB22 1
51+
#define IGNORE_PIN_PB23 1
52+
#define IGNORE_PIN_PB30 1
53+
#define IGNORE_PIN_PB31 1
54+
#define IGNORE_PIN_PB00 1
55+
56+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
57+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
58+
59+
#define DEFAULT_SPI_BUS_SS (&pin_PA22)
60+
#define DEFAULT_SPI_BUS_SCK (&pin_PA19)
61+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA18)
62+
#define DEFAULT_SPI_BUS_MISO (&pin_PA17)

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
USB_VID = 0x1209
2+
USB_PID = 0x4DDE
3+
USB_PRODUCT = "CP Sapling M0 w/ SPI Flash"
4+
USB_MANUFACTURER = "Oak Development Technologies"
5+
6+
CHIP_VARIANT = SAMD21E18A
7+
CHIP_FAMILY = samd21
8+
9+
INTERNAL_FLASH_FILESYSTEM = 0
10+
LONGINT_IMPL = MPZ
11+
SPI_FLASH_FILESYSTEM = 1
12+
EXTERNAL_FLASH_DEVICE_COUNT = 1
13+
EXTERNAL_FLASH_DEVICES = AT25DF081A
14+
15+
CIRCUITPY_AUDIOIO = 0
16+
CIRCUITPY_AUDIOBUSIO = 0
17+
CIRCUITPY_BITBANGIO = 0
18+
CIRCUITPY_COUNTIO = 0
19+
CIRCUITPY_FREQUENCYIO = 0
20+
CIRCUITPY_I2CPERIPHERAL = 0
21+
22+
SUPEROPT_GC = 0
23+
24+
CFLAGS_BOARD = --param max-inline-insns-auto=15
25+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
26+
RELEASE_NEEDS_CLEAN_BUILD = 1
27+
CFLAGS_INLINE_LIMIT = 35
28+
endif
29+
ifeq ($(TRANSLATION), de_DE)
30+
RELEASE_NEEDS_CLEAN_BUILD = 1
31+
CFLAGS_INLINE_LIMIT = 35
32+
SUPEROPT_VM = 0
33+
endif

‎ports/atmel-samd/boards/cp_sapling_m0_spiflash/pins.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
5+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA08) },
6+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
7+
8+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA00) },
9+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA00) },
10+
11+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA01) },
12+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA01) },
13+
14+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA09) },
15+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
16+
17+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA22) },
18+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA22) },
19+
{ MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_PA22) },
20+
21+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA19) },
22+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA19) },
23+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA19) },
24+
25+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA17) },
26+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA17) },
27+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA17) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA18) },
30+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA18) },
31+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA18) },
32+
33+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
36+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
37+
};
38+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/mpconfigport.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ ifndef CIRCUITPY_AUDIOMP3
2929
CIRCUITPY_AUDIOMP3 = 0
3030
endif
3131

32+
ifndef CIRCUITPY_BUILTINS_POW3
33+
CIRCUITPY_BUILTINS_POW3 = 0
34+
endif
35+
3236
ifndef CIRCUITPY_FREQUENCYIO
3337
CIRCUITPY_FREQUENCYIO = 0
3438
endif

‎ports/esp32s2/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ INC += -isystem esp-idf/components/soc/soc/include
104104
INC += -isystem esp-idf/components/soc/soc/esp32s2/include
105105
INC += -isystem esp-idf/components/heap/include
106106
INC += -isystem esp-idf/components/esp_system/include
107+
INC += -isystem esp-idf/components/spi_flash/include
108+
INC += -isystem esp-idf/components/nvs_flash/include
107109
INC += -I$(BUILD)/esp-idf/config
108110

109111
CFLAGS += -DHAVE_CONFIG_H \

‎ports/esp32s2/common-hal/microcontroller/__init__.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "shared-bindings/microcontroller/__init__.h"
3636
#include "shared-bindings/microcontroller/Pin.h"
3737
#include "shared-bindings/microcontroller/Processor.h"
38+
#include "shared-bindings/nvm/ByteArray.h"
3839

3940
#include "supervisor/filesystem.h"
4041
#include "supervisor/shared/safe_mode.h"
@@ -85,6 +86,17 @@ const mcu_processor_obj_t common_hal_mcu_processor_obj = {
8586
},
8687
};
8788

89+
#if CIRCUITPY_INTERNAL_NVM_SIZE > 0
90+
// The singleton nvm.ByteArray object.
91+
const nvm_bytearray_obj_t common_hal_mcu_nvm_obj = {
92+
.base = {
93+
.type = &nvm_bytearray_type,
94+
},
95+
.start_address = (uint8_t*) CIRCUITPY_INTERNAL_NVM_START_ADDR,
96+
.len = CIRCUITPY_INTERNAL_NVM_SIZE,
97+
};
98+
#endif
99+
88100
#if CIRCUITPY_WATCHDOG
89101
// The singleton watchdog.WatchDogTimer object.
90102
watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = {

0 commit comments

Comments
 (0)