diff --git a/harrogate/Cargo.lock b/harrogate/Cargo.lock index d122f09..fc18191 100644 --- a/harrogate/Cargo.lock +++ b/harrogate/Cargo.lock @@ -4,45 +4,57 @@ version = 3 [[package]] name = "aligned" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a316c7ea8e1e9ece54862c992def5a7ac14de9f5832b69d71760680efeeefa" +checksum = "c19796bd8d477f1a9d4ac2465b464a8b1359474f06a96bb3cda650b4fca309bf" dependencies = [ "as-slice", ] [[package]] -name = "as-slice" -version = "0.1.0" +name = "apa102-spi" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293dac66b274fab06f95e7efb05ec439a6b70136081ea522d270bc351ae5bb27" +checksum = "d92cd690fd2aae5bc549e2dc392d9082aab3ccf851aa39b0ab84b2934f4c57a3" dependencies = [ - "generic-array", + "embedded-hal", + "smart-leds-trait", +] + +[[package]] +name = "as-slice" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0" +dependencies = [ + "generic-array 0.12.4", + "generic-array 0.13.3", + "generic-array 0.14.4", "stable_deref_trait", ] [[package]] name = "atsamd-hal" -version = "0.7.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9811af7fba403281be49cb14a8f3ba9083151fc305f00b04d0717dd41791a957" +checksum = "868f22ff864d664efd9a0134cad0905d918f62f3b14d7761ca6d64bdcb1df96b" dependencies = [ - "atsamd21g18a", + "atsamd21g", "bitfield", "cortex-m 0.6.7", "embedded-hal", - "nb", + "nb 0.1.3", "paste", - "rand_core 0.5.1", + "rand_core", "vcell", "void", ] [[package]] -name = "atsamd21g18a" -version = "0.6.0" +name = "atsamd21g" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5486b991ab0012b18f749e0b4bd71d882b4d6134dd58a1c16b571cf2e3d40eb" +checksum = "1d4092551cf82644de22191ad79c734adbd88df8e2b861e7b614d7e7891c83c7" dependencies = [ "bare-metal", "cortex-m 0.6.7", @@ -59,12 +71,28 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "bitbang-hal" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "470e1522d257e4c76245980d27d5d279442cb18955cc6341249b904074033f4a" +dependencies = [ + "embedded-hal", + "nb 0.1.3", +] + [[package]] name = "bitfield" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" +[[package]] +name = "bytemuck" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9966d2ab714d0f785dbac0a0396251a35280aeb42413281617d0209ab4898435" + [[package]] name = "cortex-m" version = "0.6.7" @@ -92,9 +120,9 @@ dependencies = [ [[package]] name = "cortex-m-rt" -version = "0.6.10" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17805910e3ecf029bdbfcc42b7384d9e3d9e5626153fa810002c1ef9839338ac" +checksum = "b6d8353767db816419630a76d5f1ad5b09610d22b67ceb59647df6a8abc667f8" dependencies = [ "cortex-m-rt-macros", "r0", @@ -102,35 +130,53 @@ dependencies = [ [[package]] name = "cortex-m-rt-macros" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ae692573e0acccb1579fef1abf5a5bf1d2f3f0149a22b16870ec9309aee25f" +checksum = "4717562afbba06e760d34451919f5c3bf3ac15c7bb897e8b04862a7428378647" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "rand", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "embedded-hal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb" +checksum = "db184d3fa27bc7a2344250394c0264144dfe0bc81a4401801dcb964b8dd172ad" dependencies = [ - "nb", + "nb 0.1.3", "void", ] [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] +[[package]] +name = "generic-array" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309" +dependencies = [ + "typenum", +] + +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "harrogate" version = "0.1.0" @@ -151,22 +197,24 @@ dependencies = [ [[package]] name = "itsybitsy_m0" -version = "0.5.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f00eb09c5591b0d404f671bc87d9e39120d558ea74025d367b28bb61acc9b10" +checksum = "5910604281fc0ab4d2cd7b1284443a1945615c99fde191baca60d6e097b2408c" dependencies = [ + "apa102-spi", "atsamd-hal", + "bitbang-hal", "cortex-m 0.6.7", "cortex-m-rt", "embedded-hal", - "nb", + "nb 0.1.3", + "smart-leds", ] [[package]] name = "itsybitsy_m0_lights" version = "0.1.0" dependencies = [ - "atsamd21g18a", "cortex-m 0.7.3", "embedded-hal", "itsybitsy_m0", @@ -180,9 +228,18 @@ version = "0.1.0" [[package]] name = "nb" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc" +checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" +dependencies = [ + "nb 1.0.0", +] + +[[package]] +name = "nb" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" [[package]] name = "panic-halt" @@ -192,71 +249,26 @@ checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812" [[package]] name = "paste" -version = "0.1.6" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.6", - "quote 1.0.2", - "syn 1.0.5", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -dependencies = [ - "proc-macro2 1.0.6", - "quote 1.0.2", - "syn 1.0.5", -] +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "proc-macro2" -version = "0.4.30" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -dependencies = [ - "unicode-xid 0.2.0", + "unicode-xid", ] [[package]] name = "quote" -version = "0.6.13" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -dependencies = [ - "proc-macro2 1.0.6", + "proc-macro2", ] [[package]] @@ -265,36 +277,21 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f" -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +[[package]] +name = "rgb" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fddb3b23626145d1776addfc307e1a1851f60ef6ca64f376bcb889697144cf0" +dependencies = [ + "bytemuck", +] + [[package]] name = "rustc_version" version = "0.2.3" @@ -320,56 +317,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] -name = "stable_deref_trait" -version = "1.1.1" +name = "smart-leds" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +checksum = "38dd45fa275f70b4110eac5f5182611ad384f88bb22b68b9a9c3cafd7015290b" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", + "smart-leds-trait", ] [[package]] -name = "syn" -version = "1.0.5" +name = "smart-leds-trait" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" +checksum = "ebf6d833fa93f16a1c1874e62c2aebe8567e5bdd436d59bf543ed258b6f7a8e3" dependencies = [ - "proc-macro2 1.0.6", - "quote 1.0.2", - "unicode-xid 0.2.0", + "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.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] name = "typenum" -version = "1.11.2" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-xid" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "vcell" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c" +checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "void" diff --git a/harrogate/Cargo.toml b/harrogate/Cargo.toml index 8d26626..89fab8c 100644 --- a/harrogate/Cargo.toml +++ b/harrogate/Cargo.toml @@ -27,7 +27,7 @@ november-2020 = ["replace-default"] [dependencies] house = { path = "../house" } -itsybitsy_m0 = "0.5" +itsybitsy_m0 = "0.10" lights = { path = "../lights" } lights_hal = { path = "../itsybitsy_m0_lights", package = "itsybitsy_m0_lights" } panic-halt = "0.2" diff --git a/hello_gradient/Cargo.lock b/hello_gradient/Cargo.lock index 9d2bd82..8f6120d 100644 --- a/hello_gradient/Cargo.lock +++ b/hello_gradient/Cargo.lock @@ -11,6 +11,16 @@ dependencies = [ "as-slice", ] +[[package]] +name = "apa102-spi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92cd690fd2aae5bc549e2dc392d9082aab3ccf851aa39b0ab84b2934f4c57a3" +dependencies = [ + "embedded-hal", + "smart-leds-trait", +] + [[package]] name = "as-slice" version = "0.1.0" @@ -31,13 +41,42 @@ dependencies = [ "bitfield", "cortex-m 0.6.7", "embedded-hal", - "nb", - "paste", - "rand_core 0.5.1", + "nb 0.1.3", + "paste 0.1.6", + "rand_core", "vcell", "void", ] +[[package]] +name = "atsamd-hal" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "868f22ff864d664efd9a0134cad0905d918f62f3b14d7761ca6d64bdcb1df96b" +dependencies = [ + "atsamd21g", + "bitfield", + "cortex-m 0.6.7", + "embedded-hal", + "nb 0.1.3", + "paste 1.0.5", + "rand_core", + "vcell", + "void", +] + +[[package]] +name = "atsamd21g" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d4092551cf82644de22191ad79c734adbd88df8e2b861e7b614d7e7891c83c7" +dependencies = [ + "bare-metal", + "cortex-m 0.6.7", + "cortex-m-rt", + "vcell", +] + [[package]] name = "atsamd21g18a" version = "0.6.0" @@ -59,12 +98,28 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "bitbang-hal" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "470e1522d257e4c76245980d27d5d279442cb18955cc6341249b904074033f4a" +dependencies = [ + "embedded-hal", + "nb 0.1.3", +] + [[package]] name = "bitfield" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" +[[package]] +name = "bytemuck" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9966d2ab714d0f785dbac0a0396251a35280aeb42413281617d0209ab4898435" + [[package]] name = "cortex-m" version = "0.6.7" @@ -92,9 +147,9 @@ dependencies = [ [[package]] name = "cortex-m-rt" -version = "0.6.10" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17805910e3ecf029bdbfcc42b7384d9e3d9e5626153fa810002c1ef9839338ac" +checksum = "b6d8353767db816419630a76d5f1ad5b09610d22b67ceb59647df6a8abc667f8" dependencies = [ "cortex-m-rt-macros", "r0", @@ -102,23 +157,22 @@ dependencies = [ [[package]] name = "cortex-m-rt-macros" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ae692573e0acccb1579fef1abf5a5bf1d2f3f0149a22b16870ec9309aee25f" +checksum = "4717562afbba06e760d34451919f5c3bf3ac15c7bb897e8b04862a7428378647" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "rand", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "embedded-hal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa998ce59ec9765d15216393af37a58961ddcefb14c753b4816ba2191d865fcb" +checksum = "db184d3fa27bc7a2344250394c0264144dfe0bc81a4401801dcb964b8dd172ad" dependencies = [ - "nb", + "nb 0.1.3", "void", ] @@ -136,7 +190,7 @@ name = "hello_gradient" version = "0.1.0" dependencies = [ "house", - "itsybitsy_m0", + "itsybitsy_m0 0.5.0", "itsybitsy_m0_lights", "lights", "panic-halt", @@ -155,21 +209,36 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f00eb09c5591b0d404f671bc87d9e39120d558ea74025d367b28bb61acc9b10" dependencies = [ - "atsamd-hal", + "atsamd-hal 0.7.4", "cortex-m 0.6.7", "cortex-m-rt", "embedded-hal", - "nb", + "nb 0.1.3", +] + +[[package]] +name = "itsybitsy_m0" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5910604281fc0ab4d2cd7b1284443a1945615c99fde191baca60d6e097b2408c" +dependencies = [ + "apa102-spi", + "atsamd-hal 0.12.0", + "bitbang-hal", + "cortex-m 0.6.7", + "cortex-m-rt", + "embedded-hal", + "nb 0.1.3", + "smart-leds", ] [[package]] name = "itsybitsy_m0_lights" version = "0.1.0" dependencies = [ - "atsamd21g18a", "cortex-m 0.7.3", "embedded-hal", - "itsybitsy_m0", + "itsybitsy_m0 0.10.0", "lights", "panic-halt", ] @@ -180,9 +249,18 @@ version = "0.1.0" [[package]] name = "nb" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc" +checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" +dependencies = [ + "nb 1.0.0", +] + +[[package]] +name = "nb" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" [[package]] name = "panic-halt" @@ -200,6 +278,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "paste" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" + [[package]] name = "paste-impl" version = "0.1.6" @@ -207,9 +291,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.6", - "quote 1.0.2", - "syn 1.0.5", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -218,18 +302,9 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" dependencies = [ - "proc-macro2 1.0.6", - "quote 1.0.2", - "syn 1.0.5", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -238,16 +313,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" dependencies = [ - "unicode-xid 0.2.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", + "unicode-xid", ] [[package]] @@ -256,7 +322,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" dependencies = [ - "proc-macro2 1.0.6", + "proc-macro2", ] [[package]] @@ -265,36 +331,21 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f" -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +[[package]] +name = "rgb" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fddb3b23626145d1776addfc307e1a1851f60ef6ca64f376bcb889697144cf0" +dependencies = [ + "bytemuck", +] + [[package]] name = "rustc_version" version = "0.2.3" @@ -319,32 +370,39 @@ 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.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" dependencies = [ - "proc-macro2 1.0.6", - "quote 1.0.2", - "unicode-xid 0.2.0", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] @@ -353,12 +411,6 @@ version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.0" diff --git a/itsybitsy_m0_lights/Cargo.toml b/itsybitsy_m0_lights/Cargo.toml index 4c267f1..4a2ec9d 100644 --- a/itsybitsy_m0_lights/Cargo.toml +++ b/itsybitsy_m0_lights/Cargo.toml @@ -5,9 +5,8 @@ authors = ["Tangent 128 "] edition = "2018" [dependencies] -atsamd21g18a = "0.6.0" cortex-m = { version = "0.7.1" } -embedded-hal = "0.2.3" -itsybitsy_m0 = "0.5.0" +embedded-hal = "0.2.5" +itsybitsy_m0 = "0.10" lights = { path = "../lights" } panic-halt = "0.2" diff --git a/itsybitsy_m0_lights/src/lib.rs b/itsybitsy_m0_lights/src/lib.rs index 05a083f..0786634 100644 --- a/itsybitsy_m0_lights/src/lib.rs +++ b/itsybitsy_m0_lights/src/lib.rs @@ -8,27 +8,23 @@ extern crate panic_halt; pub use cortex_m::asm::delay; pub use hal::entry; -use atsamd21g18a::{ - Peripherals -}; -use core::u8; use core::fmt::Debug; +use core::u8; pub use embedded_hal::digital::v2::OutputPin; -use hal::{ - clock::GenericClockController, -}; -use lights::{ - HardwareRgb, - Lights -}; +use hal::{clock::GenericClockController, pac::Peripherals}; +use lights::{HardwareRgb, Lights}; -pub fn boot() -> NeopixelLights, impl OutputPin, impl OutputPin> { +pub fn boot() -> NeopixelLights< + impl OutputPin, + impl OutputPin, + impl OutputPin, +> { let mut peripherals = Peripherals::take().unwrap(); let _clock = GenericClockController::with_internal_32kosc( peripherals.GCLK, &mut peripherals.PM, &mut peripherals.SYSCTRL, - &mut peripherals.NVMCTRL + &mut peripherals.NVMCTRL, ); let mut pins = hal::Pins::new(peripherals.PORT); @@ -50,17 +46,17 @@ pub fn boot() -> NeopixelLights, impl OutputPin { pub out: T, pub high_out: U, pub red_led: V, - pub debug_light: bool + pub debug_light: bool, } impl NeopixelLights @@ -72,7 +68,11 @@ where #[inline] pub fn write(&mut self, bit: bool) { self.high_out.set_high().unwrap(); - delay(if bit { ONE_HIGH_CYCLES } else { ZERO_HIGH_CYCLES }); + delay(if bit { + ONE_HIGH_CYCLES + } else { + ZERO_HIGH_CYCLES + }); self.high_out.set_low().unwrap(); delay(if bit { ONE_LOW_CYCLES } else { ZERO_LOW_CYCLES }); }