diff --git a/.gitignore b/.gitignore index 6d15ccc..1bd084c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ rp2040_51/target/thumbv6m-none-eabi/debug rp2040_51/target rp2040_42/target rp2040_42/Cargo.lock +rp2040_51/Cargo.lock diff --git a/rp2040_51/.cargo/config b/rp2040_51/.cargo/config.toml similarity index 82% rename from rp2040_51/.cargo/config rename to rp2040_51/.cargo/config.toml index ed10a10..e548cb6 100644 --- a/rp2040_51/.cargo/config +++ b/rp2040_51/.cargo/config.toml @@ -1,13 +1,9 @@ # # Cargo Configuration for the https://github.com/rp-rs/rp-hal.git repository. # -# Copyright (c) The RP-RS Developers, 2021 -# # You might want to make a similar file in your own repository if you are # writing programs for Raspberry Silicon microcontrollers. # -# This file is MIT or Apache-2.0 as per the repository README.md file -# [build] # Set the default target to match the Cortex-M0+ in the RP2040 @@ -23,13 +19,12 @@ target = "thumbv6m-none-eabi" # script. This is usually provided by the cortex-m-rt crate, and by default # the version in that crate will include a file called `memory.x` which # describes the particular memory layout for your specific chip. -# * inline-threshold=5 makes the compiler more aggressive and inlining functions # * no-vectorize-loops turns off the loop vectorizer (seeing as the M0+ doesn't # have SIMD) rustflags = [ "-C", "link-arg=--nmagic", "-C", "link-arg=-Tlink.x", - "-C", "inline-threshold=5", + "-C", "link-arg=-Tdefmt.x", "-C", "no-vectorize-loops", ] @@ -39,4 +34,4 @@ runner = "elf2uf2-rs -d" # This runner will find a supported SWD debug probe and flash your RP2040 over # SWD: -# runner = "probe-run --chip RP2040" +# runner = "probe-rs run --chip RP2040" diff --git a/rp2040_51/Cargo.lock b/rp2040_51/Cargo.lock deleted file mode 100644 index 09fa749..0000000 --- a/rp2040_51/Cargo.lock +++ /dev/null @@ -1,595 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "bare-metal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "bitfield" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "bytemuck" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cortex-m" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9" -dependencies = [ - "bare-metal", - "bitfield", - "embedded-hal", - "volatile-register", -] - -[[package]] -name = "cortex-m-rt" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d4dec46b34c299ccf6b036717ae0fce602faa4f4fe816d9013b9a7c9f5ba6" -dependencies = [ - "cortex-m-rt-macros", -] - -[[package]] -name = "cortex-m-rt-macros" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37549a379a9e0e6e576fd208ee60394ccb8be963889eebba3ffe0980364f472" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "crc-any" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62ec9ff5f7965e4d7280bd5482acd20aadb50d632cf6c1d74493856b011fa73" -dependencies = [ - "debug-helper", -] - -[[package]] -name = "critical-section" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" - -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "embedded-dma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994f7e5b5cb23521c22304927195f236813053eb9c065dd2226a32ba64695446" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "embedded-hal" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" -dependencies = [ - "nb 0.1.3", - "void", -] - -[[package]] -name = "frunk" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874b6a17738fc273ec753618bac60ddaeac48cb1d7684c3e7bd472e57a28b817" -dependencies = [ - "frunk_core", - "frunk_derives", -] - -[[package]] -name = "frunk_core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3529a07095650187788833d585c219761114005d5976185760cf794d265b6a5c" - -[[package]] -name = "frunk_derives" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3" -dependencies = [ - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "frunk_proc_macro_helpers" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a956ef36c377977e512e227dcad20f68c2786ac7a54dacece3746046fea5ce" -dependencies = [ - "frunk_core", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "fugit" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17186ad64927d5ac8f02c1e77ccefa08ccd9eaa314d5a4772278aa204a22f7e7" -dependencies = [ - "gcd", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "gcd" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" - -[[package]] -name = "hash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" -dependencies = [ - "byteorder", -] - -[[package]] -name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "nb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -dependencies = [ - "nb 1.1.0", -] - -[[package]] -name = "nb" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive 0.7.3", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "option-block" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f2c5d345596a14d7c8b032a68f437955f0059f2eb9a5972371c84f7eef3227" - -[[package]] -name = "packed_struct" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b29691432cc9eff8b282278473b63df73bea49bc3ec5e67f31a3ae9c3ec190" -dependencies = [ - "bitvec", - "packed_struct_codegen", -] - -[[package]] -name = "packed_struct_codegen" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "panic-halt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812" - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pio" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e09694b50f89f302ed531c1f2a7569f0be5867aee4ab4f8f729bbeec0078e3" -dependencies = [ - "arrayvec", - "num_enum 0.5.11", - "paste", -] - -[[package]] -name = "proc-macro2" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "rgb" -version = "0.8.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rp2040" -version = "0.1.0" -dependencies = [ - "cortex-m", - "cortex-m-rt", - "embedded-hal", - "fugit", - "nb 1.1.0", - "packed_struct", - "panic-halt", - "pio", - "rp2040-boot2", - "rp2040-hal", - "smart-leds", - "smart-leds-trait", - "usb-device", - "usbd-human-interface-device", - "waveshare-rp2040-zero", - "ws2812-pio", -] - -[[package]] -name = "rp2040-boot2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c773ec49b836077aa144b58dc7654a243e1eecdb6cf0d25361ae7c7600fabd8" -dependencies = [ - "crc-any", -] - -[[package]] -name = "rp2040-hal" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1369bb84862d7f69391a96606b2f29a00bfce7f29a749e23d5f01fc3f607ada0" -dependencies = [ - "cortex-m", - "critical-section", - "embedded-dma", - "embedded-hal", - "fugit", - "itertools", - "nb 1.1.0", - "paste", - "pio", - "rand_core", - "rp2040-hal-macros", - "rp2040-pac", - "usb-device", - "vcell", - "void", -] - -[[package]] -name = "rp2040-hal-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86479063e497efe1ae81995ef9071f54fd1c7427e04d6c5b84cde545ff672a5e" -dependencies = [ - "cortex-m-rt", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rp2040-pac" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9192cafbb40d717c9e0ddf767aaf9c69fee1b4e48d22ed853b57b11f6d9f3d7e" -dependencies = [ - "cortex-m", - "cortex-m-rt", - "vcell", -] - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "smart-leds" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd45fa275f70b4110eac5f5182611ad384f88bb22b68b9a9c3cafd7015290b" -dependencies = [ - "smart-leds-trait", -] - -[[package]] -name = "smart-leds-trait" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf6d833fa93f16a1c1874e62c2aebe8567e5bdd436d59bf543ed258b6f7a8e3" -dependencies = [ - "rgb", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "usb-device" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6cc3adc849b5292b4075fc0d5fdcf2f24866e88e336dd27a8943090a520508" - -[[package]] -name = "usbd-human-interface-device" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69710303c06f23a1259d086bfb241212ae1ccfb5d582ebd596bb042d662ed73" -dependencies = [ - "frunk", - "fugit", - "heapless", - "num_enum 0.7.3", - "option-block", - "packed_struct", - "usb-device", -] - -[[package]] -name = "vcell" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "volatile-register" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de437e2a6208b014ab52972a27e59b33fa2920d3e00fe05026167a1c509d19cc" -dependencies = [ - "vcell", -] - -[[package]] -name = "waveshare-rp2040-zero" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e36889ce533ed216200dc2e2179d1fba8f9ba432da2d69406dc2cfe1edc7e89" -dependencies = [ - "cortex-m", - "cortex-m-rt", - "rp2040-boot2", - "rp2040-hal", -] - -[[package]] -name = "ws2812-pio" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d219e3b43c1e14305b36363060c0348d560314e235d999cf492bbbab1f38e8d" -dependencies = [ - "cortex-m", - "embedded-hal", - "fugit", - "nb 1.1.0", - "pio", - "rp2040-hal", - "smart-leds-trait", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] diff --git a/rp2040_51/Cargo.toml b/rp2040_51/Cargo.toml index 22abcb5..24a7fbe 100644 --- a/rp2040_51/Cargo.toml +++ b/rp2040_51/Cargo.toml @@ -1,54 +1,60 @@ [package] -name = "rp2040" -version = "0.1.0" -edition = "2021" +name = "cmdr-keyboard-51" +version = "0.2.0" +edition = "2024" [dependencies] +# rp2040_hal dependencies copied from v0.11 cortex-m = "0.7.2" -waveshare-rp2040-zero = "0.6.0" -rp2040-boot2 = { version = "0.2.0", optional = true } -rp2040-hal = { version = "0.8.0" } -cortex-m-rt = { version = "0.7", optional = true } -panic-halt= "0.2.0" -embedded-hal ="0.2.5" -fugit = "0.3.5" -nb = "1.0.0" -smart-leds = "0.3.0" -smart-leds-trait = "0.2.1" -ws2812-pio = "0.6.0" -usbd-human-interface-device = "0.4.2" -usb-device = "0.2" -packed_struct = { version = "0.10", default-features = false } +cortex-m-rt = "0.7" +cortex-m-rtic = "1.1.4" +critical-section = {version = "1.2.0"} +defmt = "0.3" +defmt-rtt = "0.4.0" +dht-sensor = "0.2.1" +embedded-alloc = "0.5.1" +embedded-hal = "1.0.0" +embedded-hal-async = "1.0.0" +embedded-hal-bus = {version = "0.2.0", features = ["defmt-03"]} +embedded-io = "0.6.1" +embedded_hal_0_2 = {package = "embedded-hal", version = "0.2.5", features = ["unproven"]} +fugit = "0.3.6" +futures = {version = "0.3.30", default-features = false, features = ["async-await"]} +hd44780-driver = "0.4.0" +nb = "1.0" +panic-halt = "0.2.0" +panic-probe = {version = "0.3.1", features = ["print-defmt"]} pio = "0.2.0" +pio-proc = "0.2.0" +portable-atomic = {version = "1.7.0", features = ["critical-section"]} +rp2040-boot2 = "0.3.0" +rp2040-hal = {version = "0.11.0", features = ["binary-info", "critical-section-impl", "rt", "defmt"]} +static_cell = "2.1.0" -[features] -# This is the set of features we enable by default -default = ["boot2", "rt", "critical-section-impl", "rom-func-cache"] +# USB hid dependencies +usbd-human-interface-device = {version = "0.5.1"} +usb-device = "0.3" +packed_struct = { version = "0.10", default-features = false } +heapless = "0.8" -# critical section that is safe for multicore use -critical-section-impl = ["rp2040-hal/critical-section-impl"] +# ws2812-pio dependencies +ws2812-pio = "0.9.0" +smart-leds = "0.4.0" -# 2nd stage bootloaders for rp2040 -boot2 = ["rp2040-boot2"] +[lints.clippy] +too_long_first_doc_paragraph = "allow" -# Minimal startup / runtime for Cortex-M microcontrollers -rt = ["cortex-m-rt","rp2040-hal/rt"] - -# This enables a fix for USB errata 5: USB device fails to exit RESET state on busy USB bus. -# Only required for RP2040 B0 and RP2040 B1, but it doesn't hurt to enable it -rp2040-e5 = ["rp2040-hal/rp2040-e5"] - -# Memoize(cache) ROM function pointers on first use to improve performance -rom-func-cache = ["rp2040-hal/rom-func-cache"] - -# Disable automatic mapping of language features (like floating point math) to ROM functions -disable-intrinsics = ["rp2040-hal/disable-intrinsics"] - -# This enables ROM functions for f64 math that were not present in the earliest RP2040s -rom-v2-intrinsics = ["rp2040-hal/rom-v2-intrinsics"] +[profile.release] +codegen-units = 1 +debug = 0 +debug-assertions = false +incremental = false +lto = 'fat' +opt-level = 3 +overflow-checks = false [[bin]] -name = "rp2040" +name = "cmdr-keyboard-51" test = false bench = false diff --git a/rp2040_51/src/button_matrix.rs b/rp2040_51/src/button_matrix.rs index e093b99..74afe04 100644 --- a/rp2040_51/src/button_matrix.rs +++ b/rp2040_51/src/button_matrix.rs @@ -1,12 +1,12 @@ //! Project: CMtec CMDR Keyboard 51 -//! Date: 2023-07-01 +//! Date: 2025-03-09 //! Author: Christoffer Martinsson //! Email: cm@cmtec.se //! License: Please refer to LICENSE in root directory use core::convert::Infallible; use cortex_m::delay::Delay; -use embedded_hal::digital::v2::*; +use embedded_hal::digital::{InputPin, OutputPin}; /// Button matrix driver /// @@ -15,7 +15,7 @@ use embedded_hal::digital::v2::*; /// let button_matrix: ButtonMatrix<4, 6, 48> = ButtonMatrix::new(row_pins, col_pins, 5); /// ``` pub struct ButtonMatrix<'a, const R: usize, const C: usize, const N: usize> { - rows: &'a [&'a dyn InputPin; R], + rows: &'a mut [&'a mut dyn InputPin; R], cols: &'a mut [&'a mut dyn OutputPin; C], pressed: [bool; N], debounce: u8, @@ -31,7 +31,7 @@ impl<'a, const R: usize, const C: usize, const N: usize> ButtonMatrix<'a, R, C, /// * `cols` - An array of references to the column pins. /// * `debounce` - The debounce time in number of scans. pub fn new( - rows: &'a [&'a dyn InputPin; R], + rows: &'a mut [&'a mut dyn InputPin; R], cols: &'a mut [&'a mut dyn OutputPin; C], debounce: u8, ) -> Self { @@ -62,10 +62,10 @@ impl<'a, const R: usize, const C: usize, const N: usize> ButtonMatrix<'a, R, C, pub fn scan_matrix(&mut self, delay: &mut Delay) { for col_index in 0..self.cols.len() { self.cols[col_index].set_low().unwrap(); - delay.delay_us(10); + delay.delay_us(1); self.process_column(col_index); self.cols[col_index].set_high().unwrap(); - delay.delay_us(10); + delay.delay_us(1); } } diff --git a/rp2040_51/src/main.rs b/rp2040_51/src/main.rs index da95d88..6a48c42 100644 --- a/rp2040_51/src/main.rs +++ b/rp2040_51/src/main.rs @@ -14,31 +14,33 @@ mod status_led; use button_matrix::ButtonMatrix; use core::convert::Infallible; use cortex_m::delay::Delay; -use embedded_hal::digital::v2::*; -use embedded_hal::timer::CountDown; +use embedded_hal::digital::{InputPin, OutputPin}; +use embedded_hal_0_2::timer::CountDown; use fugit::ExtU32; use panic_halt as _; use rp2040_hal::{ - gpio::{Function, FunctionConfig, PinId, ValidPinMode}, - pio::StateMachineIndex, + Sio, + clocks::{Clock, init_clocks_and_plls}, + gpio::{AnyPin, Pins}, + pac, + pio::{PIOExt, StateMachineIndex}, + timer::Timer, + watchdog::Watchdog, }; use status_led::{StatusMode, Ws2812StatusLed}; use usb_device::class_prelude::*; use usb_device::prelude::*; use usbd_human_interface_device::page::Keyboard; use usbd_human_interface_device::prelude::*; -use waveshare_rp2040_zero::entry; -use waveshare_rp2040_zero::{ - hal::{ - clocks::{init_clocks_and_plls, Clock}, - pac, - pio::PIOExt, - timer::Timer, - watchdog::Watchdog, - Sio, - }, - Pins, XOSC_CRYSTAL_FREQ, -}; + +// The linker will place this boot block at the start of our program image. We +/// need this to help the ROM bootloader get our code up and running. +#[unsafe(link_section = ".boot2")] +#[unsafe(no_mangle)] +#[used] +pub static BOOT2_FIRMWARE: [u8; 256] = rp2040_boot2::BOOT_LOADER_W25Q080; + +const XTAL_FREQ_HZ: u32 = 12_000_000u32; // Public constants pub const KEY_ROWS: usize = 5; @@ -53,7 +55,7 @@ pub struct KeyboardButton { pub fn_mode: u8, } -#[entry] +#[rp2040_hal::entry] fn main() -> ! { // Grab our singleton objects let mut pac = pac::Peripherals::take().unwrap(); @@ -63,7 +65,7 @@ fn main() -> ! { // Configure clocks and PLLs let clocks = init_clocks_and_plls( - XOSC_CRYSTAL_FREQ, + XTAL_FREQ_HZ, pac.XOSC, pac.CLOCKS, pac.PLL_SYS, @@ -88,59 +90,38 @@ fn main() -> ! { ); // Setting up array with pins connected to button rows - let button_matrix_row_pins: &[&dyn InputPin; KEY_ROWS] = &[ - &pins.gp29.into_pull_up_input(), - &pins.gp26.into_pull_up_input(), - &pins.gp15.into_pull_up_input(), - &pins.gp10.into_pull_up_input(), - &pins.gp9.into_pull_up_input(), + let button_matrix_row_pins: &mut [&mut dyn InputPin; KEY_ROWS] = &mut [ + &mut pins.gpio29.into_pull_up_input(), + &mut pins.gpio26.into_pull_up_input(), + &mut pins.gpio15.into_pull_up_input(), + &mut pins.gpio10.into_pull_up_input(), + &mut pins.gpio9.into_pull_up_input(), ]; // Setting up array with pins connected to button columns let button_matrix_col_pins: &mut [&mut dyn OutputPin; KEY_COLS] = &mut [ - &mut pins.gp11.into_push_pull_output(), - &mut pins.gp12.into_push_pull_output(), - &mut pins.gp13.into_push_pull_output(), - &mut pins.gp14.into_push_pull_output(), - &mut pins.gp27.into_push_pull_output(), - &mut pins.gp28.into_push_pull_output(), - &mut pins.gp2.into_push_pull_output(), - &mut pins.gp3.into_push_pull_output(), - &mut pins.gp4.into_push_pull_output(), - &mut pins.gp5.into_push_pull_output(), - &mut pins.gp6.into_push_pull_output(), - &mut pins.gp7.into_push_pull_output(), + &mut pins.gpio11.into_push_pull_output(), + &mut pins.gpio12.into_push_pull_output(), + &mut pins.gpio13.into_push_pull_output(), + &mut pins.gpio14.into_push_pull_output(), + &mut pins.gpio27.into_push_pull_output(), + &mut pins.gpio28.into_push_pull_output(), + &mut pins.gpio2.into_push_pull_output(), + &mut pins.gpio3.into_push_pull_output(), + &mut pins.gpio4.into_push_pull_output(), + &mut pins.gpio5.into_push_pull_output(), + &mut pins.gpio6.into_push_pull_output(), + &mut pins.gpio7.into_push_pull_output(), ]; // Create button matrix object that scans all the PCB buttons let mut button_matrix: ButtonMatrix = ButtonMatrix::new(button_matrix_row_pins, button_matrix_col_pins, 5); - // Configure USB - let usb_bus = UsbBusAllocator::new(waveshare_rp2040_zero::hal::usb::UsbBus::new( - pac.USBCTRL_REGS, - pac.USBCTRL_DPRAM, - clocks.usb_clock, - true, - &mut pac.RESETS, - )); - - let mut keyboard = UsbHidClassBuilder::new() - .add_device( - usbd_human_interface_device::device::keyboard::NKROBootKeyboardConfig::default(), - ) - .build(&usb_bus); - - let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x1209, 0x0001)) - .manufacturer("CMtec") - .product("CMDR keyboard") - .serial_number("0002") - .build(); - // Create status LED let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS); let mut status_led = Ws2812StatusLed::new( - pins.neopixel.into_mode(), + pins.gpio16.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), @@ -150,7 +131,7 @@ fn main() -> ! { let mut buttons: [KeyboardButton; NUMBER_OF_KEYS] = [KeyboardButton::default(); NUMBER_OF_KEYS]; // Create timers/delays - let timer = Timer::new(pac.TIMER, &mut pac.RESETS); + let timer = Timer::new(pac.TIMER, &mut pac.RESETS, &clocks); let mut delay = Delay::new(core.SYST, clocks.system_clock.freq().to_Hz()); let mut usb_hid_report_count_down = timer.count_down(); @@ -188,6 +169,29 @@ fn main() -> ! { rp2040_hal::rom_data::reset_to_usb_boot(gpio_activity_pin_mask, disable_interface_mask); } + // Configure USB + let usb_bus = UsbBusAllocator::new(rp2040_hal::usb::UsbBus::new( + pac.USBCTRL_REGS, + pac.USBCTRL_DPRAM, + clocks.usb_clock, + true, + &mut pac.RESETS, + )); + + let mut keyboard = UsbHidClassBuilder::new() + .add_device( + usbd_human_interface_device::device::keyboard::NKROBootKeyboardConfig::default(), + ) + .build(&usb_bus); + + let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x1209, 0x0003)) + .strings(&[StringDescriptors::default() + .manufacturer("CMtec") + .product("CMDR keyboard 51") + .serial_number("0002")]) + .unwrap() + .build(); + loop { if status_led_count_down.wait().is_ok() { update_status_led(&mut status_led, &caps_lock_active, &sticky_state, &started); @@ -268,9 +272,8 @@ fn update_status_led( sticky_state: &u8, started: &bool, ) where - P: PIOExt + FunctionConfig, - I: PinId, - Function

: ValidPinMode, + I: AnyPin, + P: PIOExt, SM: StateMachineIndex, { if *caps_lock_active { diff --git a/rp2040_51/src/status_led.rs b/rp2040_51/src/status_led.rs index e87d41e..aadd495 100644 --- a/rp2040_51/src/status_led.rs +++ b/rp2040_51/src/status_led.rs @@ -1,11 +1,11 @@ //! Project: CMtec CMDR Keyboard 51 -//! Date: 2023-07-01 +//! Date: 2025-03-09 //! Author: Christoffer Martinsson //! Email: cm@cmtec.se //! License: Please refer to LICENSE in root directory use rp2040_hal::{ - gpio::{Function, FunctionConfig, Pin, PinId, ValidPinMode}, + gpio::AnyPin, pio::{PIOExt, StateMachineIndex, UninitStateMachine, PIO}, }; use smart_leds::{SmartLedsWrite, RGB8}; @@ -25,17 +25,16 @@ use ws2812_pio::Ws2812Direct; pub enum StatusMode { Off = 0, Normal = 1, - Activity = 2, - ActivityFlash = 3, - Other = 4, - OtherFlash = 5, - Warning = 6, - Error = 7, - Bootloader = 8, + NormalFlash = 2, + Activity = 3, + ActivityFlash = 4, + Other = 5, + OtherFlash = 6, + Warning = 7, + Error = 8, + Bootloader = 9, } #[warn(dead_code)] - -/// Status LED driver /// This driver uses the PIO state machine to drive a WS2812 LED /// /// # Example @@ -50,20 +49,19 @@ pub enum StatusMode { /// ``` pub struct Ws2812StatusLed where - I: PinId, - P: PIOExt + FunctionConfig, - Function

: ValidPinMode, + I: AnyPin, + P: PIOExt, SM: StateMachineIndex, { ws2812_direct: Ws2812Direct, state: bool, + mode: StatusMode, } impl Ws2812StatusLed where - I: PinId, - P: PIOExt + FunctionConfig, - Function

: ValidPinMode, + I: AnyPin, + P: PIOExt, SM: StateMachineIndex, { /// Creates a new instance of this driver. @@ -75,7 +73,7 @@ where /// * `sm` - PIO state machine /// * `clock_freq` - PIO clock frequency pub fn new( - pin: Pin>, + pin: I, pio: &mut PIO

, sm: UninitStateMachine<(P, SM)>, clock_freq: fugit::HertzU32, @@ -83,28 +81,40 @@ where // prepare the PIO program let ws2812_direct = Ws2812Direct::new(pin, pio, sm, clock_freq); let state = false; + let mode = StatusMode::Off; Self { ws2812_direct, state, + mode, } } + /// Get current status mode + #[allow(dead_code)] + pub fn get_mode(&self) -> StatusMode { + self.mode + } + #[warn(dead_code)] /// Update status LED /// Depending on the mode, the LED will be set to a different colour /// /// * OFF = off /// * NORMAL = green + /// * NORMALFLASH = green (flashing) /// * ACTIVITY = blue + /// * ACTIVITYFLASH = blue (flashing) /// * OTHER = orange + /// * OTHERFLASH = orange (flashing) /// * WARNING = red (flashing) /// * ERROR = red /// * BOOTLOADER = purple /// /// Make sure to call this function regularly to keep the LED flashing pub fn update(&mut self, mode: StatusMode) { - let colors: [RGB8; 9] = [ + let colors: [RGB8; 10] = [ (0, 0, 0).into(), // Off (10, 7, 0).into(), // Green + (10, 7, 0).into(), // Green (10, 4, 10).into(), // Blue (10, 4, 10).into(), // Blue (5, 10, 0).into(), // Orange @@ -114,18 +124,31 @@ where (0, 10, 10).into(), // Purple ]; - if (mode == StatusMode::ActivityFlash + if mode == StatusMode::Warning + || mode == StatusMode::NormalFlash + || mode == StatusMode::ActivityFlash || mode == StatusMode::OtherFlash - || mode == StatusMode::Warning) + || mode != self.mode + { + self.mode = mode; + } else { + return; + } + + if (mode == StatusMode::Warning + || mode == StatusMode::NormalFlash + || mode == StatusMode::ActivityFlash + || mode == StatusMode::OtherFlash) && !self.state { self.ws2812_direct .write([colors[mode as usize]].iter().copied()) .unwrap(); self.state = true; - } else if mode == StatusMode::ActivityFlash + } else if mode == StatusMode::Warning + || mode == StatusMode::NormalFlash + || mode == StatusMode::ActivityFlash || mode == StatusMode::OtherFlash - || mode == StatusMode::Warning || mode == StatusMode::Off { self.ws2812_direct