got most of base work done

Author: daysgobye

.gitignore

@@ -1,2 +1,3 @@
 cpy/**
-!cpy/.gitkeep 
+!cpy/.gitkeep 
+post_build.sh

Dockerfile

@@ -1,34 +1,34 @@
-FROM ubuntu:20.04
-
-USER root
-WORKDIR /cpy
-COPY ./cpy/circuitpython .
-COPY ./dockerbuildcmd.sh .
-# COPY ./dockerfinishcmd.sh .
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y \
-    # Development files
-    build-essential \
-    git \
-    bzip2 \
-    gcc-aarch64-linux-gnu\ 
-    python3.8\
-    python3-pip\
-    gettext\
-    wget && \
-    apt-get clean
-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
-
-ENV PATH "/cpy/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
-
-# 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
-RUN make fetch-submodules
-RUN pip3 install -r requirements-dev.txt
-RUN pip3 install --upgrade click==7.1.2
-RUN make -C mpy-cross
-# CMD ["bash","dockerbuildcmd.sh"]
-
-CMD ["sleep","3600"]
+FROM ubuntu:20.04
+
+USER root
+WORKDIR /cpy
+# COPY ./cpy/circuitpython .
+COPY ./dockersetupcmd.sh .
+# COPY ./dockerfinishcmd.sh .
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+    # Development files
+    build-essential \
+    git \
+    bzip2 \
+    gcc-aarch64-linux-gnu\ 
+    python3.8\
+    python3-pip\
+    gettext\
+    wget && \
+    apt-get clean
+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
+
+ENV PATH "/cpy/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
+
+# 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
+# RUN make fetch-submodules
+# RUN pip3 install -r requirements-dev.txt
+# RUN pip3 install --upgrade click==7.1.2
+# RUN make -C mpy-cross
+CMD ["bash","dockersetupcmd.sh"]
+
+# CMD ["sleep","3600"]

README.md

@@ -1,42 +1,88 @@
-# bs-python
-What is this all about? So we we wanted something like kmkPython But after talking with the kmk team and hearing the challanges we thought we would start fresh. So welcome to BS_Python (pun very much intended) our version of KMKPython.
-
-So the main idea here and how we are doing this defferently is we as you can see dont have circuit_python in here. What we do is we script everything. We start by cloning circuit_python > check out the right branch > make all the code changes > build the boards
-
-Let me break down whats going on and how you can use this. I will start by going over the code flow then I will tell you what you need to edit (if you need to edit anything) and how you can help out
-
-## Code flow
-* scipts/build.sh <- enetry point
-    * calls main.py
-        * main.py <- start of the code
-            * cpy_git <- handles all things to do with git
-                * clone the repo
-                * add submodules
-            * misc_file_changes <- change cpy code 
-            * board_mapping <- this moves BS_python boards into the right place in cpy
-    * builds docker container
-        * that way you only need docker and python you dont need to make sure you can compile cpy
-* scripts/start.sh
-    * starts the newly built docker container and builds all of the BS_python boards
-
-Ok now that you have an idea on how this flows together lets go over some things you might do and how you would go about doing them.
-
-## Freez xyz lib into xyz board and let everyone download that
-So you will want to copy that board from the cpy folder (run main.py to get that). Then make your changes to it and place that into the ./bs_python_boards folder. Now Its very important you place it in the correct foleder. When you take it from the cpy repo if it is from ports/nrf it needs to go into the nrf folder. If the folder does not exsist just make it but it NEEDS to be spelled the same.
-
-## Freez a lib that is not in CPY
-To freez a another libary you can simply add it to the FROZEN_REPO_LIST in cpy_git.py 
-
-## other code changes
-Above is all that I have implmented But if you want to make random changes to the CPY code base feel free to do so. A few things I would like to ask of you. Make sure that the entry for your code is in misc_file_changes.py (unless another file is better eg: git changes should be in cpy_git.py). And make sure you add somthing to this file letting other know how to do your cool new change.
-
-## TODO / HELP WANTED / DISCLAMER
-
-* Add some boards
-* freez in kmk in some way. But I want it compiled to .mpy
-* I am a super python noob I barly 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. 
-
-
-
-
-
+# BS-Python
+What is this all about? So we wanted something like kmkPython But after talking with the kmk team and hearing the challenges we thought we would start fresh. So welcome to BS_Python (pun very much intended) our version of KMKPython.
+
+So the main idea here and how we are doing this differently is we as you can see dont have circuit_python in here. What we do is we script everything. We start by cloning circuit_python > check out the right branch > make all the code changes > build the boards
+
+Let me break down what's going on and how you can use this. I will start by going over the code flow then I will tell you what you need to edit (if you need to edit anything) and how you can help out
+
+## Quick links
+[current boards](supported_boards.md)
+
+
+
+## **important**
+All scripts are intended to be run from the root so
+
+**dont** do this
+```
+cd scripts
+bash start.sh
+```
+**do** do this
+```
+bash scripts/start.sh
+```
+
+
+
+## Code flow
+* scipts/start.sh <- enetry point
+    * calls main.py
+        * main.py <- start of the code
+            * cpy_git <- handles all things to do with git
+                * clone the repo
+                * add submodules
+            * misc_file_changes <- change cpy code
+            * board_mapping <- this moves BS_python boards into the right place in cpy
+                * genarates the build script and post build script
+        * pulls the docker container or uses the one you build (see below)
+        * starts the new docker container
+            * runs the dockersetupcmd.sh
+                *  this sets up the cloned cpy repo for building
+            * runs the genarated build script that builds all the BS_Python boards
+        * runs the genarated post build script
+            * this moves all of the built .u2f files into the ./build_out and renames them
+
+
+
+## Misc things you can do
+below are the other scripts you can run and what they do
+* scripts/build.sh            
+    * builds docker container
+        * that way you only need docker and python you don't need to make sure you can compile cpy
+    * tries to push it as well.
+* scripts/clean.sh
+    * removes old cpy clones and builds.
+* scripts/bash-container.sh
+    * this is mostly for debugging the docker container
+    * it dumps you into bash on the container so you can see what's going on in there
+* scripts/kill-all.sh
+    * kills all docker containers running (look out)
+
+Ok now that you have an idea on how this flows together lets go over some things you might do and how you would go about doing them.
+
+## Freez xyz lib into xyz board and let everyone download that
+So you will want to copy that board from the cpy folder (run main.py to get that). Then make your changes to it and place that into the ./bs_python_boards folder. Now Its very important you place it in the correct folder. When you take it from the cpy repo if it is from ports/nrf it needs to go into the nrf folder. If the folder does not exist just make it but it NEEDS to be spelled the same.
+
+## Freez a lib that is not in CPY
+To freez  another library you can simply add it to the FROZEN_REPO_LIST in cpy_git.py
+
+## other code changes
+Above is all that I have implemented But if you want to make random changes to the CPY code base feel free to do so. A few things I would like to ask of you. Make sure that the entry for your code is in misc_file_changes.py (unless another file is better eg: git changes should be in cpy_git.py). And make sure you add something to this file letting others know how to do your cool new change.
+
+## TODO / HELP WANTED / DISCLAMER
+* typo / spelling
+* let me know if I need to make any more changes to stay legal
+* Add some boards
+* turn all my sick bash scripts into a make file LOL
+* freez in kmk in some way. But I want it compiled to .mpy
+* 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.
+* github action to add all the .uf2s from ./build_out to git hub releases
+* add colors to the logs (just the python parts)
+
+
+
+
+
+
+

board_mapping.py

@@ -1,16 +1,34 @@
-import os
-import shutil
-
-board_dir="./bs_python_boards"
-cpy_dir = "./cpy/circuitpython/ports"
-def move_boards():
-    for subdir in os.listdir(board_dir):
-        board_type = f'{board_dir}/{subdir}'
-        for board in os.listdir(board_dir+"/"+subdir):
-            board_dest =f'{cpy_dir}/{subdir}/boards/{board}' 
-            board_src= f'{board_dir}/{subdir}/{board}'
-            shutil.copytree(board_src, board_dest) 
-            print(f'moving {board} from {board_src} to {board_dest}')
-
-def generate_build_script():
-    print("pass")
+import os
+import shutil
+
+board_dir="./bs_python_boards"
+cpy_dir = "./cpy/circuitpython"
+build_script= "#!/bin/bash\n"
+post_build_script= "#!/bin/bash\n"
+def generate_build_script():
+    build_script_path= f'{cpy_dir}/dockerbuildcmd.sh'
+    with open(build_script_path, 'w') as file:
+        file.write(build_script)
+    with open("./post_build.sh", 'w') as file:
+        file.write(post_build_script)
+    print(f'making build script in "{build_script_path}"')
+
+def add_board_to_build_script_board(board,board_dir):
+    global build_script
+    global post_build_script
+    build_script+=f'cd ports/{board_dir}\n'
+    build_script+=f'make BOARD={board}\n'
+    build_script+=f'sleep 100\n'
+    build_script+=f'cd ../..\n'
+    post_build_script+=f'cp ./cpy/circuitpython/ports/{board_dir}/build-{board}/firmware.uf2 ./build_out/{board}.uf2\n'
+
+def move_boards():
+    for subdir in os.listdir(board_dir):
+        board_type = f'{board_dir}/{subdir}'
+        for board in os.listdir(board_dir+"/"+subdir):
+            board_dest =f'{cpy_dir}/ports/{subdir}/boards/{board}' 
+            board_src= f'{board_dir}/{subdir}/{board}'
+            shutil.copytree(board_src, board_dest) 
+            print(f'moving {board} from {board_src} to {board_dest}')
+            add_board_to_build_script_board(board,subdir)
+    generate_build_script()

bs_python_boards/nrf/nice_nano_bs/mpconfigboard.mk

@@ -8,6 +8,4 @@ MCU_CHIP = nrf52840
 INTERNAL_FLASH_FILESYSTEM = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SSD1306
-# you need to fix the 1306 lib and you need to add framebuf
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

build_out/boardsource_blok.uf2

@@ -1,27 +1,27 @@
-import git
-import subprocess
-import shutil
-PATH = "./cpy/circuitpython"
-REPO_URL = "https://github.com/adafruit/circuitpython.git"
-BRANCH = "7.2.x"
-FROZEN_REPO_LIST = ["https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_SSD1306.git","https://github.com/adafruit/Adafruit_CircuitPython_SSD1306.git"]
-
-def clean_dir():    
-    try:
-        shutil.rmtree(PATH)
-    except OSError as e:
-        print("Error: %s : %s" % (PATH, e.strerror))
-def add_frozen_lib(repo):
-    submodule_path= f'{PATH}/frozen'
-    for lib_url in FROZEN_REPO_LIST:
-        print(f'adding frozen lib from this url: {lib_url}')
-        process  = subprocess.Popen(["git", "submodule", "add",lib_url],cwd=submodule_path)
-        process.wait()
-
-        # repo.git.submodule.add(submodule_path,lib_url)
-
-def git_checkout():
-    clean_dir()
-    repo = git.Repo.clone_from(REPO_URL, PATH)
-    repo.git.checkout(BRANCH)
+import git
+import subprocess
+import shutil
+PATH = "./cpy/circuitpython"
+REPO_URL = "https://github.com/adafruit/circuitpython.git"
+BRANCH = "7.2.x"
+FROZEN_REPO_LIST = ["https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_SSD1306.git","https://github.com/adafruit/Adafruit_CircuitPython_SSD1306.git"]
+
+def clean_dir():    
+    try:
+        shutil.rmtree(PATH)
+    except OSError as e:
+        print("Error: %s : %s" % (PATH, e.strerror))
+def add_frozen_lib(repo):
+    submodule_path= f'{PATH}/frozen'
+    for lib_url in FROZEN_REPO_LIST:
+        print(f'adding frozen lib from this url: {lib_url}')
+        process  = subprocess.Popen(["git", "submodule", "add",lib_url],cwd=submodule_path)
+        process.wait()
+
+        # repo.git.submodule.add(submodule_path,lib_url)
+
+def git_checkout():
+    clean_dir()
+    repo = git.Repo.clone_from(REPO_URL, PATH)
+    repo.git.checkout(BRANCH)
     add_frozen_lib(repo)

build_out/nice_nano_bs.uf2

@@ -0,0 +1 @@
+cd circuitpython&&make fetch-submodules&&pip3 install -r requirements-dev.txt&&pip3 install --upgrade click==7.1.2&&make -C mpy-cross && bash dockerbuildcmd.sh