mirror of
https://github.com/openglow-org/forgefirm.git
synced 2026-09-27 08:41:13 -07:00
repos: the sources live in the openglow-org organization
The recipe URLs, the release and install URLs, the vendor check and the CI checkouts name openglow-org, and the grblHAL core fork is openglow-org/grblHAL-core. No catalog change is owed: the recipe edits move the meta-forgefirm content hash, which every test fingerprint folds in through the platform block, so the whole catalog re-runs on its own.
This commit is contained in:
@@ -39,7 +39,7 @@ jobs:
|
|||||||
- name: Checkout meta-openglow (sibling)
|
- name: Checkout meta-openglow (sibling)
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: ScottW514/meta-openglow
|
repository: openglow-org/meta-openglow
|
||||||
ref: scarthgap
|
ref: scarthgap
|
||||||
path: meta-openglow
|
path: meta-openglow
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ jobs:
|
|||||||
- name: Checkout meta-openglow (sibling)
|
- name: Checkout meta-openglow (sibling)
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: ScottW514/meta-openglow
|
repository: openglow-org/meta-openglow
|
||||||
ref: scarthgap
|
ref: scarthgap
|
||||||
path: meta-openglow
|
path: meta-openglow
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ cloud-dependent factory software on the **stock control board** — no hardware
|
|||||||
modification — and gives the machine a local controller, a local web control
|
modification — and gives the machine a local controller, a local web control
|
||||||
panel, and a standard Grbl interface.
|
panel, and a standard Grbl interface.
|
||||||
|
|
||||||
* [Latest Release](https://github.com/ScottW514/forgefirm/releases)
|
* [Latest Release](https://github.com/openglow-org/forgefirm/releases)
|
||||||
* [Installation Instructions](https://docs.forgefirm.org/install/)
|
* [Installation Instructions](https://docs.forgefirm.org/install/)
|
||||||
* [Build Instructions](https://docs.forgefirm.org/developers/building/)
|
* [Build Instructions](https://docs.forgefirm.org/developers/building/)
|
||||||
* [Connecting LightBurn](https://docs.forgefirm.org/usage/lightburn/)
|
* [Connecting LightBurn](https://docs.forgefirm.org/usage/lightburn/)
|
||||||
|
|||||||
+3
-3
@@ -116,8 +116,8 @@ dev image (eMMC slot 1 = factory 2024, slot 2 = ForgeFIRM v0.1.0, archives in
|
|||||||
## Running the controller (grblHAL-glowforge on the board)
|
## Running the controller (grblHAL-glowforge on the board)
|
||||||
|
|
||||||
Source: the `grblHAL-glowforge` sibling repo — the **canonical grblHAL driver
|
Source: the `grblHAL-glowforge` sibling repo — the **canonical grblHAL driver
|
||||||
repo** (github.com/ScottW514/grblHAL-glowforge, branch `main`): core as a
|
repo** (github.com/openglow-org/grblHAL-glowforge, branch `main`): core as a
|
||||||
submodule at `src/grbl` (→ ScottW514/core fork, branch `forgefirm` = upstream
|
submodule at `src/grbl` (→ openglow-org/grblHAL-core fork, branch `forgefirm` = upstream
|
||||||
master plus one local commit, the `step_us_min` buffer sizing that keeps a
|
master plus one local commit, the `step_us_min` buffer sizing that keeps a
|
||||||
fortified build from aborting in `settings_init`; the settings-write crash fix
|
fortified build from aborting in `settings_init`; the settings-write crash fix
|
||||||
merged upstream 2026-08-04 as grblHAL/core PR #999). `driver.c` implements the
|
merged upstream 2026-08-04 as grblHAL/core PR #999). `driver.c` implements the
|
||||||
@@ -414,7 +414,7 @@ counters-only and painted red until anchored.
|
|||||||
|
|
||||||
## The machine-services daemon (forgectrl, port 8080)
|
## The machine-services daemon (forgectrl, port 8080)
|
||||||
|
|
||||||
Source: the `forgectrl` sibling repo (github.com/ScottW514/forgectrl, branch
|
Source: the `forgectrl` sibling repo (github.com/openglow-org/forgectrl, branch
|
||||||
`main`, MIT). It is the ForgeFIRM machine-services daemon: **controller-mode
|
`main`, MIT). It is the ForgeFIRM machine-services daemon: **controller-mode
|
||||||
supervision**, the **pulse-device broker**, the **motion-liveness gate**, the
|
supervision**, the **pulse-device broker**, the **motion-liveness gate**, the
|
||||||
**cooling engine** (single owner of fans/pump/TEC/heater for both modes), plus
|
**cooling engine** (single owner of fans/pump/TEC/heater for both modes), plus
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ repos:
|
|||||||
# Pinned-remote alternative for a fully self-contained clone (see the site,
|
# Pinned-remote alternative for a fully self-contained clone (see the site,
|
||||||
# Developers, "Release flow"):
|
# Developers, "Release flow"):
|
||||||
# meta-openglow:
|
# meta-openglow:
|
||||||
# url: https://github.com/ScottW514/meta-openglow.git
|
# url: https://github.com/openglow-org/meta-openglow.git
|
||||||
# branch: scarthgap # pin via kas lock / a tag at release
|
# branch: scarthgap # pin via kas lock / a tag at release
|
||||||
# path: layers/meta-openglow
|
# path: layers/meta-openglow
|
||||||
# layers:
|
# layers:
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
DESCRIPTION = "System Control Daemon for ForgeFIRM powered Glowforge"
|
DESCRIPTION = "System Control Daemon for ForgeFIRM powered Glowforge"
|
||||||
HOMEPAGE = "https://github.com/ScottW514/forgectrl"
|
HOMEPAGE = "https://github.com/openglow-org/forgectrl"
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=19ed4e3e8c28a4311c16b0b2b91357ec"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=19ed4e3e8c28a4311c16b0b2b91357ec"
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/ScottW514/forgectrl.git;protocol=https;branch=main"
|
SRC_URI = "git://github.com/openglow-org/forgectrl.git;protocol=https;branch=main"
|
||||||
# SRCREV and PV live in the pin file (forgefirm-image-manifest.bbclass).
|
# SRCREV and PV live in the pin file (forgefirm-image-manifest.bbclass).
|
||||||
require forgectrl-pin.inc
|
require forgectrl-pin.inc
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Shared fetch for the ForgeFIRM web-service apps (gfhome, python3-ffmachine,
|
# Shared fetch for the ForgeFIRM web-service apps (gfhome, python3-ffmachine,
|
||||||
# gfcloud). Their sources live in the forgefirm-app/ directory of the
|
# gfcloud). Their sources live in the forgefirm-app/ directory of the
|
||||||
# python3-gfhardware repository.
|
# python3-gfhardware repository.
|
||||||
HOMEPAGE = "https://github.com/ScottW514/python3-gfhardware"
|
HOMEPAGE = "https://github.com/openglow-org/python3-gfhardware"
|
||||||
|
|
||||||
# These packages ship only the Python apps under forgefirm-app/, all MIT. The
|
# These packages ship only the Python apps under forgefirm-app/, all MIT. The
|
||||||
# repository's LGPL component (the Bayer decoder compiled into
|
# repository's LGPL component (the Bayer decoder compiled into
|
||||||
@@ -9,7 +9,7 @@ HOMEPAGE = "https://github.com/ScottW514/python3-gfhardware"
|
|||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=62f8bb455fcc4bf177ecab380f71cd5d"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=62f8bb455fcc4bf177ecab380f71cd5d"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/ScottW514/python3-gfhardware.git;protocol=https;branch=master"
|
SRC_URI = "git://github.com/openglow-org/python3-gfhardware.git;protocol=https;branch=master"
|
||||||
# SRCREV and PV live in the pin file (forgefirm-image-manifest.bbclass).
|
# SRCREV and PV live in the pin file (forgefirm-image-manifest.bbclass).
|
||||||
require forgefirm-app-pin.inc
|
require forgefirm-app-pin.inc
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ DESCRIPTION = "Runs the release acceptance catalog against the machine from a \
|
|||||||
self-contained web page (HTTP :8090), keeps the append-only result log under \
|
self-contained web page (HTTP :8090), keeps the append-only result log under \
|
||||||
/data/forgetest, exports the release artifact the release gate reads, and \
|
/data/forgetest, exports the release artifact the release gate reads, and \
|
||||||
carries the bench diagnostics page. Installed only on the dev image."
|
carries the bench diagnostics page. Installed only on the dev image."
|
||||||
HOMEPAGE = "https://github.com/ScottW514/forgefirm"
|
HOMEPAGE = "https://github.com/openglow-org/forgefirm"
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
DESCRIPTION = "grblHAL motion controller for the Glowforge factory board"
|
DESCRIPTION = "grblHAL motion controller for the Glowforge factory board"
|
||||||
HOMEPAGE = "https://github.com/ScottW514/grblHAL-glowforge"
|
HOMEPAGE = "https://github.com/openglow-org/grblHAL-glowforge"
|
||||||
|
|
||||||
LICENSE = "GPL-3.0-or-later"
|
LICENSE = "GPL-3.0-or-later"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3237e48bcef3455c7bea5c0ce16206f6"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=3237e48bcef3455c7bea5c0ce16206f6"
|
||||||
|
|
||||||
# gitsm: the grblHAL core rides as a submodule (ScottW514/core, branch
|
# gitsm: the grblHAL core rides as a submodule (openglow-org/grblHAL-core, branch
|
||||||
# forgefirm = upstream master + the step_us_min buffer fix pending
|
# forgefirm = upstream master + the step_us_min buffer fix pending
|
||||||
# upstream).
|
# upstream).
|
||||||
SRC_URI = "gitsm://github.com/ScottW514/grblHAL-glowforge.git;protocol=https;branch=main"
|
SRC_URI = "gitsm://github.com/openglow-org/grblHAL-glowforge.git;protocol=https;branch=main"
|
||||||
# SRCREV and PV live in the pin file (forgefirm-image-manifest.bbclass).
|
# SRCREV and PV live in the pin file (forgefirm-image-manifest.bbclass).
|
||||||
require grblhal-glowforge-pin.inc
|
require grblhal-glowforge-pin.inc
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ SHARED = ("theme.css", "vendor/bootstrap.min.css", "vendor/bootstrap.bundle.min.
|
|||||||
"vendor/LICENSE")
|
"vendor/LICENSE")
|
||||||
FORGETEST_UI = os.path.join(REPO, "forgetest", "forgetest", "ui")
|
FORGETEST_UI = os.path.join(REPO, "forgetest", "forgetest", "ui")
|
||||||
PIN = os.path.join(REPO, "meta-forgefirm", "recipes-forgefirm", "forgectrl", "forgectrl-pin.inc")
|
PIN = os.path.join(REPO, "meta-forgefirm", "recipes-forgefirm", "forgectrl", "forgectrl-pin.inc")
|
||||||
RAW = "https://raw.githubusercontent.com/ScottW514/forgectrl/%s/src/ui/%s"
|
RAW = "https://raw.githubusercontent.com/openglow-org/forgectrl/%s/src/ui/%s"
|
||||||
|
|
||||||
|
|
||||||
def pinned_rev():
|
def pinned_rev():
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
# Usage: install-forgefirm.sh [local-forgefirm.fw]
|
# Usage: install-forgefirm.sh [local-forgefirm.fw]
|
||||||
# With no argument the latest release .fw is downloaded from GitHub.
|
# With no argument the latest release .fw is downloaded from GitHub.
|
||||||
|
|
||||||
RELEASE_FW_URL="https://github.com/ScottW514/forgefirm/releases/latest/download/forgefirm.fw"
|
RELEASE_FW_URL="https://github.com/openglow-org/forgefirm/releases/latest/download/forgefirm.fw"
|
||||||
ARCHIVE_DIR="/data/forgefirm/archive"
|
ARCHIVE_DIR="/data/forgefirm/archive"
|
||||||
FW_FILE="/data/forgefirm/forgefirm.fw"
|
FW_FILE="/data/forgefirm/forgefirm.fw"
|
||||||
MIN_DATA_FREE_KB=300000
|
MIN_DATA_FREE_KB=300000
|
||||||
|
|||||||
+2
-2
@@ -229,14 +229,14 @@ Pre-publish checklist (docs.forgefirm.org, Developers, "Release flow"):
|
|||||||
|
|
||||||
Publish (from a directory with an authenticated gh):
|
Publish (from a directory with an authenticated gh):
|
||||||
cd "$STAGE"
|
cd "$STAGE"
|
||||||
gh release create "v$VERSION" --repo ScottW514/forgefirm \\
|
gh release create "v$VERSION" --repo openglow-org/forgefirm \\
|
||||||
--title "ForgeFIRM v$VERSION" --generate-notes \\
|
--title "ForgeFIRM v$VERSION" --generate-notes \\
|
||||||
$ASSETS
|
$ASSETS
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [ "$PUBLISH" = "1" ]; then
|
if [ "$PUBLISH" = "1" ]; then
|
||||||
command -v gh >/dev/null || die "--publish requested but gh is not on PATH"
|
command -v gh >/dev/null || die "--publish requested but gh is not on PATH"
|
||||||
( cd "$STAGE" && gh release create "v$VERSION" --repo ScottW514/forgefirm \
|
( cd "$STAGE" && gh release create "v$VERSION" --repo openglow-org/forgefirm \
|
||||||
--title "ForgeFIRM v$VERSION" --generate-notes \
|
--title "ForgeFIRM v$VERSION" --generate-notes \
|
||||||
$ASSETS ) \
|
$ASSETS ) \
|
||||||
|| die "gh release create failed"
|
|| die "gh release create failed"
|
||||||
|
|||||||
Reference in New Issue
Block a user