Skip to content

Commit 7139b0b

Browse files
authored
Merge pull request #3 from boardsource/kmk-freez
Kmk freez
2 parents 3c426a7 + c6eb88e commit 7139b0b

22 files changed

Lines changed: 159 additions & 16 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cpy/**
22
!cpy/.gitkeep
3+
kmk/**
4+
!kmk/.gitkeep
35
post_build.sh

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

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Above is all that I have implemented But if you want to make random changes to t
7979
* I am a super python noob I barely know how to setup a python project. This one was setup using pipenv and python 3.9.x we dont have a reqerments.txt I dont know how to make one or if we need one we do have a pipfile tho.
8080
* github action to add all the .uf2s from ./build_out to git hub releases
8181
* add colors to the logs (just the python parts)
82+
* inject custom code into circuitpython/supervisor/shared/filesystem.c to change the drive name and default code after we are freezing in kmk we will be able to have a u2f that is for cornes and it comes typing and working perfectly
8283

8384

8485

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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ MCU_CHIP = nrf52840
88
INTERNAL_FLASH_FILESYSTEM = 1
99

1010
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
11-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
11+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
12+
# FROZEN_MPY_DIRS += $(TOP)/frozen/kmk
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 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 "supervisor/board.h"
28+
#include "shared-bindings/microcontroller/Pin.h"
29+
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
30+
#include "supervisor/shared/board.h"
31+
32+
void board_init(void) {
33+
}
34+
35+
bool board_requests_safe_mode(void) {
36+
return false;
37+
}
38+
39+
void reset_board(void) {
40+
// turn off any left over LED
41+
board_reset_user_neopixels(&pin_GPIO29, 62);
42+
}
43+
44+
void board_deinit(void) {
45+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#define MICROPY_HW_BOARD_NAME "lulu"
2+
#define MICROPY_HW_MCU_NAME "rp2040"
3+
4+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO29)

0 commit comments

Comments
 (0)