Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Root directory content refactoring #1725

Merged
merged 12 commits into from
Jul 2, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
- run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'

- name: Publish docs
run: mkdocs gh-deploy
run: mkdocs gh-deploy -f scripts/IronOS-mkdocs.yml -d ../site
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: copy license text
run: |
cp LICENSE source/Hexfile/LICENSE
cp LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
cp scripts/LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md

- name: Archive ${{ matrix.model }} artifacts
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- name: copy license text
run: |
cp LICENSE source/Hexfile/LICENSE
cp LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
cp scripts/LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md

- name: Archive ${{ matrix.model }} artifacts
uses: actions/upload-artifact@v3
Expand Down
7 changes: 0 additions & 7 deletions Bootup Logo/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion Documentation/Flashing/MHP30.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/IronOS/issues/

While in the past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/IronOS/issues/11) is that things work mostly as expected in Linux.

@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/dev/scripts/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.

If you want to do it manually (or if the script does not work for some reason) the general procedure is the same as for Windows, the differences are in the way to mount the unit and copy the firmware.
Remember that after flashing, the firmware filename will have changed to end in `.RDY` or `.ERR` or `.NOT` and only `.RDY` means the flashing was successful!
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Flashing/TS100.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/IronOS/issues/

While in the past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/IronOS/issues/11) is that things work mostly as expected in Linux.

@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/dev/scripts/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.

If you want to do it manually (or if the script does not work for some reason) the general procedure is the same as for Windows, the differences are in the way to mount the unit and copy the firmware.
Remember that after flashing, the firmware filename will have changed to end in `.RDY` or `.ERR` or `.NOT` and only `.RDY` means the flashing was successful!
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml → IronOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ services:
tty: true
build:
context: .
dockerfile: Scripts/IronOS.Dockerfile
command: /bin/sh
volumes:
- ./ci:/build/ci:Z
- ./scripts/ci:/build/ci:Z
- ./:/build/source:Z
62 changes: 62 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!/usr/bin/env make
# Root Makefile for IronOS - Soldering Iron Open Source Firmware Project


### global adjustable variables

# command for docker-compose tool
ifndef DOCKER_COMPOSE
DOCKER_COMPOSE:=docker-compose
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we are here, can we test for docker-compose and if its not here fall back to docker compose

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thoughtful suggestion. No problem, I will test & check how to make it in a more or less reliable way.

endif

# command for python-based mkdocs tool
ifndef MKDOCS
MKDOCS:=mkdocs
endif


### global static variables

# docker-related files
DOCKER_YML=$(CURDIR)/IronOS.yml
DOCKER_FILE=$(CURDIR)/scripts/IronOS.Dockerfile

# docker dependencies
DOCKER_DEPS=$(DOCKER_YML) $(DOCKER_FILE)

# compose docker-compose command
DOCKER_CMD=$(DOCKER_COMPOSE) -f $(DOCKER_YML) run --rm builder

# MkDocs config
MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml


### helper targets

# former start_dev.sh
docker-shell: $(DOCKER_DEPS)
@$(DOCKER_CMD)

# former build.sh
docker-build: $(DOCKER_DEPS)
@$(DOCKER_CMD) /bin/bash /build/ci/buildAll.sh

# delete container
docker-clean:
-@docker rmi ironos-builder:latest

# generate docs in site/ directory (DIR for -d is relative to mkdocs.yml file location, hence use default name/location site by setting up ../site)
docs: $(MKDOCS_YML) Documentation/* Documentation/Flashing/* Documentation/images/*
@$(MKDOCS) build -f $(MKDOCS_YML) -d ../site

# pass-through target for Makefile inside source/ dir
%:
make -C source/ $@

# global clean-up target
clean-full: docker-clean
make -C source/ clean-all
rm -Rf site
rm -Rf scripts/ci/artefacts

.PHONY: docker-shell docker-build docker-clean docs clean-full
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ For notes on installation for your device, please refer to the flashing guide fo
- [Custom boot up logo support](https://ralim.github.io/IronOS/Logo/)
- Automatic LCD rotation based on the orientation

**Bootup Logo NOTICE**:
IronOS supports both a bootup logo _AND_ bootup animations. However, _they are no longer included in this repo_. Please, [read the docs](https://ralim.github.io/IronOS/Logo/) for more information.

## Menu System

This new firmware uses a new menu system to allow access to the settings on the device.
Expand Down
2 changes: 0 additions & 2 deletions build.sh

This file was deleted.

2 changes: 1 addition & 1 deletion mkdocs.yml → scripts/IronOS-mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ site_description: "IronOS Open Source Soldering Iron firmware for Miniware and P
# repo config
repo_url: https://github.com/ralim/IronOS/

docs_dir: Documentation
docs_dir: ../Documentation
edit_uri: edit/dev/Documentation/

# Theme and config
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile → scripts/IronOS.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ RUN python3 -m pip install ${PIP_PKGS}
RUN git config --global --add safe.directory /build/source

COPY . /build/source
COPY ./ci /build/ci
COPY ./Scripts/ci /build/ci
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions start_dev.sh

This file was deleted.