Skip to content

Commit 1ca9057

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into lower_power
2 parents 3799c34 + 10c5bf6 commit 1ca9057

File tree

16 files changed

+10548
-5
lines changed

16 files changed

+10548
-5
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ jobs:
206206
- "nucleo_h743zi_2"
207207
- "ohs2020_badge"
208208
- "openbook_m4"
209+
- "openmv_h7"
209210
- "particle_argon"
210211
- "particle_boron"
211212
- "particle_xenon"
@@ -229,6 +230,7 @@ jobs:
229230
- "seeeduino_xiao"
230231
- "serpente"
231232
- "shirtty"
233+
- "simmel"
232234
- "snekboard"
233235
- "sparkfun_lumidrive"
234236
- "sparkfun_nrf52840_mini"

‎ports/nrf/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ INC += -I../../supervisor/shared/usb
8888
ifeq ($(DEBUG), 1)
8989
CFLAGS += -ggdb3 -Og
9090
else
91-
CFLAGS += -Os -DNDEBUG
91+
CFLAGS += -Os -DNDEBUG -ggdb3
9292
CFLAGS += -flto -flto-partition=none
9393
endif
9494

‎ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex

Lines changed: 9742 additions & 0 deletions
Large diffs are not rendered by default.

‎ports/nrf/boards/simmel/board.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2018 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+
29+
void board_init(void) {
30+
}
31+
32+
bool board_requests_safe_mode(void) {
33+
return false;
34+
}
35+
36+
void reset_board(void) {
37+
38+
}

‎ports/nrf/boards/simmel/mpconfigboard.h

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2016 Glenn Ruben Bakke
7+
* Copyright (c) 2018 Dan Halbert for Adafruit Industries
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
#include "nrfx/hal/nrf_gpio.h"
29+
30+
#define MICROPY_HW_BOARD_NAME "Simmel"
31+
#define MICROPY_HW_MCU_NAME "nRF52833"
32+
33+
#define MICROPY_HW_LED_STATUS (&pin_P0_06)
34+
35+
#if SPI_FLASH_FILESYSTEM
36+
#define SPI_FLASH_MOSI_PIN &pin_P0_09
37+
#define SPI_FLASH_MISO_PIN &pin_P1_04
38+
#define SPI_FLASH_SCK_PIN &pin_P0_10
39+
#define SPI_FLASH_CS_PIN &pin_P1_06
40+
#endif
41+
42+
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
43+
#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (84*1024)
44+
45+
#define BOOTLOADER_SIZE (0x4000) // 12 kiB
46+
#define CIRCUITPY_BLE_CONFIG_SIZE (12*1024)
47+
48+
// Reduce nRF SoftRadio memory usage
49+
#define BLEIO_VS_UUID_COUNT 10
50+
#define BLEIO_HVN_TX_QUEUE_SIZE 2
51+
#define BLEIO_CENTRAL_ROLE_COUNT 2
52+
#define BLEIO_PERIPH_ROLE_COUNT 2
53+
#define BLEIO_TOTAL_CONNECTION_COUNT 2
54+
#define BLEIO_ATTR_TAB_SIZE (BLE_GATTS_ATTR_TAB_SIZE_DEFAULT * 2)

‎ports/nrf/boards/simmel/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 = 0xc051
3+
USB_PRODUCT = "Simmel"
4+
USB_MANUFACTURER = "Betrusted"
5+
6+
MCU_CHIP = nrf52833
7+
8+
# SPI_FLASH_FILESYSTEM = 1
9+
# EXTERNAL_FLASH_DEVICE_COUNT = 1
10+
# EXTERNAL_FLASH_DEVICES = "MX25R1635F"
11+
12+
INTERNAL_FLASH_FILESYSTEM = 1
13+
14+
CIRCUITPY_AUDIOMP3 = 0
15+
CIRCUITPY_BUSIO = 1
16+
CIRCUITPY_DISPLAYIO = 0
17+
CIRCUITPY_FRAMEBUFFERIO = 0
18+
CIRCUITPY_NEOPIXEL_WRITE = 0
19+
CIRCUITPY_NVM = 0
20+
CIRCUITPY_PIXELBUF = 0
21+
CIRCUITPY_RGBMATRIX = 0
22+
CIRCUITPY_ROTARYIO = 0
23+
CIRCUITPY_RTC = 1
24+
CIRCUITPY_TOUCHIO = 0
25+
CIRCUITPY_ULAB = 0
26+
CIRCUITPY_USB_HID = 0
27+
28+
# Enable micropython.native
29+
#CIRCUITPY_ENABLE_MPY_NATIVE = 1
30+
31+
# These defines must be overridden before mpconfigboard.h is included, which is
32+
# why they are passed on the command line.
33+
CFLAGS += -DSPIM3_BUFFER_SIZE=0 -DSOFTDEVICE_RAM_SIZE='(32*1024)'

‎ports/nrf/boards/simmel/pins.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_SPI_CSN), MP_ROM_PTR(&pin_P0_06) },
5+
{ MP_ROM_QSTR(MP_QSTR_SPI_MISO), MP_ROM_PTR(&pin_P1_04) },
6+
{ MP_ROM_QSTR(MP_QSTR_SPI_MOSI), MP_ROM_PTR(&pin_P0_09) },
7+
{ MP_ROM_QSTR(MP_QSTR_SPI_SCK), MP_ROM_PTR(&pin_P0_10) },
8+
9+
{ MP_ROM_QSTR(MP_QSTR_NFC1), MP_ROM_PTR(&pin_P0_09) },
10+
{ MP_ROM_QSTR(MP_QSTR_NFC2), MP_ROM_PTR(&pin_P0_10) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_I2S_LRCK), MP_ROM_PTR(&pin_P0_08) },
13+
{ MP_ROM_QSTR(MP_QSTR_I2S_SDIN), MP_ROM_PTR(&pin_P1_09) },
14+
{ MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_P0_12) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_P0_06) },
17+
{ MP_ROM_QSTR(MP_QSTR_CHG), MP_ROM_PTR(&pin_P0_04) },
18+
19+
{ MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&pin_P0_02) },
20+
{ MP_ROM_QSTR(MP_QSTR_PWM_N), MP_ROM_PTR(&pin_P0_19) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
23+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
24+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
25+
};
26+
27+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/nrf/boards/teknikio_bluebird/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define MICROPY_HW_BOARD_NAME "Teknikio Bluebird"
3434
#define MICROPY_HW_MCU_NAME "nRF52840"
3535

36-
#define MICROPY_HW_NEOPIXEL (&pin_P0_26)
36+
#define MICROPY_HW_NEOPIXEL (&pin_P1_15)
3737

3838
#define DEFAULT_I2C_BUS_SCL (&pin_P0_27)
3939
#define DEFAULT_I2C_BUS_SDA (&pin_P0_26)

‎ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ USB_MANUFACTURER = "Teknikio"
66
MCU_CHIP = nrf52840
77

88
INTERNAL_FLASH_FILESYSTEM = 1
9+
CIRCUITPY_ANALOGIO = 1
10+
CIRCUITPY_AUDIOCORE = 1
11+
CIRCUITPY_AUDIOPWMIO = 1
12+
CIRCUITPY_DIGITALIO = 1
13+
CIRCUITPY_NEOPIXEL_WRITE = 1
14+
CIRCUITPY_TIME = 1

‎ports/nrf/boards/teknikio_bluebird/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4747
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_03) },
4848
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P0_03) },
4949

50-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_26) },
50+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P1_15) },
5151

5252
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_P0_28) },
5353
{ MP_ROM_QSTR(MP_QSTR_LIGHT_ENABLE), MP_ROM_PTR(&pin_P0_30) },
5454

55-
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P1_15) },
55+
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P1_14) },
5656

5757
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P1_10) },
5858
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA), MP_ROM_PTR(&pin_P1_12) },
5959
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL), MP_ROM_PTR(&pin_P1_11) },
6060
};
6161

62-
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
62+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)