8000 Merge pull request #1508 from adafruit/tannewt-patch-8 · tannewt/circuitpython@63d4561 · GitHub
[go: up one dir, main page]
Skip to content

Commit 63d4561

Browse files
dhalbertdhalbert
authored
Merge pull request micropython#1508 from adafruit/tannewt-patch-8
Fix up board build
2 parents 323108e + 3924051 commit 63d4561

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ git:
2222
# just try to make the builds "about equal in run time"
2323
env:
2424
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf
25-
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
25+
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero" TRAVIS_SDK=arm
28-
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev sparkfun_lumidrive sparkfun_redboard_turbo" TRAVIS_SDK=arm
28+
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm
2929

3030
addons:
3131
artifacts:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
77
#define SPI_FLASH_BAUDRATE (8000000)
88

9-
#define SPI_FLASH_MOSI_PIN &PIN_PA08
10-
#define SPI_FLASH_MISO_PIN &PIN_PA14
11-
#define SPI_FLASH_SCK_PIN &PIN_PA09
12-
#define SPI_FLASH_CS_PIN &PIN_PA13
9+
#define SPI_FLASH_MOSI_PIN &pin_PA08
10+
#define SPI_FLASH_MISO_PIN &pin_PA14
11+
#define SPI_FLASH_SCK_PIN &pin_PA09
12+
#define SPI_FLASH_CS_PIN &pin_PA13
1313

1414
#define MICROPY_PORT_A ( 0 )
1515
#define MICROPY_PORT_B ( 0 )

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
@@ -35,4 +35,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
3535
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
3636
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
3737
};
38-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
38+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)
0