Skip to content

Commit 51c7bb7

Browse files
ladyadaladyada
authored
Merge pull request #2241 from sparkfun/master
Adds builds for sparkfun_qwiic_micro with and without flash
2 parents af1fab1 + 673d2fb commit 51c7bb7

File tree

9 files changed

+276
-0
lines changed

9 files changed

+276
-0
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ jobs:
142142
- "snekboard"
143143
- "sparkfun_lumidrive"
144144
- "sparkfun_nrf52840_mini"
145+
- "sparkfun_qwiic_micro_no_flash"
146+
- "sparkfun_qwiic_micro_with_flash"
145147
- "sparkfun_redboard_turbo"
146148
- "sparkfun_samd21_dev"
147149
- "sparkfun_samd21_mini"

‎ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/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) 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+
29+
void board_init(void)
30+
{
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#define MICROPY_HW_BOARD_NAME "SparkFun Qwiic Micro"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_PORT_A ( 0 )
5+
#define MICROPY_PORT_B ( 0 )
6+
#define MICROPY_PORT_C ( 0 )
7+
8+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
9+
10+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
11+
12+
#define CALIBRATE_CRYSTALLESS 1
13+
#define BOARD_HAS_CRYSTAL 0
14+
15+
//I2C and Qwiic Connector
16+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
17+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
18+
19+
//SPI
20+
#define DEFAULT_SPI_BUS_SCK (&pin_PA07)
21+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA06)
22+
#define DEFAULT_SPI_BUS_MISO (&pin_PA05)
23+
24+
//UART
25+
#define DEFAULT_UART_BUS_RX (&pin_PA23)
26+
#define DEFAULT_UART_BUS_TX (&pin_PA22)
27+
28+
// USB is always used internally so skip the pin objects for it.
29+
#define IGNORE_PIN_PA24 1
30+
#define IGNORE_PIN_PA25 1
31+
32+
// Unused
33+
#define IGNORE_PIN_PA03 1
34+
#define IGNORE_PIN_PA11 1
35+
#define IGNORE_PIN_PA14 1
36+
#define IGNORE_PIN_PA15 1
37+
#define IGNORE_PIN_PA27 1
38+
#define IGNORE_PIN_PA28 1

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
2+
USB_VID = 0x1B4F
3+
USB_PID = 0x8D24
4+
USB_PRODUCT = "SparkFun Qwiic Micro"
5+
USB_MANUFACTURER = "SparkFun Electronics"
6+
7+
CHIP_VARIANT = SAMD21E18A
8+
CHIP_FAMILY = samd21
9+
10+
INTERNAL_FLASH_FILESYSTEM = 1
11+
LONGINT_IMPL = NONE
12+
13+
CIRCUITPY_SMALL_BUILD = 1
14+
SUPEROPT_GC = 0

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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_A0), MP_ROM_PTR(&pin_PA02) },
6+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA06) },
7+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA07) },
9+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA10) },
10+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA04) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) },
13+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02) },
14+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA06) },
15+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA05) },
16+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA07) },
17+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA00) },
18+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA01) },
19+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA04) },
20+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA09) },
21+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA10) },
22+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PA22) },
23+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_PA23) },
24+
25+
// External SPI
26+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA07) },
27+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA06) },
28+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA05) },
29+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
30+
31+
// UART
32+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA22) },
33+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA23) },
34+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
35+
36+
// I2C and Qwiic Connector
37+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
38+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
39+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }
40+
41+
};
42+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/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) 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+
29+
void board_init(void)
30+
{
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#define MICROPY_HW_BOARD_NAME "SparkFun Qwiic Micro"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
5+
#define SPI_FLASH_BAUDRATE (8000000)
6+
7+
#define SPI_FLASH_MOSI_PIN &pin_PA16
8+
#define SPI_FLASH_MISO_PIN &pin_PA18
9+
#define SPI_FLASH_SCK_PIN &pin_PA17
10+
#define SPI_FLASH_CS_PIN &pin_PA19
11+
12+
#define MICROPY_PORT_A ( 0 )
13+
#define MICROPY_PORT_B ( 0 )
14+
#define MICROPY_PORT_C ( 0 )
15+
16+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
17+
18+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
19+
20+
#define CALIBRATE_CRYSTALLESS 1
21+
#define BOARD_HAS_CRYSTAL 0
22+
23+
//I2C and Qwiic Connector
24+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
25+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
26+
27+
//SPI
28+
#define DEFAULT_SPI_BUS_SCK (&pin_PA07)
29+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA06)
30+
#define DEFAULT_SPI_BUS_MISO (&pin_PA05)
31+
32+
//UART
33+
#define DEFAULT_UART_BUS_RX (&pin_PA23)
34+
#define DEFAULT_UART_BUS_TX (&pin_PA22)
35+
36+
// USB is always used internally so skip the pin objects for it.
37+
#define IGNORE_PIN_PA24 1
38+
#define IGNORE_PIN_PA25 1
39+
40+
// Unused
41+
#define IGNORE_PIN_PA03 1
42+
#define IGNORE_PIN_PA11 1
43+
#define IGNORE_PIN_PA14 1
44+
#define IGNORE_PIN_PA15 1
45+
#define IGNORE_PIN_PA27 1
46+
#define IGNORE_PIN_PA28 1

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
2+
USB_VID = 0x1B4F
3+
USB_PID = 0x8D24
4+
USB_PRODUCT = "SparkFun Qwiic Micro"
5+
USB_MANUFACTURER = "SparkFun Electronics"
6+
7+
CHIP_VARIANT = SAMD21E18A
8+
CHIP_FAMILY = samd21
9+
10+
SPI_FLASH_FILESYSTEM = 1
11+
EXTERNAL_FLASH_DEVICE_COUNT = 1
12+
EXTERNAL_FLASH_DEVICES = "W25Q32FV"
13+
LONGINT_IMPL = MPZ
14+
15+
CIRCUITPY_SMALL_BUILD = 1
16+
SUPEROPT_GC = 0

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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_A0), MP_ROM_PTR(&pin_PA02) },
6+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA06) },
7+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA07) },
9+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA10) },
10+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA04) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) },
13+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02) },
14+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA06) },
15+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA05) },
16+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA07) },
17+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA00) },
18+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA01) },
19+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA04) },
20+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA09) },
21+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA10) },
22+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PA22) },
23+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_PA23) },
24+
25+
// External SPI
26+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA07) },
27+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA06) },
28+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA05) },
29+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
30+
31+
// UART
32+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA22) },
33+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA23) },
34+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
35+
36+
// I2C and Qwiic Connector
37+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
38+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
39+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }
40+
41+
};
42+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)