Skip to content

Commit 0053ec5

Browse files
committed
Add Manual package
1 parent c7eace3 commit 0053ec5

File tree

9 files changed

+61
-6
lines changed

9 files changed

+61
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ source/core_packages/base/*.py
1212
source/core_packages/base/hostname
1313
source/core_packages/base/motd
1414
source/core_packages/base/passwd
15+
source/core_packages/manual/Manual.txt
1516
*.pyc
1617
*.xml
1718
*.iml

scripts/make_kernel.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from os import system, mkdir, listdir, environ, getcwd, chdir, remove
22
from sys import argv
33
from sys import path as spath
4+
import shutil
45

56
spath.append("../scripts/CircuitMPY/")
67
spath.append("./jz")
@@ -34,7 +35,7 @@ def errexit():
3435
print(f"Using board path: {boardpath}")
3536
print(f"Building for board: {board}\n")
3637

37-
print("[1/4] Building kernel package")
38+
print("[1/5] Building kernel package")
3839

3940
kern_files = ["be.py", "lj_colours.py", "lj_colours_placebo.py", "neopixel_colors.py"]
4041
jcurses_files = ["jcurses.py", "jcurses_data.py"]
@@ -62,7 +63,7 @@ def errexit():
6263
remove(f"./core_packages/kernel/{filee[:-3]}.mpy")
6364
print("Done")
6465

65-
print("\n[2/4] Building jcurses package")
66+
print("\n[2/5] Building jcurses package")
6667
for filee in jcurses_files:
6768
try:
6869
circuitmpy.compile_mpy(
@@ -85,7 +86,7 @@ def errexit():
8586
remove(f"./core_packages/jcurses/{filee[:-3]}.mpy")
8687
print("Done")
8788

88-
print("\n[3/4] Building jz package")
89+
print("\n[3/5] Building jz package")
8990
try:
9091
circuitmpy.compile_mpy("./jz/jz.py", f"./core_packages/jz/jz.mpy", optim=optimis)
9192
except OSError:
@@ -103,7 +104,7 @@ def errexit():
103104
remove(f"./core_packages/jz/jz.mpy")
104105
print("Done")
105106

106-
print("\n[4/4] Building cptoml package")
107+
print("\n[4/5] Building cptoml package")
107108
try:
108109
circuitmpy.compile_mpy(
109110
"../source/cptoml/cptoml.py",
@@ -120,6 +121,19 @@ def errexit():
120121
execstr = "compress(" + execstr[2:] + ", '../cptoml.jpk')"
121122
exec(execstr)
122123
chdir(olddir)
123-
124124
remove(f"./core_packages/cptoml/cptoml.mpy")
125+
126+
print("\n[5/5] Creating manual package")
127+
shutil.copyfile(
128+
"../Manual.txt",
129+
"core_packages/manual/Manual.txt",
130+
)
131+
chdir("core_packages/manual")
132+
execstr = ""
133+
for filee in listdir():
134+
execstr += f", '{filee}'"
135+
execstr = "compress(" + execstr[2:] + ", '../manual.jpk')"
136+
exec(execstr)
137+
chdir(olddir)
138+
125139
print("Done")

scripts/strap_kern.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
target_root = "../../source/" + target_root
2525
target_root = path.abspath(target_root)
2626
cmd = "python3 jpkgstrap.py " + target_root + " -U"
27-
for i in ["cptoml", "jcurses", "jz", "kernel"]:
27+
for i in ["cptoml", "jcurses", "jz", "kernel", "manual"]:
2828
cmd += " ../../source/core_packages/" + i + ".jpk"
2929
system(cmd)
3030

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
sysinfo
2+
cat /etc/motd
3+
4+
# Uncomment to override history size
5+
# Default is 10, to preserve memory
6+
#history-size = 100
7+
8+
# nice aliases, enable whichever you want.
9+
10+
alias ll="ls -l"
11+
alias la="ls -la"
12+
13+
alias py="python"
14+
15+
alias sys="sysinfo"
16+
17+
#alias ifpexec="fpexec -i"
18+
#alias lfpexec="fpexec -l"
19+
20+
#alias more="less"
21+
alias hist="history"
22+
alias atop="watch -s -n 0.6 top"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"JPKG_minimum_version": 2,
3+
"package_name": "manual",
4+
"version": [0, 5, 0],
5+
"dependencies": [],
6+
"conflicts": [],
7+
"install": "installer.py",
8+
"remove": "uninstaller.py",
9+
"update": "installer.py",
10+
"strap": "strap.py",
11+
"restart_required": false
12+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
be.based.run("cp Manual.txt /home/board/Manual.txt")
2+
be.api.setvar("return", "0")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shutil.copyfile("Manual.txt", path.join(root, "home/board/Manual.txt"))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
be.based.run("rm /home/board/Manual.txt")
2+
be.api.setvar("return", "0")

source/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ clean_core:
3737
@if [ -e "core_packages/jcurses.jpk" ]; then rm core_packages/jcurses.jpk; fi
3838
@if [ -e "core_packages/cptoml.jpk" ]; then rm core_packages/cptoml.jpk; fi
3939
@if [ -e "core_packages/jz.jpk" ]; then rm core_packages/jz.jpk; fi
40+
@if [ -e "core_packages/manual.jpk" ]; then rm core_packages/manual.jpk; fi
4041
comp:
4142
@echo -e "\nCommencing kernel compilation.."
4243
@sync

0 commit comments

Comments
 (0)