From 9c1319c4ff37f71e7437219b0f65d045c6971e93 Mon Sep 17 00:00:00 2001 From: Nick Winans Date: Thu, 15 Jul 2021 17:16:33 -0500 Subject: [PATCH] feat(docs): Add nice!nano v2 to scripts, actions, and documentation asdf asdf asdf --- .github/workflows/build.yml | 5 +++-- docs/docs/hardware.md | 2 +- docs/src/data/power.js | 11 ++++++++++- docs/static/setup.ps1 | 4 ++-- docs/static/setup.sh | 9 +++++---- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7011283..9345c3c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,7 @@ jobs: board: - bluemicro840_v1 - nice_nano + - nice_nano_v2 - nrfmicro_13 - proton_c shield: @@ -69,11 +70,11 @@ jobs: - board: planck_rev6 - board: proton_c shield: clueboard_california - - board: nice_nano + - board: nice_nano_v2 shield: kyria_left cmake-args: -DCONFIG_ZMK_DISPLAY=y skip-archive: true - - board: nice_nano + - board: nice_nano_v2 shield: kyria_right cmake-args: -DCONFIG_ZMK_DISPLAY=y skip-archive: true diff --git a/docs/docs/hardware.md b/docs/docs/hardware.md index 797acd02..210587b3 100644 --- a/docs/docs/hardware.md +++ b/docs/docs/hardware.md @@ -15,7 +15,7 @@ That being said, there are currently only a few specific [boards](/docs/faq#what ## Boards -- [nice!nano](https://nicekeyboards.com/products/nice-nano-v1-0) (`nice_nano`) +- [nice!nano](https://nicekeyboards.com/nice-nano) (`nice_nano`, `nice_nano_v2`) - [nrfMicro](https://github.com/joric/nrfmicro) (`nrfmicro_13`, `nrfmicro_11`, `nrfmicro_11_flipped`) - [BlueMicro840](https://store.jpconstantineau.com/#/group/bluemicro) (`bluemicro840_v1`) - [QMK Proton-C](https://qmk.fm/proton-c/) (`proton_c`) diff --git a/docs/src/data/power.js b/docs/src/data/power.js index bf34f17d..5fe5912c 100644 --- a/docs/src/data/power.js +++ b/docs/src/data/power.js @@ -37,7 +37,7 @@ export const zmkBase = { */ export const zmkBoards = { "nice!nano": { - name: "nice!nano", + name: "nice!nano v1", powerSupply: { type: "LDO", outputVoltage: 3.3, @@ -45,6 +45,15 @@ export const zmkBoards = { }, otherQuiescentMicroA: 4, }, + "nice!nano v2": { + name: "nice!nano v2", + powerSupply: { + type: "LDO", + outputVoltage: 3.3, + quiescentMicroA: 15, + }, + otherQuiescentMicroA: 3, + }, "nice!60": { powerSupply: { type: "SWITCHING", diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1 index bcea9f7a..307b402f 100644 --- a/docs/static/setup.ps1 +++ b/docs/static/setup.ps1 @@ -75,8 +75,8 @@ $repo_path = "https://github.com/zmkfirmware/zmk-config-split-template.git" $title = "ZMK Config Setup:" $prompt = "Pick an MCU board" -$options = "nice!nano", "QMK Proton-C", "BlueMicro840 (v1)", "makerdiary nRF52840 M.2" -$boards = "nice_nano", "proton_c", "bluemicro840_v1", "nrf52840_m2" +$options = "nice!nano v1", "nice!nano v2", "QMK Proton-C", "BlueMicro840 (v1)", "makerdiary nRF52840 M.2" +$boards = "nice_nano", "nice_nano_v2", "proton_c", "bluemicro840_v1", "nrf52840_m2" Write-Host "$title" Write-Host "" diff --git a/docs/static/setup.sh b/docs/static/setup.sh index 2078ff3e..88949f39 100644 --- a/docs/static/setup.sh +++ b/docs/static/setup.sh @@ -66,7 +66,7 @@ repo_path="https://github.com/zmkfirmware/zmk-config-split-template.git" title="ZMK Config Setup:" prompt="Pick an MCU board:" -options=("nice!nano" "QMK Proton-C" "BlueMicro840 (v1)" "makerdiary nRF52840 M.2") +options=("nice!nano v1" "nice!nano v2" "QMK Proton-C" "BlueMicro840 (v1)" "makerdiary nRF52840 M.2") echo "$title" echo "" @@ -77,9 +77,10 @@ select opt in "${options[@]}" "Quit"; do case "$REPLY" in 1 ) board="nice_nano"; break;; - 2 ) board="proton_c"; break;; - 3 ) board="bluemicro840_v1"; break;; - 4 ) board="nrf52840_m2"; break;; + 2 ) board="nice_nano_v2" break;; + 3 ) board="proton_c"; break;; + 4 ) board="bluemicro840_v1"; break;; + 5 ) board="nrf52840_m2"; break;; $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit 1;; *) echo "Invalid option. Try another one."; continue;;