diff --git a/config.yaml b/config.yaml
index 4235ab1..efddc88 100644
--- a/config.yaml
+++ b/config.yaml
@@ -21,3 +21,4 @@ params:
BookRepo: https://git.freifunk-franken.de/freifunk-franken/docs
BookEditPath: _edit/master
BookDateFormat: 2006-01-02
+ FirmwareVersion: 20221201
diff --git a/content/hardware/test.md b/content/hardware/test.md
index a5044a5..520ff9b 100644
--- a/content/hardware/test.md
+++ b/content/hardware/test.md
@@ -11,6 +11,15 @@ hardware:
clock: 880
ram: 252312
flash: 262144
+ firmware:
+ - type: factory
+ usage: Erstinstalltion über Stock Firmware
+ fragmentL3: netgear_r6220-factory.img
+ fragmentNode: netgear_r6220-factory.img
+ - type: sysupgrade
+ usage: Installation und Update aus OpenWrt oder Freifunk Firmware
+ fragmentL3: netgear_r6220-sysupgrade.bin
+ fragmentNode: netgear_r6220-sysupgrade.bin
serial:
- ttl
interface:
diff --git a/layouts/shortcodes/detailsofhardware.html b/layouts/shortcodes/detailsofhardware.html
index 34a55a7..eb988c3 100644
--- a/layouts/shortcodes/detailsofhardware.html
+++ b/layouts/shortcodes/detailsofhardware.html
@@ -2,36 +2,38 @@
Datenblatt
{{ with $hw }}
-
- Bezeichnung |
- {{ .manufacturer }} {{ .model }} |
-
-
- Empfohlen |
- {{ cond .recommended (emojify ":heavy_check_mark:") (emojify ":x:") }} |
-
-
- SoC |
- {{ .chip }} |
-
-
- CPU |
- {{ .cores }} Core {{ .threads }} Threads @ {{ .clock }} MHz |
-
-
- RAM |
- {{ div .ram 1024 }}MiB |
-
-
- Flash |
- {{ div .flash 1024 }}MiB |
-
- {{ with .serial }}
+
- Serielle Schnittstelle |
- {{ delimit . ", " }} |
+ Bezeichnung |
+ {{ .manufacturer }} {{ .model }} |
- {{ end }}
+
+ Empfohlen |
+ {{ cond .recommended (emojify ":heavy_check_mark:") (emojify ":x:") }} |
+
+
+ SoC |
+ {{ .chip }} |
+
+
+ CPU |
+ {{ .cores }} Core {{ .threads }} Threads @ {{ .clock }} MHz |
+
+
+ RAM |
+ {{ div .ram 1024 }}MiB |
+
+
+ Flash |
+ {{ div .flash 1024 }}MiB |
+
+ {{ with .serial }}
+
+ Serielle Schnittstelle |
+ {{ delimit . ", " }} |
+
+ {{ end }}
+
{{ end }}
{{ with $hw.interface }}
@@ -40,50 +42,54 @@
{{ with $wired }}
Kabelgebunden
-
- |
- {{ range . -}}
- {{ .dev }} |
+
+
+ |
+ {{ range . -}}
+ {{ .dev }} |
+ {{ end }}
+
+
+
+
+ Typ |
+ {{ range . -}}
+ {{ .speed }}Mbps {{ .type | upper }} |
+ {{ end }}
+
+ {{ if where . ".features" "intersect" (slice "24V" "802.3af" "802.3at" "PD") }}
+
+ PoE |
+ {{ range . -}}
+ {{ delimit (intersect .features (slice "24V" "802.3af" "802.3at" "PD")) ", " }} |
+ {{ end }}
+
{{ end }}
-
-
- Typ |
- {{ range . -}}
- {{ .speed }}Mbps {{ .type | upper }} |
+ {{ if where . ".features" "intersect" (slice "dsa") }}
+
+ DSA Port |
+ {{ range . -}}
+ {{ cond (in .features "dsa") (emojify ":heavy_check_mark:") "" }} |
+ {{ end }}
+
{{ end }}
-
- {{ if where . ".features" "intersect" (slice "24V" "802.3af" "802.3at" "PD") }}
-
- PoE |
- {{ range . -}}
- {{ delimit (intersect .features (slice "24V" "802.3af" "802.3at" "PD")) ", " }} |
- {{ end }}
-
- {{ end }}
- {{ if where . ".features" "intersect" (slice "dsa") }}
-
- DSA Port |
- {{ range . -}}
- {{ cond (in .features "dsa") (emojify ":heavy_check_mark:") "" }} |
- {{ end }}
-
- {{ end }}
- {{ if where . "roleL3" "!=" nil }}
-
- Belegung L3 |
- {{ range . -}}
- {{ echoParam . "roleL3" }} |
- {{ end }}
-
- {{ end }}
- {{ if where . "roleNode" "!=" nil }}
-
- Belegung Node |
- {{ range . -}}
- {{ echoParam . "roleNode" }} |
- {{ end }}
-
- {{ end }}
+ {{ if where . "roleL3" "!=" nil }}
+
+ Belegung L3 |
+ {{ range . -}}
+ {{ echoParam . "roleL3" }} |
+ {{ end }}
+
+ {{ end }}
+ {{ if where . "roleNode" "!=" nil }}
+
+ Belegung Node |
+ {{ range . -}}
+ {{ echoParam . "roleNode" }} |
+ {{ end }}
+
+ {{ end }}
+
{{ end }}
@@ -91,44 +97,91 @@
{{ with $wireless }}
Wireless
-
- |
- {{ range . -}}
- {{ .dev }} |
+
+
+ |
+ {{ range . -}}
+ {{ .dev }} |
+ {{ end }}
+
+
+
+ {{ if where . ".features" "intersect" (slice "bg" "n" "ac" "ax") }}
+
+ Standard |
+ {{ range . -}}
+ {{ delimit (intersect .features (slice "bg" "n" "ac" "ax")) ", " }} |
+ {{ end }}
+
{{ end }}
-
- {{ if where . ".features" "intersect" (slice "bg" "n" "ac" "ax") }}
-
- Standard |
- {{ range . -}}
- {{ delimit (intersect .features (slice "bg" "n" "ac" "ax")) ", " }} |
- {{ end }}
-
- {{ end }}
- {{ if where . ".speed" "!=" nil }}
-
- Datenrate |
- {{ range . -}}
- {{ echoParam . "speed" }} Mbit/s |
- {{ end }}
-
- {{ end }}
+ {{ if where . ".speed" "!=" nil }}
+
+ Datenrate |
+ {{ range . -}}
+ {{ echoParam . "speed" }} Mbit/s |
+ {{ end }}
+
+ {{ end }}
+
{{ end }}
{{ end }}
{{ with $hw.benchmark }}
Benchmarks
-
- Benchmark |
- Messung |
-
- {{ range $b, $m := . }}
+
- {{ $b }} |
- {{ $m }} |
+ Benchmark |
+ Messung |
- {{ end }}
+
+
+ {{ range $b, $m := . }}
+
+ {{ $b }} |
+ {{ $m }} |
+
+ {{ end }}
+
+
+{{ end }}
+
+{{ with $hw.firmware }}
+ Firmware Download
+ {{ range . }}
+ {{ .usage }} - "{{ .type }}"
+
+ {{ end }}
+{{ end }}
+
+{{ with $hw.firmware }}
+ Firmware Download
+
{{ end }}