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 }} - - - - - - - - - - - - - - - - - - - - - - - - - {{ with .serial }} + - - + + - {{ end }} + + + + + + + + + + + + + + + + + + + + + {{ with .serial }} + + + + + {{ end }} +
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
Serielle Schnittstelle{{ delimit . ", " }}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
Serielle Schnittstelle{{ delimit . ", " }}
{{ end }} {{ with $hw.interface }} @@ -40,50 +42,54 @@ {{ with $wired }}

Kabelgebunden

- - - {{ range . -}} - + + + + {{ range . -}} + + {{ end }} + + + + + + {{ range . -}} + + {{ end }} + + {{ if where . ".features" "intersect" (slice "24V" "802.3af" "802.3at" "PD") }} + + + {{ range . -}} + + {{ end }} + {{ end }} - - - - {{ range . -}} - + {{ if where . ".features" "intersect" (slice "dsa") }} + + + {{ range . -}} + + {{ end }} + {{ end }} - - {{ if where . ".features" "intersect" (slice "24V" "802.3af" "802.3at" "PD") }} - - - {{ range . -}} - - {{ end }} - - {{ end }} - {{ if where . ".features" "intersect" (slice "dsa") }} - - - {{ range . -}} - - {{ end }} - - {{ end }} - {{ if where . "roleL3" "!=" nil }} - - - {{ range . -}} - - {{ end }} - - {{ end }} - {{ if where . "roleNode" "!=" nil }} - - - {{ range . -}} - - {{ end }} - - {{ end }} + {{ if where . "roleL3" "!=" nil }} + + + {{ range . -}} + + {{ end }} + + {{ end }} + {{ if where . "roleNode" "!=" nil }} + + + {{ range . -}} + + {{ end }} + + {{ end }} +
{{ .dev }}
{{ .dev }}
Typ{{ .speed }}Mbps {{ .type | upper }}
PoE{{ delimit (intersect .features (slice "24V" "802.3af" "802.3at" "PD")) ", " }}
Typ{{ .speed }}Mbps {{ .type | upper }}
DSA Port{{ cond (in .features "dsa") (emojify ":heavy_check_mark:") "" }}
PoE{{ delimit (intersect .features (slice "24V" "802.3af" "802.3at" "PD")) ", " }}
DSA Port{{ cond (in .features "dsa") (emojify ":heavy_check_mark:") "" }}
Belegung L3{{ echoParam . "roleL3" }}
Belegung Node{{ echoParam . "roleNode" }}
Belegung L3{{ echoParam . "roleL3" }}
Belegung Node{{ echoParam . "roleNode" }}
{{ end }} @@ -91,44 +97,91 @@ {{ with $wireless }}

Wireless

- - - {{ range . -}} - + + + + {{ range . -}} + + {{ end }} + + + + {{ if where . ".features" "intersect" (slice "bg" "n" "ac" "ax") }} + + + {{ range . -}} + + {{ end }} + {{ end }} - - {{ if where . ".features" "intersect" (slice "bg" "n" "ac" "ax") }} - - - {{ range . -}} - - {{ end }} - - {{ end }} - {{ if where . ".speed" "!=" nil }} - - - {{ range . -}} - - {{ end }} - - {{ end }} + {{ if where . ".speed" "!=" nil }} + + + {{ range . -}} + + {{ end }} + + {{ end }} +
{{ .dev }}
{{ .dev }}
Standard{{ delimit (intersect .features (slice "bg" "n" "ac" "ax")) ", " }}
Standard{{ delimit (intersect .features (slice "bg" "n" "ac" "ax")) ", " }}
Datenrate{{ echoParam . "speed" }} Mbit/s
Datenrate{{ echoParam . "speed" }} Mbit/s
{{ end }} {{ end }} {{ with $hw.benchmark }}

Benchmarks

- - - - - {{ range $b, $m := . }} + - - + + - {{ end }} + + + {{ range $b, $m := . }} + + + + + {{ end }} + +
BenchmarkMessung
{{ $b }}{{ $m }}BenchmarkMessung
{{ $b }}{{ $m }}
+{{ end }} + +{{ with $hw.firmware }} +

Firmware Download

+ {{ range . }} +

{{ .usage }} - "{{ .type }}"

+ + + + + + + + + +
Layer 3fff-layer3-{{ $.Site.Params.FirmwareVersion }}-{{ .fragmentL3 }}
Nodefff-node-{{ $.Site.Params.FirmwareVersion }}-{{ .fragmentNode }}
+ {{ end }} +{{ end }} + +{{ with $hw.firmware }} +

Firmware Download

+ + + + + + + + + + {{ range . }} + + + + + + {{ end }} +
VerwendungLayer 3Node
{{ .usage }}
"{{ .type }}"
fff-layer3-{{ $.Site.Params.FirmwareVersion }}-{{ .fragmentL3 }}fff-node-{{ $.Site.Params.FirmwareVersion }}-{{ .fragmentNode }}
{{ end }}