Merge pull request #17 from evcc-io/chore/rpi_image_name

Rename raspberry image: rpi4b > rpi

Author: naltatis

.github/workflows/release.yml

@@ -16,7 +16,7 @@ on:
         type: choice
         options:
           - all
-          - rpi4b
+          - rpi
           - nanopi-r3s
       draft:
         description: "Create as draft release for testing"
@@ -42,12 +42,12 @@ jobs:
         run: |
           # For scheduled runs, build all boards
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            MATRIX='["rpi4b","nanopi-r3s"]'
+            MATRIX='["rpi","nanopi-r3s"]'
           else
             choice='${{ inputs.board }}'
             case "$choice" in
-              all)      MATRIX='["rpi4b","nanopi-r3s"]' ;;
-              rpi4b)    MATRIX='["rpi4b"]' ;;
+              all)      MATRIX='["rpi","nanopi-r3s"]' ;;
+              rpi) MATRIX='["rpi"]' ;;
               nanopi-r3s) MATRIX='["nanopi-r3s"]' ;;
               *) echo "Unknown board: $choice" >&2; exit 1 ;;
             esac
@@ -148,7 +148,7 @@ jobs:
         with:
           upload_url: ${{ needs.prepare.outputs.release_upload_url }}
           asset_path: ${{ steps.find-files.outputs.img_zip }}
-          asset_name: armbian_evcc-${{ needs.prepare.outputs.release_name }}_${{ matrix.board }}.img.zip
+          asset_name: evcc_${{ needs.prepare.outputs.release_name }}_${{ matrix.board }}.img.zip
           asset_content_type: application/zip
 
       - name: Upload SHA file to release
@@ -158,7 +158,7 @@ jobs:
         with:
           upload_url: ${{ needs.prepare.outputs.release_upload_url }}
           asset_path: ${{ steps.find-files.outputs.sha_file }}
-          asset_name: armbian_evcc-${{ needs.prepare.outputs.release_name }}_${{ matrix.board }}.img.sha
+          asset_name: evcc_${{ needs.prepare.outputs.release_name }}_${{ matrix.board }}.img.sha
           asset_content_type: text/plain
 
       - name: Upload TXT file to release
@@ -168,5 +168,5 @@ jobs:
         with:
           upload_url: ${{ needs.prepare.outputs.release_upload_url }}
           asset_path: ${{ steps.find-files.outputs.txt_file }}
-          asset_name: armbian_evcc-${{ needs.prepare.outputs.release_name }}_${{ matrix.board }}.img.txt
+          asset_name: evcc_${{ needs.prepare.outputs.release_name }}_${{ matrix.board }}.img.txt
           asset_content_type: text/plain

README.md

@@ -36,16 +36,15 @@ For more detailed instructions, see the [full documentation](https://docs.evcc.i
 
 ## Supported Boards
 
-| Name                                                                                      | Tested | WiFi     | Storage   | Image Name                                                 | Instructions                                                                                      |
-| ----------------------------------------------------------------------------------------- | ------ | -------- | --------- | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| [Raspberry Pi 5](https://www.raspberrypi.com/products/raspberry-pi-5/)                    | ✅     | Built-in | SD only   | [`rpi4b`](https://github.com/evcc-io/images/releases)      | see above                                                                                         |
-| [Raspberry Pi 4](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/)            | ✅     | Built-in | SD only   | [`rpi4b`](https://github.com/evcc-io/images/releases)      | see above                                                                                         |
-| [Raspberry Pi 3b](https://www.raspberrypi.com/products/raspberry-pi-3-model-b/)           | ✅     | Built-in | SD only   | [`rpi4b`](https://github.com/evcc-io/images/releases)      | see above                                                                                         |
-| [Raspberry Pi Zero 2 W](https://www.raspberrypi.com/products/raspberry-pi-zero-2-w/)      | ✅     | Built-in | SD only   | [`rpi4b`](https://github.com/evcc-io/images/releases)      | see above                                                                                         |
-| [NanoPi R3S](https://www.friendlyelec.com/index.php?route=product/product&product_id=311) | ✅     | via USB  | eMMC & SD | [`nanopi-r3s`](https://github.com/evcc-io/images/releases) | see above, [then copy to eMMC](https://docs.armbian.com/User-Guide_Getting-Started/#installation) |
+- **Raspberry Pi 4, 5, 3B+, Zero 2W**
+  - Image: [evcc\_[version]\_rpi.img.zip](https://github.com/evcc-io/images/releases)
+  - WiFi setup: supported
+  - Storage: SD Card
 
-✅ tested<br/>
-⚠️ untested (but should work)
+- **NanoPi R3S**
+  - Image: [evcc\_[version]\_nanopi-r3s.img.zip](https://github.com/evcc-io/images/releases)
+  - WiFi setup: via USB adapter ([see below](#network-recommendations))
+  - Storage: SD or eMMC ([see instructions](https://docs.armbian.com/User-Guide_Getting-Started/#installation))
 
 ## Available Services
 
@@ -173,10 +172,10 @@ git clone https://github.com/evcc-io/images.git
 cd images
 
 # Build for Raspberry Pi
-./build-local.sh --board rpi4b
+./build-local.sh --board rpi
 ```
 
-The image will be at `dist/armbian_evcc-local_rpi4b.img.zip`.
+The image will be at `dist/evcc_local_rpi.img.zip`.
 
 ## Contributing
 

build-local.sh

@@ -17,14 +17,14 @@ Usage: $0 --board <board>
 Build evcc images locally using Docker (mimics GitHub Actions workflow)
 
 Arguments:
-  --board <board>      Target board (rpi4b, nanopi-r3s)
+  --board <board>      Target board (rpi, nanopi-r3s)
 
 Examples:
-  ./build-local.sh --board rpi4b
+  ./build-local.sh --board rpi
   ./build-local.sh --board nanopi-r3s
 
 Supported boards:
-  - rpi4b        Raspberry Pi 4B
+  - rpi          Raspberry Pi
   - nanopi-r3s   NanoPi R3S
 
 EOF
@@ -57,12 +57,12 @@ check_requirements() {
 
 validate_board() {
   case "$BOARD" in
-    rpi4b|nanopi-r3s)
+    rpi|nanopi-r3s)
       echo "✅ Board '$BOARD' is supported"
       ;;
     *)
       echo "❌ Unsupported board: '$BOARD'"
-      echo "Supported boards: rpi4b, nanopi-r3s"
+      echo "Supported boards: rpi, nanopi-r3s"
       exit 1
       ;;
   esac

rpi-imager.json

@@ -5,7 +5,7 @@
       "description": "open source solar EV charging and smart heating",
       "version": "2026-01.1",
       "release_date": "2026-01-05",
-      "url": "https://github.com/evcc-io/images/releases/download/v2026-01.1/armbian_evcc-2026-01.1_rpi4b.img.zip",
+      "url": "https://github.com/evcc-io/images/releases/download/v2026-01.1/evcc_2026-01.1_rpi.img.zip",
       "extract_size": 3070230528,
       "extract_sha256": "1343fdd672e1be72ac885d8fc03b365c1af61936891d6149706a03dddec613ca",
       "image_download_size": 739199004,

scripts/build-armbian.sh

@@ -14,13 +14,13 @@ RELEASE_NAME="local"
 
 usage() {
   cat <<EOF
-Usage: $0 --board <armbian-board> [--release-name <name>]
+Usage: $0 --board <board> [--release-name <name>]
 
 Examples:
-  $0 --board rpi4b
+  $0 --board rpi
   $0 --board nanopi-r3s --release-name 2025-01
 
-Supported boards are those supported by Armbian mainline (e.g. rpi4b, nanopi-r3s).
+Supported boards: rpi, nanopi-r3s
 EOF
 }
 
@@ -39,6 +39,12 @@ if [[ -z "$BOARD" ]]; then
   exit 2
 fi
 
+# Map user-facing board names to Armbian internal board names
+case "$BOARD" in
+  rpi) ARMBIAN_BOARD="rpi4b" ;;
+  *) ARMBIAN_BOARD="$BOARD" ;;
+esac
+
 mkdir -p "$REPO_ROOT/dist" "$REPO_ROOT/logs"
 
 # Prepare a temporary userpatches with variables passed to customize-image.sh
@@ -64,7 +70,7 @@ ENV
 cp -a "$REPO_ROOT/userpatches/." "$BUILDTMP/userpatches/"
 chmod +x "$BUILDTMP/userpatches/customize-image.sh" || true
 
-IMAGE_OUT_DIR="$REPO_ROOT/dist/${BOARD}"
+IMAGE_OUT_DIR="$REPO_ROOT/dist/${ARMBIAN_BOARD}"
 mkdir -p "$IMAGE_OUT_DIR"
 
 # Clone Armbian build framework and run it in Docker mode (it will build its own container image).
@@ -80,7 +86,7 @@ git clone --depth=1 --branch v25.11.1 https://github.com/armbian/build.git "$BUI
 rm -rf "$BUILD_DIR/userpatches"
 cp -a "$BUILDTMP/userpatches" "$BUILD_DIR/userpatches"
 
-echo "Starting build for board=${BOARD} release=bookworm release_name=${RELEASE_NAME} using Armbian build"
+echo "Starting build for board=${ARMBIAN_BOARD} (${BOARD}) release=bookworm release_name=${RELEASE_NAME} using Armbian build"
 
 pushd "$BUILD_DIR" >/dev/null
   EXPERT=yes \
@@ -92,7 +98,7 @@ pushd "$BUILD_DIR" >/dev/null
   VENDORURL="https://evcc.io" \
   IMAGE_SUFFIX="evcc-${RELEASE_NAME}" \
   ./compile.sh \
-    BOARD="$BOARD" \
+    BOARD="$ARMBIAN_BOARD" \
     BRANCH=current \
     RELEASE="bookworm" \
     BUILD_MINIMAL=no \
@@ -108,18 +114,18 @@ if compgen -G "$BUILD_DIR/output/images/*" > /dev/null; then
   cp -a "$BUILD_DIR/output/images/"* "$IMAGE_OUT_DIR/"
 fi
 
-# Rename outputs to armbian_evcc-[release-name]_[board].img[...]
+# Rename outputs to evcc_[release-name]_[board].img[...]
 shopt -s nullglob
 for f in "$IMAGE_OUT_DIR"/Armbian-*; do
   base_ext="${f##*.}"
   if [[ "$f" == *.img ]]; then
-    mv -f "$f" "$IMAGE_OUT_DIR/armbian_evcc-${RELEASE_NAME}_${BOARD}.img"
+    mv -f "$f" "$IMAGE_OUT_DIR/evcc_${RELEASE_NAME}_${BOARD}.img"
   elif [[ "$f" == *.img.sha ]]; then
-    mv -f "$f" "$IMAGE_OUT_DIR/armbian_evcc-${RELEASE_NAME}_${BOARD}.img.sha"
+    mv -f "$f" "$IMAGE_OUT_DIR/evcc_${RELEASE_NAME}_${BOARD}.img.sha"
   elif [[ "$f" == *.img.txt ]]; then
-    mv -f "$f" "$IMAGE_OUT_DIR/armbian_evcc-${RELEASE_NAME}_${BOARD}.img.txt"
+    mv -f "$f" "$IMAGE_OUT_DIR/evcc_${RELEASE_NAME}_${BOARD}.img.txt"
   elif [[ "$f" == *.img.zip ]]; then
-    mv -f "$f" "$IMAGE_OUT_DIR/armbian_evcc-${RELEASE_NAME}_${BOARD}.img.zip"
+    mv -f "$f" "$IMAGE_OUT_DIR/evcc_${RELEASE_NAME}_${BOARD}.img.zip"
   fi
 done
 shopt -u nullglob

scripts/rpi-imager/update.sh

@@ -35,9 +35,9 @@ fi
 RELEASE_DATE=$(echo "$RELEASE_INFO" | jq -r '.publishedAt' | cut -d'T' -f1)
 VERSION=$(echo "$LATEST_RELEASE" | sed 's/^v//')
 
-# Find the rpi4b image (which works on RPi 3, 4, and 5)
-RPI_IMAGE_ZIP=$(echo "$RELEASE_INFO" | jq -r '.assets[] | select(.name | contains("rpi4b") and contains(".img.zip")) | .name')
-RPI_IMAGE_SHA=$(echo "$RELEASE_INFO" | jq -r '.assets[] | select(.name | contains("rpi4b") and contains(".img.sha")) | .name')
+# Find the rpi image (which works on RPi 3, 4, and 5)
+RPI_IMAGE_ZIP=$(echo "$RELEASE_INFO" | jq -r '.assets[] | select(.name | contains("_rpi") and contains(".img.zip")) | .name')
+RPI_IMAGE_SHA=$(echo "$RELEASE_INFO" | jq -r '.assets[] | select(.name | contains("_rpi") and contains(".img.sha")) | .name')
 
 if [ -z "$RPI_IMAGE_ZIP" ] || [ -z "$RPI_IMAGE_SHA" ]; then
     echo "RPi image not found in release"