diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4db8fd3..11a11b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: name: Type Check runs-on: ubuntu-18.04 env: - MIX_TARGET: kebow + MIX_TARGET: keybow steps: - name: Set up Elixir uses: actions/setup-elixir@v1 diff --git a/README.md b/README.md index c2e1e17..e132ad9 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,10 @@ using nerves. The keybow uses a Raspberry Pi Zero WH, so the target would be `rpi0`. However, to better support all the keybow features that xebow uses, a custom target has -been setup called `kebow` that you will need to use instead. To build and burn +been setup called `keybow` that you will need to use instead. To build and burn the firmware: - $ export MIX_TARGET=kebow + $ export MIX_TARGET=keybow $ mix deps.get $ mix firmware @@ -60,7 +60,7 @@ another device.** ## Booting the Keybow -Remove the MicroSD card and insert it into the keybow. Plug the kebow into the +Remove the MicroSD card and insert it into the keybow. Plug the keybow into the computer and wait for it to boot. Once booted, the keypad should begin cycling all keys through a rainbow of colors. diff --git a/mix.exs b/mix.exs index 4408bbf..e104c86 100644 --- a/mix.exs +++ b/mix.exs @@ -3,7 +3,7 @@ defmodule Xebow.MixProject do @app :xebow @version "0.1.0" - @all_targets [:kebow] + @all_targets [:keybow] def project do [ @@ -17,7 +17,7 @@ defmodule Xebow.MixProject do deps: deps(), docs: [extras: ["README.md"]], releases: [{@app, release()}], - preferred_cli_target: [run: :host, test: :host, dialyzer: :kebow], + preferred_cli_target: [run: :host, test: :host, dialyzer: :keybow], dialyzer: [ ignore_warnings: "dialyzer.ignore.exs", list_unused_filters: true, @@ -72,11 +72,11 @@ defmodule Xebow.MixProject do {:usb_gadget, github: "nerves-project/usb_gadget", ref: "master", targets: @all_targets}, # Dependencies for specific targets - {:nerves_system_kebow, - github: "ElixirSeattle/nerves_system_kebow", - ref: "v1.11.0+kebow.1", + {:nerves_system_keybow, + github: "ElixirSeattle/nerves_system_keybow", + ref: "v1.11.0+keybow.2", runtime: false, - targets: :kebow} + targets: :keybow} ] end diff --git a/mix.lock b/mix.lock index 78237be..e5503fd 100644 --- a/mix.lock +++ b/mix.lock @@ -23,7 +23,7 @@ "nerves_pack": {:hex, :nerves_pack, "0.3.0", "a8223c5c4502755dc161781c6e00ec84cfd2391d09ab030606c8b25b99643881", [:mix], [{:mdns_lite, "~> 0.6", [hex: :mdns_lite, repo: "hexpm", optional: false]}, {:nerves_firmware_ssh, "~> 0.4", [hex: :nerves_firmware_ssh, repo: "hexpm", optional: false]}, {:nerves_runtime, "~> 0.6", [hex: :nerves_runtime, repo: "hexpm", optional: false]}, {:nerves_time, "~> 0.3", [hex: :nerves_time, repo: "hexpm", optional: false]}, {:ring_logger, "~> 0.8", [hex: :ring_logger, repo: "hexpm", optional: false]}, {:vintage_net, "~> 0.7.0", [hex: :vintage_net, repo: "hexpm", optional: false]}, {:vintage_net_direct, "~> 0.7.0", [hex: :vintage_net_direct, repo: "hexpm", optional: false]}, {:vintage_net_ethernet, "~> 0.7.0", [hex: :vintage_net_ethernet, repo: "hexpm", optional: false]}, {:vintage_net_wifi, "~> 0.7.0", [hex: :vintage_net_wifi, repo: "hexpm", optional: false]}], "hexpm", "507257f47df1d03fb3ca45808625fe4aeab4550479f78bec8ac3425b8f282a43"}, "nerves_runtime": {:hex, :nerves_runtime, "0.11.0", "96787c3935ec1a4943c8fcd63ce6ed1f2301f5f28eac41db800f3fafe0043f1f", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.8.0", [hex: :system_registry, repo: "hexpm", optional: false]}, {:uboot_env, "~> 0.1.1", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "7adc7f7163422bddd569daadcb5d9ceb3010687afcba9f3c147ad17361417d7e"}, "nerves_system_br": {:hex, :nerves_system_br, "1.11.0", "a241428996c85dfbe789a9926c840e1aa836daea58f88101735e88395c67567c", [:mix], [], "hexpm", "b79e52283e19d76bb290040ca354ed1bbb9e71421d0c9a600f0f320888dc0459"}, - "nerves_system_kebow": {:git, "https://github.com/ElixirSeattle/nerves_system_kebow.git", "3f9b722c3486fbbe79e9e4e4abd58cb38d87de9a", [ref: "v1.11.0+kebow.1"]}, + "nerves_system_keybow": {:git, "https://github.com/ElixirSeattle/nerves_system_keybow.git", "237635f5c5bb50e735e501b51eef45bebead4909", [ref: "v1.11.0+keybow.2"]}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm", "bffbdfb116bc72cde6e408c34c0670b199846e9a8f0953cc1c9f1eea693821a1"}, "nerves_time": {:hex, :nerves_time, "0.4.1", "b9fa73af7592f9fa7bad32f2c8ae655f9209dbc67f534c4f0532ec354a95dd7a", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5", [hex: :muontrap, repo: "hexpm", optional: false]}], "hexpm", "1683db2cb7b3f2d04e9a259b2a3bbd3a9ae534ddff5ee81ae71f3c8a59b25224"}, "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "1.3.2", "beb0f97d6f432406af6c4fdcee02d2ab750298845834f869a0b98239362783ae", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.7.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "ef93b7d678241be2d4520dceecf6a2116bb87640576211dad3b618ce79b85e39"}, diff --git a/upload.sh b/upload.sh index dddd7cc..96d03e9 100755 --- a/upload.sh +++ b/upload.sh @@ -49,7 +49,7 @@ help() { } [ -n "$DESTINATION" ] || DESTINATION=xebow.local -[ -n "$MIX_TARGET" ] || MIX_TARGET=kebow +[ -n "$MIX_TARGET" ] || MIX_TARGET=keybow [ -n "$MIX_ENV" ] || MIX_ENV=dev if [ -z "$FILENAME" ]; then FIRMWARE_PATH="./_build/${MIX_TARGET}_${MIX_ENV}/nerves/images"