Skip to content

Commit 2e037a8

Browse files
authored
Merge pull request #5 from boardsource/v8_bump
V8 bump
2 parents 6e021a9 + 1e7762a commit 2e037a8

26 files changed

Lines changed: 253 additions & 113 deletions

.github/workflows/build.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: build_mpy
2+
on:
3+
- push
4+
- workflow_dispatch
5+
- repository_dispatch
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
name: Build
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
- name: pipenv install
15+
run: pip install pipenv
16+
- name: install
17+
run: pipenv install
18+
- name: run build script
19+
run: pipenv run make run
20+
21+
- name: look
22+
run: ls -la build_out/
23+
24+
- name: Archive
25+
uses: actions/upload-artifact@v3
26+
with:
27+
name: uf2
28+
path: build_out
29+
- name: Release
30+
uses: softprops/action-gh-release@v1
31+
with:
32+
files: build_out/*.uf2

Dockerfile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM ubuntu:20.04
22

33
USER root
44
WORKDIR /cpy
5-
# COPY ./cpy/circuitpython .
65
COPY ./dockersetupcmd.sh .
7-
# COPY ./dockerfinishcmd.sh .
86

97
ARG DEBIAN_FRONTEND=noninteractive
108
RUN apt-get update && \
@@ -18,11 +16,27 @@ RUN apt-get update && \
1816
python3.8\
1917
python3-pip\
2018
gettext\
19+
curl\
2120
wget && \
2221
apt-get clean
22+
2323
RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
24+
RUN apt-get update
25+
26+
# Get Rust
27+
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
28+
29+
RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
30+
31+
2432

2533
ENV PATH "/cpy/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
34+
ENV PATH="/root/.cargo/bin:${PATH}"
35+
36+
RUN git config --global --add safe.directory /cpy/circuitpython
37+
RUN git config --global --add safe.directory '*'
38+
39+
2640

2741
# RUN apt-get update && apt-get install -y gettext librsvg2-bin git mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra gcc-aarch64-linux-gnu wget python3.8 python3-pip && apt-get clean
2842
# RUN make fetch-submodules

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ gitpython = "*"
99
[dev-packages]
1010

1111
[requires]
12-
python_version = "3.9"
12+
python_version = "3"

Pipfile.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

board_mapping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
board_dir="./bs_python_boards"
55
cpy_dir = "./cpy/circuitpython"
6-
build_script= "#!/bin/bash\n"
6+
build_script= '#!/bin/bash\nmake update-frozen-modules\necho "=============BUILDING================"\n'
77
post_build_script= "#!/bin/bash\n"
88
def generate_build_script():
99
build_script_path= f'{cpy_dir}/dockerbuildcmd.sh'

bs_python_boards/nrf/nice_nano_bs/mpconfigboard.mk

Lines changed: 0 additions & 12 deletions
This file was deleted.

bs_python_boards/nrf/nice_nano_bs/pins.c

Lines changed: 0 additions & 62 deletions
This file was deleted.

bs_python_boards/raspberrypi/boardsouce_lulu/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ CHIP_FAMILY = rp2
99
EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
1010

1111
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
12-
FROZEN_MPY_DIRS += $(TOP)/frozen/kmk
1312

1413

1514
# CIRCUITPY__EVE = 1

bs_python_boards/nrf/nice_nano_bs/board.c renamed to bs_python_boards/raspberrypi/boardsouce_lulu_full/board.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
6+
* Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,9 @@
2525
*/
2626

2727
#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"
2831

2932
void board_init(void) {
3033
}
@@ -34,7 +37,8 @@ bool board_requests_safe_mode(void) {
3437
}
3538

3639
void reset_board(void) {
37-
40+
// turn off any left over LED
41+
board_reset_user_neopixels(&pin_GPIO29, 62);
3842
}
3943

4044
void board_deinit(void) {
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)