Skip to content

Commit c6eb88e

Browse files
committed
make file and kmk freezing working
1 parent 1166b8e commit c6eb88e

11 files changed

Lines changed: 23 additions & 15 deletions

File tree

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# @version 0.4
55

66
CPYPREFIX := cpy/circuitpython
7+
KMKPREFIX := kmk/kmk_firmware
8+
THIS_DIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
79

810
.PHONY: default
911
default: run
@@ -13,12 +15,15 @@ all: init build
1315

1416
.PHONY: clean
1517
clean:
16-
rm -rf ${CPYPREFIX}
18+
sudo rm -rf ${CPYPREFIX}
19+
sudo rm -rf ${KMKPREFIX}
1720

21+
J=1
1822
.PHONY: run
1923
run:
20-
python3 main.py
24+
python3 main.py $(J)
2125
docker pull boardsource/bs-python
22-
docker run -v $(pwd)/build_out:/build_out -v $(pwd)/cpy/circuitpython:/cpy/circuitpython boardsource/bs-python && bash post_build.sh
26+
docker run -v ${THIS_DIR}cpy/circuitpython:/cpy/circuitpython boardsource/bs-python
27+
bash post_build.sh
2328

2429
# end
1.42 KB
Binary file not shown.

__pycache__/cpy_git.cpython-39.pyc

1.55 KB
Binary file not shown.
920 Bytes
Binary file not shown.

board_mapping.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ def generate_build_script():
1313
file.write(post_build_script)
1414
print(f'making build script in "{build_script_path}"')
1515

16-
def add_board_to_build_script_board(board,board_dir):
16+
def add_board_to_build_script_board(board,board_dir,cpu_cores):
1717
global build_script
1818
global post_build_script
1919
build_script+=f'cd ports/{board_dir}\n'
20-
build_script+=f'make BOARD={board}\n'
21-
build_script+=f'sleep 100\n'
20+
build_script+=f'make -j{cpu_cores} BOARD={board}\n'
21+
# build_script+=f'sleep 50\n'
2222
build_script+=f'cd ../..\n'
2323
post_build_script+=f'cp ./cpy/circuitpython/ports/{board_dir}/build-{board}/firmware.uf2 ./build_out/{board}.uf2\n'
2424

25-
def move_boards():
25+
def move_boards(cpu_cores):
2626
for subdir in os.listdir(board_dir):
2727
board_type = f'{board_dir}/{subdir}'
2828
for board in os.listdir(board_dir+"/"+subdir):
2929
board_dest =f'{cpy_dir}/ports/{subdir}/boards/{board}'
3030
board_src= f'{board_dir}/{subdir}/{board}'
3131
shutil.copytree(board_src, board_dest)
3232
print(f'moving {board} from {board_src} to {board_dest}')
33-
add_board_to_build_script_board(board,subdir)
33+
add_board_to_build_script_board(board,subdir,cpu_cores)
3434
generate_build_script()

bs_python_boards/nrf/nice_nano_bs/mpconfigboard.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ MCU_CHIP = nrf52840
77

88
INTERNAL_FLASH_FILESYSTEM = 1
99

10-
# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
11-
# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
12-
FROZEN_MPY_DIRS += $(TOP)/frozen/kmk
10+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
11+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
12+
# FROZEN_MPY_DIRS += $(TOP)/frozen/kmk

build_out/boardsouce_lulu.uf2

0 Bytes
Binary file not shown.

build_out/boardsource_blok.uf2

0 Bytes
Binary file not shown.

build_out/nice_nano_bs.uf2

1.01 MB
Binary file not shown.

kmk/kmk_firmware

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)