Skip to content

Commit 796fc3f

Browse files
tannewttannewt
committed
Update font location and shrink a bunch of builds
1 parent a123cdc commit 796fc3f

14 files changed

Lines changed: 18199 additions & 6303 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
2525
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
2626
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor
2727

28-
#Adding per @danh to reduce memory usage and get the latest changes in
28+
# Tweak inlining depending on language.
29+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
30+
CFLAGS_INLINE_LIMIT = 35
31+
else
2932
CFLAGS_INLINE_LIMIT = 55
33+
endif

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ CIRCUITPY_I2CSLAVE = 0
1818
CHIP_VARIANT = SAMD21G18A
1919
CHIP_FAMILY = samd21
2020

21+
# Tweak inlining depending on language.
22+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
23+
CFLAGS_INLINE_LIMIT = 35
24+
else
2125
CFLAGS_INLINE_LIMIT = 55
26+
endif
2227

2328
# Include these Python libraries in firmware.
2429
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@
3232

3333
#define DEFAULT_UART_BUS_RX (&pin_PA11)
3434
#define DEFAULT_UART_BUS_TX (&pin_PA10)
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+
// Not connected
41+
#define IGNORE_PIN_PB22 1
42+
#define IGNORE_PIN_PB23 1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
1010
LONGINT_IMPL = MPZ
1111

1212
# Make space for frozen libs
13+
CIRCUITPY_BITBANGIO = 0
1314
CIRCUITPY_DISPLAYIO = 0
1415
CIRCUITPY_FREQUENCYIO = 0
1516
CIRCUITPY_I2CSLAVE = 0

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,9 @@ LONGINT_IMPL = MPZ
1212
CHIP_VARIANT = SAMD21G18A
1313
CHIP_FAMILY = samd21
1414

15+
# Tweak inlining depending on language.
16+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17+
CFLAGS_INLINE_LIMIT = 45
18+
else
1519
CFLAGS_INLINE_LIMIT = 70
20+
endif

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ LONGINT_IMPL = MPZ
1212

1313
CHIP_VARIANT = SAMD21G18A
1414
CHIP_FAMILY = samd21
15+
16+
# Tweak inlining depending on language.
17+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
18+
CFLAGS_INLINE_LIMIT = 50
19+
endif

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ CIRCUITPY_RTC = 0
2121
CIRCUITPY_SAMD = 0
2222
CIRCUITPY_USB_MIDI = 0
2323
CIRCUITPY_SMALL_BUILD = 1
24+
25+
# Tweak inlining depending on language.
26+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
27+
CFLAGS_INLINE_LIMIT = 40
28+
endif

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

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#define MICROPY_HW_BOARD_NAME "SparkFun LUMIDrive"
22
#define MICROPY_HW_MCU_NAME "samd21g18"
33

4-
//#define MICROPY_HW_NEOPIXEL (&pin_PA06)
5-
64
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
75
#define SPI_FLASH_BAUDRATE (8000000)
86

@@ -30,10 +28,28 @@
3028
#define DEFAULT_SPI_BUS_MOSI (&pin_PA18)
3129
#define DEFAULT_SPI_BUS_MISO (&pin_PA21)
3230

33-
//UART
34-
#define DEFAULT_UART_BUS_RX (&pin_PA11)
35-
#define DEFAULT_UART_BUS_TX (&pin_PA10)
36-
3731
// USB is always used internally so skip the pin objects for it.
3832
#define IGNORE_PIN_PA24 1
3933
#define IGNORE_PIN_PA25 1
34+
35+
#define IGNORE_PIN_PA02 1
36+
#define IGNORE_PIN_PA03 1
37+
#define IGNORE_PIN_PA10 1
38+
#define IGNORE_PIN_PA11 1
39+
#define IGNORE_PIN_PA12 1
40+
#define IGNORE_PIN_PA15 1
41+
#define IGNORE_PIN_PA16 1
42+
#define IGNORE_PIN_PA21 1
43+
#define IGNORE_PIN_PA22 1
44+
#define IGNORE_PIN_PA23 1
45+
#define IGNORE_PIN_PA27 1
46+
#define IGNORE_PIN_PA28 1
47+
48+
#define IGNORE_PIN_PB02 1
49+
#define IGNORE_PIN_PB03 1
50+
#define IGNORE_PIN_PB08 1
51+
#define IGNORE_PIN_PB09 1
52+
#define IGNORE_PIN_PB10 1
53+
#define IGNORE_PIN_PB11 1
54+
#define IGNORE_PIN_PB22 1
55+
#define IGNORE_PIN_PB23 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ LONGINT_IMPL = MPZ
1010
CHIP_VARIANT = SAMD21G18A
1111
CHIP_FAMILY = samd21
1212

13-
# Make room for frozen libraries.
14-
CFLAGS_INLINE_LIMIT = 55
13+
CIRCUITPY_AUDIOIO = 0
14+
CIRCUITPY_AUDIOBUSIO = 0
1515

1616
EXTERNAL_FLASH_DEVICE_COUNT = 1
1717
EXTERNAL_FLASH_DEVICES = "W25Q32FV"

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
55
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) },
66
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA19) }, //
77
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA18) }, //
8-
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) }, //
9-
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
10-
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) },
11-
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },
128
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, //
13-
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, //
9+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, //
1410
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) },
1511
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) },
1612
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, //
17-
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
13+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
1814
};
1915
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)