From aa171e36dae7e78a7ee72ba3c298d2a36872f259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20=22xq=22=20Quei=C3=9Fner?= Date: Sat, 7 Jun 2025 00:48:51 +0200 Subject: [PATCH 01/22] Fixes CI --- .github/workflows/staging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 947fdd3..c482b98 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -30,16 +30,16 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v5 - - uses: robinraju/release-downloader@v1 + - name: Install Zine + uses: robinraju/release-downloader@v1 with: repository: 'kristoff-it/zine' tag: 'v0.10.2' fileName: 'x86_64-linux-musl.tar.xz' - extract: true - name: Render run: | - ls + tar -xf ./x86_64-linux-musl.tar.xz ./zine release - name: Upload artifact From 2aee3322a6146c7100c0636d5306f07cdca94462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20=22xq=22=20Quei=C3=9Fner?= Date: Sat, 7 Jun 2025 00:54:09 +0200 Subject: [PATCH 02/22] Fixes deployment URL not being determined by CI script --- .github/workflows/staging.yml | 18 +++++++++++++++++- zine.ziggy | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index c482b98..c267682 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -37,9 +37,25 @@ jobs: tag: 'v0.10.2' fileName: 'x86_64-linux-musl.tar.xz' + - name: Extract Zine + run: tar -xf ./x86_64-linux-musl.tar.xz + + - name: Patch URL + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + url=$(gh api "repos/$GITHUB_REPOSITORY/pages" --jq '.html_url') + echo "url = '${url}'" + host="$(echo $url | cut -d / -f 1-3)" + prefix="$(echo $url | cut -d / -f 4-)" + echo "host = '${host}'" + echo "prefix = '${prefix}'" + sed -is "s|.host_url = \".*\"|.host_url = \"${host}\"|" ./zine.ziggy + sed -is "s|.url_path_prefix = \".*\"|.url_path_prefix = \"${prefix}\"|" ./zine.ziggy + cat zine.ziggy + - name: Render run: | - tar -xf ./x86_64-linux-musl.tar.xz ./zine release - name: Upload artifact diff --git a/zine.ziggy b/zine.ziggy index 40ca13f..fa248cd 100644 --- a/zine.ziggy +++ b/zine.ziggy @@ -1,6 +1,7 @@ Site { .title = "Ashet Home Computer", .host_url = "https://ashet.computer", + .url_path_prefix = "", .content_dir_path = "content", .layouts_dir_path = "layouts", .assets_dir_path = "assets", From 28176cd840df7d8f159900aefc446b765f73fe96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20=22xq=22=20Quei=C3=9Fner?= Date: Sun, 8 Jun 2025 14:52:08 +0200 Subject: [PATCH 03/22] Fixes several review comments --- assets/css/style.css | 56 ++++++++++++++++++++++++++++++++---- content/about.smd | 17 +++++++---- content/hardware.smd | 11 +++---- layouts/frontpage.shtml | 2 +- layouts/templates/base.shtml | 8 ++++++ 5 files changed, 77 insertions(+), 17 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 80ae0c5..cb6a9ec 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -32,6 +32,7 @@ nav { padding: 0.25rem; padding-top: 0; margin-bottom: 1rem; + flex-direction: row; } nav a { @@ -43,6 +44,7 @@ nav a { nav a.selected { background: gray; + color: white; text-decoration: none; } @@ -56,6 +58,35 @@ nav a.primary.selected { color: white; } +nav .menubtn { + display: none; + height: 2rem; + min-width: 2rem; +} + +nav .menubtn input { + display: none; +} + +nav .menubtn svg { + width: 2rem; + height: 2rem; +} + + +@media (width < 40rem) { + nav { + flex-direction: column; + } + + nav .menubtn { + display: block; + } + + nav:has(:checked) a { + display: none; + } +} h1 { text-align: center; @@ -172,14 +203,29 @@ table { } .gallery { - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: 25% 25% 25% 25%; +} + +@media (width < 40rem) { + .gallery { + grid-template-columns: 33% 33% 33%; + } +} + +@media (width < 25rem) { + .gallery { + grid-template-columns: 50% 50%; + } +} + +@media (width > 60rem) { + .gallery { + grid-template-columns: 20% 20% 20% 20% 20%; + } } .gallery .gallery-item { - flex: 0; - min-width: 25%; - max-width: 25%; padding: 0.25rem; position: relative; } diff --git a/content/about.smd b/content/about.smd index d76d38f..dcdf6a4 100644 --- a/content/about.smd +++ b/content/about.smd @@ -19,11 +19,13 @@ and capability, providing everything necessary for daily computing tasks without - **Fully Hackable and Understandable** \ Every aspect of the system is transparent, well-documented, and designed for exploration and customization. -- **Daily Computing Ready** \ - Suitable for everyday tasks: +- **Daily Computing Possible** \ + Suitable for (simple) everyday tasks: - Desktop OS with intuitive GUI - - Internet browsing (limited to essential, not overly complex web content) - - Text document reading and writing + - Text document reading and writing (plaintext, no WYSIWIG) + - Internet browsing (limited to HTML and basic CSS, no JavaScript) + - E-Mail reading and writing + - Chatting (IRC) - Built-in comprehensive system documentation - Programming with interpreted languages can be done on the system itself - Programming with compiled languages should be done externally @@ -40,6 +42,9 @@ and capability, providing everything necessary for daily computing tasks without This vision ensures that users at all skill levels -- from learners and hobbyists to seasoned developers -- can fully grasp, modify, and expand their home computing experience. +The idea behind the *Daily Computing* aspect is to show that most of these tasks do not require incredibly powerful +hardware but could and still can done on small, low-power machines. + ## [Audience]($section.id('audience')) **Makers** @@ -52,7 +57,7 @@ Ideal for tech enthusiasts and hardware hackers who appreciate full hardware tra **Demosceners** -With its limited, yet powerful audio and video capabilities and ten-core processing, Ashet supports artists pushing creative and technical limits, producing visually and sonically compelling real-time demonstrations. +With its limited, yet powerful audio and video capabilities and multi-core processing, Ashet supports artists pushing creative and technical limits, producing visually and sonically compelling real-time demonstrations. **Educators** @@ -76,7 +81,7 @@ The following table shows a comparison to other "small" computers. It should hel |---------------------|---------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|---------------------------------------------------------------------|---------------------------------------------------------| | CPU Bus Width | 32 bit | 64 bit | 8 bit | 32 bit | 8 bit | | CPU Architecture | Arm Cortex-M33 | Arm Cortex-A72 | AVR | Arm Cortex-M0+ | 6502 | -| CPU Model | [Rapsberry Pi RP2350](https://www.raspberrypi.com/products/rp2350/) | [Broadcom BCM2711](https://www.raspberrypi.com/documentation/computers/processors.html#bcm2711) | [ATmega328P](https://www.microchip.com/en-us/product/atmega328p) | [Rapsberry Pi RP2040](https://www.raspberrypi.com/products/rp2040/) | [W65C02S](https://wdc65xx.com/integrated-circuit) | +| CPU Model | [Raspberry Pi RP2350](https://www.raspberrypi.com/products/rp2350/) | [Broadcom BCM2711](https://www.raspberrypi.com/documentation/computers/processors.html#bcm2711) | [ATmega328P](https://www.microchip.com/en-us/product/atmega328p) | [Raspberry Pi RP2040](https://www.raspberrypi.com/products/rp2040/) | [W65C02S](https://wdc65xx.com/integrated-circuit) | | CPU Cores | 2 | 4 | 1 | 2 | 1 | | CPU Clock | 150 MHz | 1.8 GHz | 16 MHz | 133 MHz | 1 MHz | | System Memory | 8.5 MB | 1, 2, 4 or 8 GB | 2 KB | 264 kB | 64 kB | diff --git a/content/hardware.smd b/content/hardware.smd index 05f994c..b8e600d 100644 --- a/content/hardware.smd +++ b/content/hardware.smd @@ -40,9 +40,10 @@ The computer follows a modular design similar to a PC where you have expansion c These features are available no matter what expansion cards you have installed. -- [RP2350 Core](https://www.raspberrypi.com/products/rp2350/) - - Dual-Core System - - Each Core Might Be +- [RP2350](https://www.raspberrypi.com/products/rp2350/) Main SOC + - 150 MHz + - Dual-Socket Architecture + - Each socket can be either a - Arm CPU (Cortex-M33, 150 MHz) - RISC-V CPU (RV32IMAC+, 150 MHz) - 8.5 MB RAM @@ -54,8 +55,8 @@ These features are available no matter what expansion cards you have installed. - Battery-Backed Real-Time Clock - Integrated Debug Probe - 7 Expansion Slots - - 1 Video Expansion Slot - - 1 Audio Expansion Slot + - 1 Generic + Video Expansion Slot + - 1 Generic + Audio Expansion Slot - 5 Generic Expansion Slots ### Standard Expansion Cards diff --git a/layouts/frontpage.shtml b/layouts/frontpage.shtml index f667128..ca63eb1 100644 --- a/layouts/frontpage.shtml +++ b/layouts/frontpage.shtml @@ -66,7 +66,7 @@
  • Dual Core CPU with 150 MHz
  • 16 MB Flash
    • -
  • 8.5 MB RAM
    • +
  • 8 MB RAM
  • Modern Connectivity (USB, Ethernet, DVI)
diff --git a/layouts/templates/base.shtml b/layouts/templates/base.shtml index 40b32fb..4be2e97 100644 --- a/layouts/templates/base.shtml +++ b/layouts/templates/base.shtml @@ -13,6 +13,14 @@