mirror of
https://github.com/Ralim/IronOS-Meta.git
synced 2025-04-15 11:27:48 +00:00
Compare commits
21 Commits
v2022.02.2
...
latest
| Author | SHA1 | Date | |
|---|---|---|---|
|
474fc5923b | ||
|
b5e55ee1f1 | ||
|
5ec3a16c3f | ||
|
b313a84e10 | ||
|
|
3b02e3ea6f | ||
|
|
c10a130329 | ||
|
6e9ed602a2 | ||
|
|
d39d58d79a | ||
|
|
248b2b5806 | ||
|
9eed4b2dd4 | ||
|
|
1a5c7ac5f6 | ||
|
92f4d50a73 | ||
|
|
c252b67c9a | ||
|
|
2dd99ff5aa | ||
|
|
bd70b17cd6 | ||
|
|
2942212437 | ||
|
|
3c62bb7fe1 | ||
|
|
32e4db09ac | ||
|
|
fbf0a8ac63 | ||
|
|
f4e5717e34 | ||
|
|
466022c12f |
18
.github/workflows/push.yml
vendored
18
.github/workflows/push.yml
vendored
@@ -10,17 +10,19 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- args: "-m"
|
||||
model: "miniware"
|
||||
- args: "-p"
|
||||
model: "pinecil"
|
||||
- model: "miniware"
|
||||
- model: "pinecilv1"
|
||||
- model: "pinecilv2"
|
||||
- model: "mhp30"
|
||||
- model: "ts101"
|
||||
- model: "s60"
|
||||
fail-fast: true
|
||||
|
||||
steps:
|
||||
- name: Install dependencies (apk)
|
||||
run: apk add --no-cache git python3 py3-pip zlib py3-pillow
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
@@ -28,13 +30,13 @@ jobs:
|
||||
run: mkdir -p /tmp/${{ matrix.model }}
|
||||
|
||||
- name: build all files for the device
|
||||
run: cd Bootup\ Logos && ./run.sh /tmp/${{ matrix.model }}/ ${{matrix.args}}
|
||||
run: cd Bootup\ Logos && ./run.sh /tmp/${{ matrix.model }}/ -m ${{matrix.model}}
|
||||
|
||||
- name: build logo erase file
|
||||
run: cd Bootup\ Logos && python3 img2logo.py -E erase_stored_image /tmp/${{ matrix.model }}/ ${{matrix.args}}
|
||||
run: cd Bootup\ Logos && python3 img2logo.py -E erase_stored_image /tmp/${{ matrix.model }}/ -m ${{matrix.model}}
|
||||
|
||||
- name: Archive artifacts
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ${{ matrix.model }}
|
||||
path: |
|
||||
|
||||
69
.github/workflows/release.yml
vendored
Normal file
69
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,69 @@
|
||||
---
|
||||
name: "release"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "main"
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: "Release"
|
||||
runs-on: "ubuntu-22.04"
|
||||
|
||||
steps:
|
||||
- name: Install dependencies (apk)
|
||||
run: sudo apt update && sudo apt-get install -y git python3 python3-pillow
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
- name: prep
|
||||
run: |
|
||||
mkdir -p /tmp/pinecilv1 && \
|
||||
mkdir -p /tmp/pinecilv2 && \
|
||||
mkdir -p /tmp/miniware && \
|
||||
mkdir -p /tmp/ts101 && \
|
||||
mkdir -p /tmp/mhp30 && \
|
||||
mkdir -p /tmp/s60
|
||||
|
||||
- name: build all files for the device
|
||||
run: |
|
||||
cd Bootup\ Logos && \
|
||||
./run.sh /tmp/pinecilv1/ -m pinecilv1 && \
|
||||
./run.sh /tmp/pinecilv2/ -m pinecilv2 && \
|
||||
./run.sh /tmp/miniware/ -m miniware && \
|
||||
./run.sh /tmp/ts101/ -m ts101 && \
|
||||
./run.sh /tmp/mhp30/ -m mhp30 && \
|
||||
./run.sh /tmp/s60/ -m s60
|
||||
|
||||
- name: build logo erase file
|
||||
run: |
|
||||
cd Bootup\ Logos && \
|
||||
python3 img2logo.py -E erase_stored_image /tmp/pinecilv1/ -m pinecilv1 && \
|
||||
python3 img2logo.py -E erase_stored_image /tmp/pinecilv2/ -m pinecilv2 && \
|
||||
python3 img2logo.py -E erase_stored_image /tmp/miniware/ -m miniware && \
|
||||
python3 img2logo.py -E erase_stored_image /tmp/ts101/ -m ts101 && \
|
||||
python3 img2logo.py -E erase_stored_image /tmp/mhp30/ -m mhp30 && \
|
||||
python3 img2logo.py -E erase_stored_image /tmp/s60/ -m s60
|
||||
|
||||
|
||||
- name: compress logo files
|
||||
run: |
|
||||
zip -rj pinecilv1.zip /tmp/pinecilv1/* && \
|
||||
zip -rj miniware.zip /tmp/miniware/* && \
|
||||
zip -rj pinecilv2.zip /tmp/pinecilv2/* && \
|
||||
zip -rj ts101.zip /tmp/ts101/* && \
|
||||
zip -rj mhp30.zip /tmp/mhp30/* && \
|
||||
zip -rj s60.zip /tmp/s60/*
|
||||
|
||||
- uses: "marvinpinto/action-automatic-releases@latest"
|
||||
with:
|
||||
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
automatic_release_tag: "latest"
|
||||
prerelease: false
|
||||
title: "Release"
|
||||
files: |
|
||||
*.zip
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 300 B |
BIN
Bootup Logos/Images/Logo1b.png
Normal file
BIN
Bootup Logos/Images/Logo1b.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 269 B |
Binary file not shown.
|
Before Width: | Height: | Size: 259 B |
Binary file not shown.
|
Before Width: | Height: | Size: 245 B |
Binary file not shown.
|
Before Width: | Height: | Size: 263 B |
Binary file not shown.
|
Before Width: | Height: | Size: 262 B |
BIN
Bootup Logos/Images/doggie_bone.png
Normal file
BIN
Bootup Logos/Images/doggie_bone.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.6 KiB |
BIN
Bootup Logos/Images/hack_the_planet.gif
Normal file
BIN
Bootup Logos/Images/hack_the_planet.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.3 KiB |
BIN
Bootup Logos/Images/hack_the_planet.png
Normal file
BIN
Bootup Logos/Images/hack_the_planet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 876 B |
BIN
Bootup Logos/Images/majorTom.png
Normal file
BIN
Bootup Logos/Images/majorTom.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 302 B |
BIN
Bootup Logos/Images/science.png
Normal file
BIN
Bootup Logos/Images/science.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
@@ -1,3 +1,5 @@
|
||||
# Boot up Logos
|
||||
|
||||
## Boot up logo's are logos or animations shown on boot of IronOS
|
||||
|
||||
These are programmed into the device just like the normal firmware.
|
||||
@@ -33,25 +35,31 @@ This just overwrites individual bytes in the output buffer.
|
||||
||arcade_galaga.png||
|
||||
||arcade_pac_man.png||
|
||||
||bender.png||
|
||||
||doggie_bone.png||
|
||||
||f1.png||
|
||||
||halo_master_chief_helmet.png||
|
||||
||horror_vacui_IronOS.png||
|
||||
||IronOS.png|lefty-version available|
|
||||
||IronOS.png||
|
||||
||Logo1b.png||
|
||||
||lot_of_tin_is_too_few_tin_IT.png|English: "A lot of tin is too few tin"|
|
||||
||majorTom.png||
|
||||
||open_sw_hw_IronOS_logos.png||
|
||||
||Pinecil.png|lefty-version available|
|
||||
||Pinecil.png||
|
||||
||science.png||
|
||||
||skulls.png||
|
||||
||TS100.png|lefty-version available|
|
||||
||TS80.png|lefty-version available|
|
||||
||TS80P.png|lefty-version available|
|
||||
||TS100.png||
|
||||
||TS80.png||
|
||||
||TS80P.png||
|
||||
||wh_40k.png||
|
||||
||wwii_kilroy.png||
|
||||
||hack_the_planet.png||
|
||||
|
||||
**Animated logos**
|
||||
|Logo \* |Filename |Note |
|
||||
|:-------------:|:-------------:|:-----:|
|
||||
| |CRT_horror_vacui.gif||
|
||||
||IronOS.gif|lefty-version available|
|
||||
||IronOS.gif||
|
||||
||terminal.gif||
|
||||
||hack_the_planet.gif||
|
||||
|
||||
_* Click the individual logo to see its animation, if you missed it here._
|
||||
|
||||
@@ -32,6 +32,26 @@ class MiniwareSettings:
|
||||
DFU_PINECIL_VENDOR = 0x1209
|
||||
DFU_PINECIL_PRODUCT = 0xDB42
|
||||
|
||||
class S60Settings:
|
||||
IMAGE_ADDRESS = 0x08000000 + (62 * 1024)
|
||||
DFU_TARGET_NAME = b"IronOS-dfu"
|
||||
DFU_PINECIL_ALT = 0
|
||||
DFU_PINECIL_VENDOR = 0x1209
|
||||
DFU_PINECIL_PRODUCT = 0xDB42
|
||||
|
||||
class TS101Settings:
|
||||
IMAGE_ADDRESS = 0x08000000 + (126 * 1024)
|
||||
DFU_TARGET_NAME = b"IronOS-dfu"
|
||||
DFU_PINECIL_ALT = 0
|
||||
DFU_PINECIL_VENDOR = 0x1209
|
||||
DFU_PINECIL_PRODUCT = 0xDB42
|
||||
|
||||
class MHP30Settings:
|
||||
IMAGE_ADDRESS = 0x08000000 + (126 * 1024)
|
||||
DFU_TARGET_NAME = b"IronOS-dfu"
|
||||
DFU_PINECIL_ALT = 0
|
||||
DFU_PINECIL_VENDOR = 0x1209
|
||||
DFU_PINECIL_PRODUCT = 0xDB42
|
||||
|
||||
class PinecilSettings:
|
||||
IMAGE_ADDRESS = 0x0801F800
|
||||
@@ -40,6 +60,13 @@ class PinecilSettings:
|
||||
DFU_PINECIL_VENDOR = 0x28E9
|
||||
DFU_PINECIL_PRODUCT = 0x0189
|
||||
|
||||
class Pinecilv2Settings:
|
||||
IMAGE_ADDRESS = (1016 * 1024) # its 2 4k erase pages inset
|
||||
DFU_TARGET_NAME = b"Pinecilv2"
|
||||
DFU_PINECIL_ALT = 0
|
||||
DFU_PINECIL_VENDOR = 0x28E9 # These are ignored by blisp so doesnt matter what we use
|
||||
DFU_PINECIL_PRODUCT = 0x0189 # These are ignored by blisp so doesnt matter what we use
|
||||
|
||||
|
||||
def still_image_to_bytes(image: Image, negative: bool, dither: bool, threshold: int, preview_filename):
|
||||
# convert to luminance
|
||||
@@ -117,7 +144,7 @@ def get_screen_blob(previous_frame: bytearray, this_frame: bytearray):
|
||||
return outputData
|
||||
|
||||
|
||||
def animated_image_to_bytes(imageIn: Image, negative: bool, dither: bool, threshold: int):
|
||||
def animated_image_to_bytes(imageIn: Image, negative: bool, dither: bool, threshold: int, flip_frames):
|
||||
"""
|
||||
Convert the gif into our best effort startup animation
|
||||
We are delta-encoding on a byte by byte basis
|
||||
@@ -136,6 +163,8 @@ def animated_image_to_bytes(imageIn: Image, negative: bool, dither: bool, thresh
|
||||
for framenum in range(0, imageIn.n_frames):
|
||||
imageIn.seek(framenum)
|
||||
image = imageIn
|
||||
if flip_frames:
|
||||
image = image.rotate(180)
|
||||
|
||||
frameb = still_image_to_bytes(image, negative, dither, threshold, None)
|
||||
frameData.append(frameb)
|
||||
@@ -188,13 +217,14 @@ def animated_image_to_bytes(imageIn: Image, negative: bool, dither: bool, thresh
|
||||
|
||||
def img2hex(
|
||||
input_filename,
|
||||
device_model_name:str,
|
||||
preview_filename=None,
|
||||
threshold=128,
|
||||
dither=False,
|
||||
negative=False,
|
||||
isPinecil=False,
|
||||
make_erase_image=False,
|
||||
output_filename_base="out",
|
||||
flip=False,
|
||||
):
|
||||
"""
|
||||
Convert 'input_filename' image file into Intel hex format with data
|
||||
@@ -219,8 +249,10 @@ def img2hex(
|
||||
raise IOError('error reading image file "{}": {}'.format(input_filename, e))
|
||||
|
||||
if getattr(image, "is_animated", False):
|
||||
data = animated_image_to_bytes(image, negative, dither, threshold)
|
||||
data = animated_image_to_bytes(image, negative, dither, threshold,flip)
|
||||
else:
|
||||
if flip:
|
||||
image = image.rotate(180)
|
||||
# magic/required header
|
||||
data = [DATA_PROGRAMMED_MARKER, 0x00] # Timing value of 0
|
||||
image_bytes = still_image_to_bytes(image, negative, dither, threshold, preview_filename)
|
||||
@@ -230,11 +262,35 @@ def img2hex(
|
||||
if len(data) < LCD_PAGE_SIZE:
|
||||
pad = [0] * (LCD_PAGE_SIZE - len(data))
|
||||
data.extend(pad)
|
||||
|
||||
# Set device settings depending on input `-m` argument
|
||||
device_name = device_model_name.lower()
|
||||
if device_name == "miniware" or device_name == "ts100" or device_name == "ts80" or device_name == "ts80p":
|
||||
deviceSettings = MiniwareSettings
|
||||
if isPinecil:
|
||||
elif device_name == "pinecilv1" or device_name == "pinecil":
|
||||
deviceSettings = PinecilSettings
|
||||
# Generate both possible outputs
|
||||
output_name = output_filename_base + os.path.basename(input_filename)
|
||||
elif device_name == "pinecilv2":
|
||||
deviceSettings = Pinecilv2Settings
|
||||
elif device_name == "ts101":
|
||||
deviceSettings = TS101Settings
|
||||
elif device_name == "s60":
|
||||
deviceSettings = S60Settings
|
||||
elif device_name == "mhp30":
|
||||
deviceSettings = MHP30Settings
|
||||
else:
|
||||
print("Could not determine device type")
|
||||
sys.exit(-1)
|
||||
|
||||
# Split name from extension so we can mangle in the _L suffix for flipped images
|
||||
split_name = os.path.splitext( os.path.basename(input_filename))
|
||||
|
||||
if flip:
|
||||
base = split_name[0]
|
||||
ext = split_name[1]
|
||||
base =base+"_L"
|
||||
split_name = [base,ext]
|
||||
output_name = output_filename_base +split_name[0] +split_name[1]
|
||||
|
||||
DFUOutput.writeFile(
|
||||
output_name + ".dfu",
|
||||
data,
|
||||
@@ -273,9 +329,10 @@ def parse_commandline():
|
||||
"-n",
|
||||
"--negative",
|
||||
action="store_true",
|
||||
help="photo negative: exchange black and white " "in output",
|
||||
help="photo negative: exchange black and white in output",
|
||||
)
|
||||
|
||||
|
||||
parser.add_argument(
|
||||
"-t",
|
||||
"--threshold",
|
||||
@@ -298,8 +355,7 @@ def parse_commandline():
|
||||
help="generate a logo erase file instead of a logo",
|
||||
)
|
||||
|
||||
parser.add_argument("-p", "--pinecil", action="store_true", help="generate files for Pinecil")
|
||||
parser.add_argument("-m", "--miniware", action="store_true", help="generate files for miniware")
|
||||
parser.add_argument("-m", "--model", help="device model name")
|
||||
parser.add_argument(
|
||||
"-v",
|
||||
"--version",
|
||||
@@ -319,17 +375,30 @@ if __name__ == "__main__":
|
||||
sys.stderr.write('Won\'t overwrite existing file "{}" (use --force ' "option to override)\n".format(args.preview))
|
||||
sys.exit(1)
|
||||
|
||||
if args.miniware == False and args.pinecil == False:
|
||||
sys.stderr.write("You must provide --miniware or --pinecil to select your model")
|
||||
sys.exit(1)
|
||||
|
||||
print(f"Converting {args.input_filename} => {args.output_filename}")
|
||||
|
||||
|
||||
img2hex(
|
||||
input_filename=args.input_filename,
|
||||
output_filename_base=args.output_filename,
|
||||
device_model_name=args.model,
|
||||
preview_filename=args.preview,
|
||||
threshold=args.threshold,
|
||||
dither=args.dither,
|
||||
negative=args.negative,
|
||||
make_erase_image=args.erase,
|
||||
isPinecil=args.pinecil,
|
||||
flip = False,
|
||||
)
|
||||
|
||||
img2hex(
|
||||
input_filename=args.input_filename,
|
||||
output_filename_base=args.output_filename,
|
||||
device_model_name=args.model,
|
||||
preview_filename=args.preview,
|
||||
threshold=args.threshold,
|
||||
dither=args.dither,
|
||||
negative=args.negative,
|
||||
make_erase_image=args.erase,
|
||||
flip = True,
|
||||
)
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
echo $1
|
||||
echo $2
|
||||
set -e
|
||||
find Images/ -type f -exec python3 img2logo.py {} "$1" "$2" \;
|
||||
find Images/ -type f -exec python3 img2logo.py {} "$1" "$2" "$3" \;
|
||||
|
||||
1
Documents/Install_Logo
Normal file
1
Documents/Install_Logo
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
17
README.md
17
README.md
@@ -6,3 +6,20 @@ This includes photographs of hardware, datasheets, schematics and of course **bo
|
||||
|
||||
This repository uses github actions to automagically build the logos for each device.
|
||||
Periodically a "release" will be tagged and pre-compiled logo's will be put there as well to make it easy.
|
||||
|
||||
|
||||
# Boot-Up Logos
|
||||
|
||||
The IronOS firmware supports a user created bootup logo.
|
||||
By default, there is _not_ one included in the firmware. This means that once flashed they generally stay. If you want no logo again, you would have to flash a blank image to the bootup logo.
|
||||
|
||||
- Safe & Fun: will not over write your firmware
|
||||
- Easy install: use dfu tool just like updating firmware (or Pine64 Updater if you have a Pinecil).
|
||||
|
||||
## Generating the Logo files
|
||||
|
||||
There are community logo's already converted and ready to use in [IronOS-Meta/releases](https://github.com/Ralim/IronOS-Meta/releases).
|
||||
Download the zip for Pinecil or Miniware and then install using the instructions on the [main IronOS documentation](https://ralim.github.io/IronOS/Logo/).
|
||||
|
||||
Alternatively if you want to make your own logo files, there is also documentation on how best to do this in the [main IronOS documentation](https://ralim.github.io/IronOS/Logo/).
|
||||
|
||||
|
||||
Reference in New Issue
Block a user