From 359ab967795b47e7e447356d1b97dd3266510468 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Fri, 21 Feb 2025 10:28:41 -0500
Subject: [PATCH 01/34] Prototype for an l10n message bundle database
---
Cargo.lock | 587 +++++++---------------------------------
Cargo.toml | 2 +-
l10n-db/Cargo.toml | 19 ++
l10n-db/src/bin/main.rs | 37 +++
l10n-db/src/bundle.rs | 24 ++
l10n-db/src/lib.rs | 20 ++
l10n-db/src/types.rs | 46 ++++
7 files changed, 248 insertions(+), 487 deletions(-)
create mode 100644 l10n-db/Cargo.toml
create mode 100644 l10n-db/src/bin/main.rs
create mode 100644 l10n-db/src/bundle.rs
create mode 100644 l10n-db/src/lib.rs
create mode 100644 l10n-db/src/types.rs
diff --git a/Cargo.lock b/Cargo.lock
index 2d0019f..8f28b30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,18 +29,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check 0.9.5",
- "zerocopy",
-]
-
[[package]]
name = "aho-corasick"
version = "1.1.3"
@@ -137,16 +125,6 @@ version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
-[[package]]
-name = "assert-json-diff"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
-dependencies = [
- "serde 1.0.217",
- "serde_json",
-]
-
[[package]]
name = "async-channel"
version = "1.9.0"
@@ -293,7 +271,7 @@ dependencies = [
"base64ct",
"clap",
"cool_asserts",
- "serde 1.0.217",
+ "serde 1.0.218",
"sha2",
"sqlx",
"thiserror 1.0.69",
@@ -301,12 +279,6 @@ dependencies = [
"uuid 0.4.0",
]
-[[package]]
-name = "auto-future"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1e7e457ea78e524f48639f551fd79703ac3f2237f5ecccdf4708f8a75ad373"
-
[[package]]
name = "autocfg"
version = "0.1.8"
@@ -322,103 +294,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-[[package]]
-name = "axum"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
-dependencies = [
- "async-trait",
- "axum-core",
- "axum-macros",
- "bytes",
- "futures-util",
- "http 1.2.0",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.5.2",
- "hyper-util",
- "itoa",
- "matchit",
- "memchr",
- "mime 0.3.17",
- "percent-encoding 2.3.1",
- "pin-project-lite",
- "rustversion",
- "serde 1.0.217",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 1.2.0",
- "http-body 1.0.1",
- "http-body-util",
- "mime 0.3.17",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper 1.0.2",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-macros"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "axum-test"
-version = "16.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e3a443d2608936a02a222da7b746eb412fede7225b3030b64fe9be99eab8dc"
-dependencies = [
- "anyhow",
- "assert-json-diff",
- "auto-future",
- "axum",
- "bytes",
- "bytesize",
- "cookie 0.18.1",
- "http 1.2.0",
- "http-body-util",
- "hyper 1.5.2",
- "hyper-util",
- "mime 0.3.17",
- "pretty_assertions",
- "reserve-port",
- "rust-multipart-rfc7578_2",
- "serde 1.0.217",
- "serde_json",
- "serde_urlencoded",
- "smallvec",
- "tokio",
- "tower",
- "url 2.5.4",
-]
-
[[package]]
name = "az"
version = "1.2.1"
@@ -522,7 +397,7 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -577,12 +452,6 @@ version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
-[[package]]
-name = "bytesize"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
-
[[package]]
name = "cairo-rs"
version = "0.18.5"
@@ -659,7 +528,7 @@ dependencies = [
"iana-time-zone",
"js-sys",
"num-traits",
- "serde 1.0.217",
+ "serde 1.0.218",
"wasm-bindgen",
"windows-targets 0.52.6",
]
@@ -673,7 +542,7 @@ dependencies = [
"chrono",
"chrono-tz-build",
"phf 0.11.3",
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -700,9 +569,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.26"
+version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
dependencies = [
"clap_builder",
"clap_derive",
@@ -710,9 +579,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.26"
+version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
dependencies = [
"anstream",
"anstyle",
@@ -722,9 +591,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.24"
+version = "4.5.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -774,7 +643,7 @@ version = "0.1.0"
dependencies = [
"config-derive",
"cool_asserts",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"thiserror 1.0.69",
]
@@ -812,16 +681,6 @@ dependencies = [
"version_check 0.9.5",
]
-[[package]]
-name = "cookie"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
-dependencies = [
- "time 0.3.37",
- "version_check 0.9.5",
-]
-
[[package]]
name = "cookie-factory"
version = "0.3.3"
@@ -958,7 +817,7 @@ dependencies = [
"gio",
"glib",
"gtk4",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_yml",
]
@@ -1004,7 +863,7 @@ dependencies = [
"libadwaita",
"memorycache",
"reqwest",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"tokio",
"unic-langid",
@@ -1046,12 +905,6 @@ dependencies = [
"powerfmt",
]
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
[[package]]
name = "digest"
version = "0.10.7"
@@ -1072,7 +925,7 @@ checksum = "2517b0555262aeeda0d107a40ecfbbcf185921180ffb4acf316ebe0887467e26"
dependencies = [
"generic-array 0.11.2",
"num-traits",
- "serde 1.0.217",
+ "serde 1.0.218",
"typenum",
]
@@ -1084,7 +937,7 @@ checksum = "a0b0a86c5d31c93238ff4b694fa31f3acdf67440770dc314c57d90e433914397"
dependencies = [
"generic-array 0.14.7",
"num-traits",
- "serde 1.0.217",
+ "serde 1.0.218",
"typenum",
]
@@ -1111,7 +964,7 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -1121,7 +974,7 @@ dependencies = [
"chrono",
"chrono-tz",
"dimensioned 0.7.0",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_derive",
"serde_json",
"tempfile",
@@ -1220,18 +1073,6 @@ dependencies = [
"zune-inflate",
]
-[[package]]
-name = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
[[package]]
name = "fastrand"
version = "2.3.0"
@@ -1267,7 +1108,7 @@ dependencies = [
"bytes",
"chrono",
"clap",
- "cookie 0.17.0",
+ "cookie",
"cool_asserts",
"futures-util",
"hex-string",
@@ -1278,7 +1119,7 @@ dependencies = [
"mime 0.3.17",
"mime_guess 2.0.5",
"pretty_env_logger",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"sha2",
"tempdir",
@@ -1440,7 +1281,7 @@ dependencies = [
"chrono-tz",
"dimensioned 0.8.0",
"emseries",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"tempfile",
]
@@ -1762,7 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
dependencies = [
"heck 0.4.1",
- "proc-macro-crate 2.0.2",
+ "proc-macro-crate 2.0.0",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1810,7 +1651,7 @@ dependencies = [
"glib-build-tools 0.16.3",
"gtk4",
"libadwaita",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"tokio",
]
@@ -1820,7 +1661,7 @@ name = "gm-dash"
version = "0.1.0"
dependencies = [
"pipewire",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"tokio",
"warp",
@@ -1983,15 +1824,6 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
-]
-
[[package]]
name = "hashbrown"
version = "0.15.2"
@@ -2003,22 +1835,13 @@ dependencies = [
"foldhash",
]
-[[package]]
-name = "hashlink"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
[[package]]
name = "hashlink"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown",
]
[[package]]
@@ -2154,29 +1977,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http 1.2.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.2.0",
- "http-body 1.0.1",
- "pin-project-lite",
-]
-
[[package]]
name = "httparse"
version = "1.9.5"
@@ -2226,7 +2026,7 @@ dependencies = [
"futures-util",
"h2",
"http 0.2.12",
- "http-body 0.4.6",
+ "http-body",
"httparse",
"httpdate",
"itoa",
@@ -2238,26 +2038,6 @@ dependencies = [
"want",
]
-[[package]]
-name = "hyper"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.2.0",
- "http-body 1.0.1",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
[[package]]
name = "hyper-tls"
version = "0.5.0"
@@ -2271,25 +2051,6 @@ dependencies = [
"tokio-native-tls",
]
-[[package]]
-name = "hyper-util"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.2.0",
- "http-body 1.0.1",
- "hyper 1.5.2",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
-]
-
[[package]]
name = "iana-time-zone"
version = "0.1.61"
@@ -2343,6 +2104,7 @@ checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
dependencies = [
"displaydoc",
"litemap",
+ "serde 1.0.218",
"tinystr",
"writeable",
"zerovec",
@@ -2510,25 +2272,6 @@ dependencies = [
"tiff 0.9.1",
]
-[[package]]
-name = "include_dir"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
-dependencies = [
- "include_dir_macros",
-]
-
-[[package]]
-name = "include_dir_macros"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
[[package]]
name = "indent_write"
version = "2.2.0"
@@ -2542,7 +2285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
dependencies = [
"equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
]
[[package]]
@@ -2655,6 +2398,16 @@ dependencies = [
"log 0.4.25",
]
+[[package]]
+name = "l10n-db"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "icu_locid",
+ "serde 1.0.218",
+ "toml",
+]
+
[[package]]
name = "language-tags"
version = "0.2.2"
@@ -2850,12 +2603,6 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
[[package]]
name = "md-5"
version = "0.10.6"
@@ -2887,7 +2634,7 @@ version = "0.1.0"
dependencies = [
"chrono",
"futures",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_derive",
"tokio",
]
@@ -3205,7 +2952,7 @@ dependencies = [
"cool_asserts",
"grid",
"nary_tree",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"sgf",
"thiserror 1.0.69",
@@ -3555,16 +3302,6 @@ dependencies = [
"zerocopy",
]
-[[package]]
-name = "pretty_assertions"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-dependencies = [
- "diff",
- "yansi",
-]
-
[[package]]
name = "pretty_env_logger"
version = "0.5.0"
@@ -3587,11 +3324,10 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "2.0.2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
dependencies = [
- "toml_datetime",
"toml_edit 0.20.2",
]
@@ -3929,7 +3665,7 @@ dependencies = [
"futures-util",
"h2",
"http 0.2.12",
- "http-body 0.4.6",
+ "http-body",
"hyper 0.14.32",
"hyper-tls",
"ipnet",
@@ -3941,10 +3677,10 @@ dependencies = [
"percent-encoding 2.3.1",
"pin-project-lite",
"rustls-pemfile",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"serde_urlencoded",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
"system-configuration",
"tokio",
"tokio-native-tls",
@@ -3956,16 +3692,6 @@ dependencies = [
"winreg",
]
-[[package]]
-name = "reserve-port"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9838134a2bfaa8e1f40738fcc972ac799de6e0e06b5157acb95fc2b05a0ea283"
-dependencies = [
- "lazy_static",
- "thiserror 1.0.69",
-]
-
[[package]]
name = "result-extended"
version = "0.1.0"
@@ -3993,47 +3719,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "rusqlite"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
-dependencies = [
- "bitflags 2.8.0",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink 0.9.1",
- "libsqlite3-sys",
- "smallvec",
-]
-
-[[package]]
-name = "rusqlite_migration"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923b42e802f7dc20a0a6b5e097ba7c83fe4289da07e49156fecf6af08aa9cd1c"
-dependencies = [
- "include_dir",
- "log 0.4.25",
- "rusqlite",
-]
-
-[[package]]
-name = "rust-multipart-rfc7578_2"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b748410c0afdef2ebbe3685a6a862e2ee937127cdaae623336a459451c8d57"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-util",
- "http 0.2.12",
- "mime 0.3.17",
- "mime_guess 2.0.5",
- "rand 0.8.5",
- "thiserror 1.0.69",
-]
-
[[package]]
name = "rustc-demangle"
version = "0.1.24"
@@ -4195,18 +3880,18 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
[[package]]
name = "serde"
-version = "1.0.217"
+version = "1.0.218"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
dependencies = [
"proc-macro2",
"quote",
@@ -4222,17 +3907,7 @@ dependencies = [
"itoa",
"memchr",
"ryu",
- "serde 1.0.217",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -4241,7 +3916,7 @@ version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -4253,7 +3928,7 @@ dependencies = [
"form_urlencoded",
"itoa",
"ryu",
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -4267,10 +3942,14 @@ dependencies = [
"libyml",
"memchr",
"ryu",
- "serde 1.0.217",
+ "serde 1.0.218",
"version_check 0.9.5",
]
+[[package]]
+name = "server"
+version = "0.1.0"
+
[[package]]
name = "sgf"
version = "0.1.0"
@@ -4279,7 +3958,7 @@ dependencies = [
"cool_asserts",
"nary_tree",
"nom",
- "serde 1.0.217",
+ "serde 1.0.218",
"thiserror 1.0.69",
"typeshare",
"uuid 0.8.2",
@@ -4380,7 +4059,7 @@ version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -4446,14 +4125,14 @@ dependencies = [
"futures-intrusive",
"futures-io",
"futures-util",
- "hashbrown 0.15.2",
- "hashlink 0.10.0",
+ "hashbrown",
+ "hashlink",
"indexmap",
"log 0.4.25",
"memchr",
"once_cell",
"percent-encoding 2.3.1",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"sha2",
"smallvec",
@@ -4490,7 +4169,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"sha2",
"sqlx-core",
@@ -4534,7 +4213,7 @@ dependencies = [
"percent-encoding 2.3.1",
"rand 0.8.5",
"rsa",
- "serde 1.0.217",
+ "serde 1.0.218",
"sha1",
"sha2",
"smallvec",
@@ -4571,7 +4250,7 @@ dependencies = [
"memchr",
"once_cell",
"rand 0.8.5",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"sha2",
"smallvec",
@@ -4598,7 +4277,7 @@ dependencies = [
"libsqlite3-sys",
"log 0.4.25",
"percent-encoding 2.3.1",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_urlencoded",
"sqlx-core",
"tracing",
@@ -4662,12 +4341,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-[[package]]
-name = "sync_wrapper"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-
[[package]]
name = "synstructure"
version = "0.13.1"
@@ -4835,7 +4508,7 @@ dependencies = [
"itoa",
"num-conv",
"powerfmt",
- "serde 1.0.217",
+ "serde 1.0.218",
"time-core",
"time-macros",
]
@@ -4871,6 +4544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
"displaydoc",
+ "serde 1.0.218",
"zerovec",
]
@@ -4966,23 +4640,23 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.2"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.22.24",
]
[[package]]
name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -4993,7 +4667,7 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap",
"toml_datetime",
- "winnow",
+ "winnow 0.5.40",
]
[[package]]
@@ -5003,48 +4677,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [
"indexmap",
- "serde 1.0.217",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+dependencies = [
+ "indexmap",
+ "serde 1.0.218",
"serde_spanned",
"toml_datetime",
- "winnow",
+ "winnow 0.7.3",
]
-[[package]]
-name = "tower"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project-lite",
- "sync_wrapper 1.0.2",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
-dependencies = [
- "bitflags 2.8.0",
- "bytes",
- "http 1.2.0",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
[[package]]
name = "tower-service"
version = "0.3.3"
@@ -5155,7 +4804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19be0f411120091e76e13e5a0186d8e2bcc3e7e244afdb70152197f1a8486ceb"
dependencies = [
"chrono",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"typeshare-annotation",
]
@@ -5279,12 +4928,6 @@ dependencies = [
"percent-encoding 2.3.1",
]
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
[[package]]
name = "utf-8"
version = "0.7.6"
@@ -5326,7 +4969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
"getrandom",
- "serde 1.0.217",
+ "serde 1.0.218",
]
[[package]]
@@ -5368,37 +5011,6 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-[[package]]
-name = "visions"
-version = "0.1.0"
-dependencies = [
- "async-std",
- "async-trait",
- "authdb",
- "axum",
- "axum-test",
- "chrono",
- "cool_asserts",
- "futures",
- "include_dir",
- "lazy_static",
- "mime 0.3.17",
- "mime_guess 2.0.5",
- "pretty_env_logger",
- "result-extended",
- "rusqlite",
- "rusqlite_migration",
- "serde 1.0.217",
- "serde_json",
- "thiserror 2.0.11",
- "tokio",
- "tokio-stream",
- "tower-http",
- "typeshare",
- "urlencoding",
- "uuid 1.12.0",
-]
-
[[package]]
name = "wait-timeout"
version = "0.2.0"
@@ -5436,7 +5048,7 @@ dependencies = [
"percent-encoding 2.3.1",
"pin-project",
"scoped-tls",
- "serde 1.0.217",
+ "serde 1.0.218",
"serde_json",
"serde_urlencoded",
"tokio",
@@ -5758,6 +5370,15 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "winnow"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "winreg"
version = "0.50.0"
@@ -5780,12 +5401,6 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
[[package]]
name = "yansi-term"
version = "0.1.2"
@@ -5801,7 +5416,7 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
dependencies = [
- "serde 1.0.217",
+ "serde 1.0.218",
"stable_deref_trait",
"yoke-derive",
"zerofrom",
diff --git a/Cargo.toml b/Cargo.toml
index cc29ea7..d982233 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,4 +33,4 @@ members = [
"tree",
"visions/server",
"gm-dash/server"
-]
+, "l10n-db"]
diff --git a/l10n-db/Cargo.toml b/l10n-db/Cargo.toml
new file mode 100644
index 0000000..d50c181
--- /dev/null
+++ b/l10n-db/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "l10n-db"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+clap = { version = "4.5.30", features = ["derive"] }
+icu_locid = { version = "1.5.0", features = ["serde"] }
+serde = { version = "1.0.218", features = ["derive"] }
+toml = "0.8.20"
+
+# [lib]
+# name = "l10n_db"
+# path = "src/lib.rs"
+#
+# [[bin]]
+# name = "l10n-db"
+# path = "src/main.rs"
+
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
new file mode 100644
index 0000000..0ff2a5c
--- /dev/null
+++ b/l10n-db/src/bin/main.rs
@@ -0,0 +1,37 @@
+use clap::{Parser, Subcommand};
+
+use l10n_db;
+
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+struct Cli {
+ #[command(subcommand)]
+ command: Option<Commands>,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+ // Edit, potentially creating, a key
+ // EditKey { },
+ // List al keys in the database
+ ListKeys,
+ // Search the database
+ // Search { },
+ /// Export the database
+ Export {
+ #[arg(short, long)]
+ format: String,
+ #[arg(short, long)]
+ locale: String
+ },
+}
+
+fn main() {
+ let cli = Cli::parse();
+
+ match &cli.command {
+ Some(Commands::ListKeys) => todo!(),
+ Some(Commands::Export{..}) => todo!(),
+ None => {},
+ }
+}
diff --git a/l10n-db/src/bundle.rs b/l10n-db/src/bundle.rs
new file mode 100644
index 0000000..2f7572c
--- /dev/null
+++ b/l10n-db/src/bundle.rs
@@ -0,0 +1,24 @@
+use std::{collections::HashMap, path::Path};
+
+use crate::Message;
+
+pub struct Bundle {
+ messages: HashMap<String, Message>
+}
+
+impl Bundle {
+ pub fn new() -> Self {
+ Self{ messages: HashMap::new() }
+ }
+
+ pub fn load_from_disk(path: &Path) -> Self {
+ Self {
+ messages: HashMap::new()
+ }
+ }
+}
+
+
+#[cfg(test)]
+mod test {
+}
diff --git a/l10n-db/src/lib.rs b/l10n-db/src/lib.rs
new file mode 100644
index 0000000..1dd4cc3
--- /dev/null
+++ b/l10n-db/src/lib.rs
@@ -0,0 +1,20 @@
+mod bundle;
+pub use bundle::Bundle;
+
+mod types;
+pub use types::{Message, Variant};
+
+/*
+#[cfg(test)]
+mod test {
+ #[test]
+ fn it_can_represent_an_untranslated_message() {
+ todo!()
+ }
+
+ #[test]
+ fn it_can_represent_a_partially_translated_message() {
+ todo!()
+ }
+}
+*/
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
new file mode 100644
index 0000000..0e7de32
--- /dev/null
+++ b/l10n-db/src/types.rs
@@ -0,0 +1,46 @@
+use std::{collections::HashMap, time::SystemTime};
+
+use icu_locid::LanguageIdentifier;
+use serde::{Deserialize, Serialize};
+
+#[derive(Deserialize, Serialize)]
+pub struct Message {
+ key: String,
+ description: String,
+ variants: HashMap<LanguageIdentifier, Variant>,
+}
+
+impl Message {
+ pub fn new(key: String) -> Self {
+ Self {
+ key,
+ description: "".to_owned(),
+ variants: HashMap::new(),
+ }
+ }
+
+ pub fn set_description(&mut self, desc: String) {
+ self.description = desc;
+ }
+
+ pub fn description(&self) -> &str {
+ &self.description
+ }
+
+ pub fn variant_mut(&mut self, locale: LanguageIdentifier) -> &mut Variant {
+ self.variants.entry(locale.clone()).or_insert(Variant {
+ locale,
+ content: "".to_owned(),
+ modified: SystemTime::now(),
+ })
+ }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct Variant {
+ locale: LanguageIdentifier,
+ content: String,
+ modified: SystemTime,
+}
+
+
From e0392a41506ba64c3c65312df33d227c2167cfed Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 22 Feb 2025 10:23:46 -0500
Subject: [PATCH 02/34] Write a single phrase to disk
---
l10n-db/i18n/OpenSandbox.toml | 7 +++++++
l10n-db/src/bin/main.rs | 29 ++++++++++++++++++++++++----
l10n-db/src/bundle.rs | 36 +++++++++++++++++++++++++----------
l10n-db/src/types.rs | 19 ++++++++++++++----
4 files changed, 73 insertions(+), 18 deletions(-)
create mode 100644 l10n-db/i18n/OpenSandbox.toml
diff --git a/l10n-db/i18n/OpenSandbox.toml b/l10n-db/i18n/OpenSandbox.toml
new file mode 100644
index 0000000..7df243d
--- /dev/null
+++ b/l10n-db/i18n/OpenSandbox.toml
@@ -0,0 +1,7 @@
+key = "OpenSandbox"
+description = "Open a sandbox"
+
+[variants.en-US]
+locale = "en-US"
+content = "Open a sandbox vault"
+modified = 1740198524
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index 0ff2a5c..39602cb 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -1,6 +1,9 @@
+use std::path::PathBuf;
+
use clap::{Parser, Subcommand};
-use l10n_db;
+use icu_locid::{langid, LanguageIdentifier};
+use l10n_db::{self, Bundle};
#[derive(Parser)]
#[command(version, about, long_about = None)]
@@ -11,9 +14,9 @@ struct Cli {
#[derive(Subcommand)]
enum Commands {
- // Edit, potentially creating, a key
- // EditKey { },
- // List al keys in the database
+ /// Edit, potentially creating, a key
+ EditKey { name: String, locale: String },
+ /// List al keys in the database
ListKeys,
// Search the database
// Search { },
@@ -26,10 +29,28 @@ enum Commands {
},
}
+fn edit_key(bundle: &mut Bundle, key: String, editor: &str) {
+ let message = bundle.message(key);
+
+ println!("message: {:?}", message);
+
+ message.set_description("Open a sandbox".to_owned());
+ let variant = message.variant_mut(langid!("en-US"));
+ variant.set_content("Open a sandbox vault".to_owned());
+
+ bundle.save();
+}
+
fn main() {
+ let editor = std::env::var("EDITOR").unwrap();
+ let db_path = std::env::var("DB_PATH").unwrap();
+
let cli = Cli::parse();
+ let mut bundle = Bundle::load_from_disk(PathBuf::from(&db_path));
+
match &cli.command {
+ Some(Commands::EditKey{ name, locale } ) => edit_key(&mut bundle, name.to_owned(), &editor),
Some(Commands::ListKeys) => todo!(),
Some(Commands::Export{..}) => todo!(),
None => {},
diff --git a/l10n-db/src/bundle.rs b/l10n-db/src/bundle.rs
index 2f7572c..aa0f8ee 100644
--- a/l10n-db/src/bundle.rs
+++ b/l10n-db/src/bundle.rs
@@ -1,24 +1,40 @@
-use std::{collections::HashMap, path::Path};
+use std::{collections::HashMap, fs::File, io::Write, path::PathBuf};
use crate::Message;
pub struct Bundle {
- messages: HashMap<String, Message>
+ path: PathBuf,
+ messages: HashMap<String, Message>,
}
impl Bundle {
- pub fn new() -> Self {
- Self{ messages: HashMap::new() }
- }
-
- pub fn load_from_disk(path: &Path) -> Self {
+ pub fn load_from_disk(path: PathBuf) -> Self {
Self {
- messages: HashMap::new()
+ path,
+ messages: HashMap::new(),
}
}
+
+ pub fn message(&mut self, name: String) -> &mut Message {
+ self.messages
+ .entry(name.to_owned())
+ .or_insert(Message::new(name.to_owned()))
+ }
+
+ pub fn save(&self) {
+ self.messages.iter().for_each(|(key, value)| {
+ let mut path = self.path.clone();
+ path.push(key);
+ path.set_extension("toml");
+ save_file(&path, toml::to_string(value).unwrap().as_bytes());
+ });
+ }
}
+fn save_file(path: &PathBuf, s: &[u8]) {
+ let mut f = File::create(path).unwrap();
+ f.write(s).unwrap();
+}
#[cfg(test)]
-mod test {
-}
+mod test {}
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index 0e7de32..c6ca0d1 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -1,9 +1,9 @@
-use std::{collections::HashMap, time::SystemTime};
+use std::{collections::HashMap, time::{SystemTime, UNIX_EPOCH}};
use icu_locid::LanguageIdentifier;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize, Serializer};
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
pub struct Message {
key: String,
description: String,
@@ -36,11 +36,22 @@ impl Message {
}
}
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
pub struct Variant {
locale: LanguageIdentifier,
content: String,
+ #[serde(serialize_with = "time_to_number")]
modified: SystemTime,
}
+impl Variant {
+ pub fn set_content(&mut self, content: String) {
+ self.content = content;
+ self.modified = SystemTime::now();
+ }
+}
+fn time_to_number<S>(time: &SystemTime, s: S) -> Result<S::Ok, S::Error>
+where S: Serializer {
+ s.serialize_u64(time.duration_since(UNIX_EPOCH).unwrap().as_secs())
+}
From e16fef2b14daa27c979c07c75b863fc3b645545c Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 22 Feb 2025 11:22:14 -0500
Subject: [PATCH 03/34] Write a rudimentary editor
---
Cargo.lock | 43 +++++++++++++++++++++++++----
l10n-db/Cargo.toml | 1 +
l10n-db/i18n/OpenSandbox.toml | 6 ++--
l10n-db/src/bin/main.rs | 29 ++++++++++++++++---
l10n-db/src/editor.rs | 52 +++++++++++++++++++++++++++++++++++
l10n-db/src/lib.rs | 3 ++
l10n-db/src/types.rs | 4 +++
7 files changed, 125 insertions(+), 13 deletions(-)
create mode 100644 l10n-db/src/editor.rs
diff --git a/Cargo.lock b/Cargo.lock
index 8f28b30..372fc49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1497,6 +1497,18 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
]
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "gif"
version = "0.11.4"
@@ -2405,6 +2417,7 @@ dependencies = [
"clap",
"icu_locid",
"serde 1.0.218",
+ "tempfile",
"toml",
]
@@ -3502,7 +3515,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
]
[[package]]
@@ -4404,13 +4417,13 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.15.0"
+version = "3.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
dependencies = [
"cfg-if",
"fastrand",
- "getrandom",
+ "getrandom 0.3.1",
"once_cell",
"rustix",
"windows-sys 0.59.0",
@@ -4968,7 +4981,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
"serde 1.0.218",
]
@@ -4978,7 +4991,7 @@ version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
]
[[package]]
@@ -5070,6 +5083,15 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
[[package]]
name = "wasite"
version = "0.1.0"
@@ -5389,6 +5411,15 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
[[package]]
name = "write16"
version = "1.0.0"
diff --git a/l10n-db/Cargo.toml b/l10n-db/Cargo.toml
index d50c181..8dda9ff 100644
--- a/l10n-db/Cargo.toml
+++ b/l10n-db/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
clap = { version = "4.5.30", features = ["derive"] }
icu_locid = { version = "1.5.0", features = ["serde"] }
serde = { version = "1.0.218", features = ["derive"] }
+tempfile = "3.17.1"
toml = "0.8.20"
# [lib]
diff --git a/l10n-db/i18n/OpenSandbox.toml b/l10n-db/i18n/OpenSandbox.toml
index 7df243d..1f24302 100644
--- a/l10n-db/i18n/OpenSandbox.toml
+++ b/l10n-db/i18n/OpenSandbox.toml
@@ -1,7 +1,7 @@
key = "OpenSandbox"
-description = "Open a sandbox"
+description = "a basic description without any content"
[variants.en-US]
locale = "en-US"
-content = "Open a sandbox vault"
-modified = 1740198524
+content = ""
+modified = 1740241312
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index 39602cb..a51d432 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -1,9 +1,9 @@
-use std::path::PathBuf;
+use std::{io::{BufReader, Read, Write}, path::PathBuf, process::Command};
use clap::{Parser, Subcommand};
use icu_locid::{langid, LanguageIdentifier};
-use l10n_db::{self, Bundle};
+use l10n_db::{self, Bundle, Editor};
#[derive(Parser)]
#[command(version, about, long_about = None)]
@@ -29,14 +29,35 @@ enum Commands {
},
}
-fn edit_key(bundle: &mut Bundle, key: String, editor: &str) {
+fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor: &str) {
let message = bundle.message(key);
+ Editor::edit(message, locale, editor);
+
+ println!("final version");
+ println!("{}", toml::to_string(&message).unwrap());
+
+ /*
+ let mut editor_file = tempfile::NamedTempFile::new().unwrap();
+ let _ = editor_file.write(toml::to_string(message).unwrap().as_bytes());
+ let _ = editor_file.flush();
+ let mut cmd = Command::new(editor).args([editor_file.path()]).spawn().unwrap();
+ cmd.wait().unwrap();
+ let _ = editor_file.flush();
+ let mut reader = BufReader::new(editor_file);
+ let mut content = Vec::new();
+ let _ = reader.read_to_end(&mut content);
+
+ println!("content");
+ println!("{}", String::from_utf8(content).unwrap());
+
+
println!("message: {:?}", message);
message.set_description("Open a sandbox".to_owned());
let variant = message.variant_mut(langid!("en-US"));
variant.set_content("Open a sandbox vault".to_owned());
+ */
bundle.save();
}
@@ -50,7 +71,7 @@ fn main() {
let mut bundle = Bundle::load_from_disk(PathBuf::from(&db_path));
match &cli.command {
- Some(Commands::EditKey{ name, locale } ) => edit_key(&mut bundle, name.to_owned(), &editor),
+ Some(Commands::EditKey{ name, locale } ) => edit_key(&mut bundle, name.to_owned(), langid!("en-US"), &editor),
Some(Commands::ListKeys) => todo!(),
Some(Commands::Export{..}) => todo!(),
None => {},
diff --git a/l10n-db/src/editor.rs b/l10n-db/src/editor.rs
new file mode 100644
index 0000000..a650b39
--- /dev/null
+++ b/l10n-db/src/editor.rs
@@ -0,0 +1,52 @@
+use std::{io::{BufReader, Read, Write}, path::Path, process::Command};
+
+use icu_locid::LanguageIdentifier;
+use serde::{Deserialize, Serialize};
+
+use crate::{Message, Variant};
+
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct EditorMessage {
+ description: String,
+ content: String,
+}
+
+impl EditorMessage {
+ fn from_variant(description: String, variant: &Variant) -> Self {
+ Self {
+ description,
+ content: variant.content().to_string()
+ }
+ }
+}
+
+pub struct Editor {
+}
+
+impl Editor {
+ pub fn edit(msg: &mut Message, locale: LanguageIdentifier, editor: &str) {
+ let description = msg.description().to_owned();
+ let variant = msg.variant_mut(locale);
+ let editable_content = EditorMessage::from_variant(description, &variant);
+
+ let mut file = tempfile::NamedTempFile::new().unwrap();
+ let _ = file.write(toml::to_string(&editable_content).unwrap().as_bytes());
+ let _ = file.flush();
+ let mut cmd = Command::new(editor).args([file.path()]).spawn().unwrap();
+ cmd.wait().unwrap();
+ let file = file.reopen().unwrap();
+ let mut reader = BufReader::new(file);
+ let mut content = Vec::new();
+ let _ = reader.read_to_end(&mut content);
+
+ println!("content");
+ println!("{}", String::from_utf8(content.clone()).unwrap());
+
+ let new_variant: EditorMessage = toml::from_str(&String::from_utf8(content).unwrap()).unwrap();
+
+ variant.set_content(new_variant.content);
+ msg.set_description(new_variant.description);
+ }
+}
+
diff --git a/l10n-db/src/lib.rs b/l10n-db/src/lib.rs
index 1dd4cc3..9dd0718 100644
--- a/l10n-db/src/lib.rs
+++ b/l10n-db/src/lib.rs
@@ -1,6 +1,9 @@
mod bundle;
pub use bundle::Bundle;
+mod editor;
+pub use editor::Editor;
+
mod types;
pub use types::{Message, Variant};
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index c6ca0d1..c6ee3e5 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -45,6 +45,10 @@ pub struct Variant {
}
impl Variant {
+ pub fn content(&self) -> &str {
+ &self.content
+ }
+
pub fn set_content(&mut self, content: String) {
self.content = content;
self.modified = SystemTime::now();
From 1c3d0711e1c028a3ebfb6ffca3cbef79172085cf Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 22 Feb 2025 16:40:23 -0500
Subject: [PATCH 04/34] Start reading the bundle
---
Cargo.lock | 1 +
l10n-db/Cargo.toml | 1 +
l10n-db/i18n/OpenSandbox.toml | 6 +++---
l10n-db/src/bin/main.rs | 33 +++++----------------------------
l10n-db/src/bundle.rs | 18 +++++++++++++++---
l10n-db/src/types.rs | 34 ++++++++++++++++++++++++++--------
6 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 372fc49..d48d3bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2414,6 +2414,7 @@ dependencies = [
name = "l10n-db"
version = "0.1.0"
dependencies = [
+ "chrono",
"clap",
"icu_locid",
"serde 1.0.218",
diff --git a/l10n-db/Cargo.toml b/l10n-db/Cargo.toml
index 8dda9ff..977cd68 100644
--- a/l10n-db/Cargo.toml
+++ b/l10n-db/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
+chrono = { version = "0.4.39", features = ["serde"] }
clap = { version = "4.5.30", features = ["derive"] }
icu_locid = { version = "1.5.0", features = ["serde"] }
serde = { version = "1.0.218", features = ["derive"] }
diff --git a/l10n-db/i18n/OpenSandbox.toml b/l10n-db/i18n/OpenSandbox.toml
index 1f24302..4c963f6 100644
--- a/l10n-db/i18n/OpenSandbox.toml
+++ b/l10n-db/i18n/OpenSandbox.toml
@@ -1,7 +1,7 @@
key = "OpenSandbox"
-description = "a basic description without any content"
+description = "A sandbox vault refers to a stock vault that contains test data and allows the user to make edits and run experiments on test data."
[variants.en-US]
locale = "en-US"
-content = ""
-modified = 1740241312
+content = "Open Sandbox vault"
+modified = "2025-02-22T21:35:02.032300406Z"
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index a51d432..ecd079f 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -31,34 +31,7 @@ enum Commands {
fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor: &str) {
let message = bundle.message(key);
-
Editor::edit(message, locale, editor);
-
- println!("final version");
- println!("{}", toml::to_string(&message).unwrap());
-
- /*
- let mut editor_file = tempfile::NamedTempFile::new().unwrap();
- let _ = editor_file.write(toml::to_string(message).unwrap().as_bytes());
- let _ = editor_file.flush();
- let mut cmd = Command::new(editor).args([editor_file.path()]).spawn().unwrap();
- cmd.wait().unwrap();
- let _ = editor_file.flush();
- let mut reader = BufReader::new(editor_file);
- let mut content = Vec::new();
- let _ = reader.read_to_end(&mut content);
-
- println!("content");
- println!("{}", String::from_utf8(content).unwrap());
-
-
- println!("message: {:?}", message);
-
- message.set_description("Open a sandbox".to_owned());
- let variant = message.variant_mut(langid!("en-US"));
- variant.set_content("Open a sandbox vault".to_owned());
- */
-
bundle.save();
}
@@ -72,7 +45,11 @@ fn main() {
match &cli.command {
Some(Commands::EditKey{ name, locale } ) => edit_key(&mut bundle, name.to_owned(), langid!("en-US"), &editor),
- Some(Commands::ListKeys) => todo!(),
+ Some(Commands::ListKeys) => {
+ for (key, _) in bundle.message_iter() {
+ println!("{}", key);
+ }
+ },
Some(Commands::Export{..}) => todo!(),
None => {},
}
diff --git a/l10n-db/src/bundle.rs b/l10n-db/src/bundle.rs
index aa0f8ee..3144ea9 100644
--- a/l10n-db/src/bundle.rs
+++ b/l10n-db/src/bundle.rs
@@ -9,10 +9,22 @@ pub struct Bundle {
impl Bundle {
pub fn load_from_disk(path: PathBuf) -> Self {
- Self {
- path,
- messages: HashMap::new(),
+ let mut messages = HashMap::new();
+ if path.is_dir() {
+ for entry in std::fs::read_dir(&path).unwrap() {
+ let entry = entry.unwrap();
+ let path = entry.path().clone();
+ let key = path.file_stem().unwrap();
+
+ let message = Message::from_file(&entry.path());
+ messages.insert(key.to_str().unwrap().to_owned(), message);
+ }
}
+ Self { path, messages }
+ }
+
+ pub fn message_iter(&self) -> impl Iterator<Item = (&String, &Message)> {
+ self.messages.iter()
}
pub fn message(&mut self, name: String) -> &mut Message {
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index c6ee3e5..32c4268 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -1,7 +1,8 @@
-use std::{collections::HashMap, time::{SystemTime, UNIX_EPOCH}};
+use std::{collections::HashMap, io::{BufReader, Read}, path::Path};
+use chrono::{DateTime, Utc};
use icu_locid::LanguageIdentifier;
-use serde::{Deserialize, Serialize, Serializer};
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
#[derive(Deserialize, Serialize, Debug)]
pub struct Message {
@@ -19,6 +20,14 @@ impl Message {
}
}
+ pub fn from_file(path: &Path) -> Message {
+ let file = std::fs::File::open(path).unwrap();
+ let mut content = Vec::new();
+ let mut reader = BufReader::new(file);
+ let _ = reader.read_to_end(&mut content);
+ toml::from_str(&String::from_utf8(content).unwrap()).unwrap()
+ }
+
pub fn set_description(&mut self, desc: String) {
self.description = desc;
}
@@ -31,7 +40,7 @@ impl Message {
self.variants.entry(locale.clone()).or_insert(Variant {
locale,
content: "".to_owned(),
- modified: SystemTime::now(),
+ modified: Utc::now(),
})
}
}
@@ -40,8 +49,7 @@ impl Message {
pub struct Variant {
locale: LanguageIdentifier,
content: String,
- #[serde(serialize_with = "time_to_number")]
- modified: SystemTime,
+ modified: DateTime<Utc>,
}
impl Variant {
@@ -51,11 +59,21 @@ impl Variant {
pub fn set_content(&mut self, content: String) {
self.content = content;
- self.modified = SystemTime::now();
+ self.modified = Utc::now();
}
}
-fn time_to_number<S>(time: &SystemTime, s: S) -> Result<S::Ok, S::Error>
+/*
+fn time_to_number<S>(time: &DateTime, s: S) -> Result<S::Ok, S::Error>
where S: Serializer {
- s.serialize_u64(time.duration_since(UNIX_EPOCH).unwrap().as_secs())
+ let seconds: u64 = time.as_secs();
+ s.serialize_u64(seconds)
}
+
+fn number_to_time<'de, D>(d: D) -> Result<DateTime, D::Error>
+where D: Deserializer<'de> {
+ let buf = String::deserialize(d)?;
+ let num = buf.parse::<u64>().unwrap();
+ Ok(DateTime::try_from(num).unwrap())
+}
+*/
From 200c13a14e2ad8b5777a3602ce6c1bb0559357ad Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 22 Feb 2025 18:39:32 -0500
Subject: [PATCH 05/34] Add a configuration file
---
l10n-db/Cargo.toml | 1 +
l10n-db/config.toml | 8 ++++++
l10n-db/i18n/OpenSandbox.toml | 9 +++++--
l10n-db/src/bin/main.rs | 46 ++++++++++++++++++++++++++---------
l10n-db/src/editor.rs | 22 ++++++++++-------
l10n-db/src/lib.rs | 3 +++
l10n-db/src/types.rs | 2 +-
l10n-db/src/utils.rs | 31 +++++++++++++++++++++++
8 files changed, 99 insertions(+), 23 deletions(-)
create mode 100644 l10n-db/config.toml
create mode 100644 l10n-db/src/utils.rs
diff --git a/l10n-db/Cargo.toml b/l10n-db/Cargo.toml
index 977cd68..e36077b 100644
--- a/l10n-db/Cargo.toml
+++ b/l10n-db/Cargo.toml
@@ -9,6 +9,7 @@ clap = { version = "4.5.30", features = ["derive"] }
icu_locid = { version = "1.5.0", features = ["serde"] }
serde = { version = "1.0.218", features = ["derive"] }
tempfile = "3.17.1"
+thiserror = "2.0.11"
toml = "0.8.20"
# [lib]
diff --git a/l10n-db/config.toml b/l10n-db/config.toml
new file mode 100644
index 0000000..913bdbb
--- /dev/null
+++ b/l10n-db/config.toml
@@ -0,0 +1,8 @@
+db_path = "./i18n"
+base_locale = "en"
+locales = [
+ "en",
+ "eo",
+ "de",
+ "es",
+]
diff --git a/l10n-db/i18n/OpenSandbox.toml b/l10n-db/i18n/OpenSandbox.toml
index 4c963f6..81b7d4f 100644
--- a/l10n-db/i18n/OpenSandbox.toml
+++ b/l10n-db/i18n/OpenSandbox.toml
@@ -1,7 +1,12 @@
key = "OpenSandbox"
description = "A sandbox vault refers to a stock vault that contains test data and allows the user to make edits and run experiments on test data."
-[variants.en-US]
-locale = "en-US"
+[variants.eo]
+locale = "eo"
+content = "Malfermi sekurkofro"
+modified = "2025-02-22T23:35:29.692299091Z"
+
+[variants.en]
+locale = "en"
content = "Open Sandbox vault"
modified = "2025-02-22T21:35:02.032300406Z"
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index ecd079f..1860136 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -1,9 +1,14 @@
-use std::{io::{BufReader, Read, Write}, path::PathBuf, process::Command};
+use std::{
+ io::{BufReader, Read, Write},
+ path::PathBuf,
+ process::Command,
+};
use clap::{Parser, Subcommand};
use icu_locid::{langid, LanguageIdentifier};
-use l10n_db::{self, Bundle, Editor};
+use l10n_db::{self, read_file, Bundle, Editor, ReadError};
+use serde::Deserialize;
#[derive(Parser)]
#[command(version, about, long_about = None)]
@@ -15,7 +20,12 @@ struct Cli {
#[derive(Subcommand)]
enum Commands {
/// Edit, potentially creating, a key
- EditKey { name: String, locale: String },
+ EditKey {
+ #[arg(short, long)]
+ name: String,
+ #[arg(short, long)]
+ locale: String,
+ },
/// List al keys in the database
ListKeys,
// Search the database
@@ -25,10 +35,17 @@ enum Commands {
#[arg(short, long)]
format: String,
#[arg(short, long)]
- locale: String
+ locale: String,
},
}
+#[derive(Debug, Deserialize)]
+struct Config {
+ db_path: PathBuf,
+ base_locale: LanguageIdentifier,
+ locales: Vec<LanguageIdentifier>,
+}
+
fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor: &str) {
let message = bundle.message(key);
Editor::edit(message, locale, editor);
@@ -36,21 +53,28 @@ fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor
}
fn main() {
- let editor = std::env::var("EDITOR").unwrap();
- let db_path = std::env::var("DB_PATH").unwrap();
+ let editor = std::env::var("EDITOR").expect("Set EDITOR to the path to your favorite editor");
+
+ let config: Config = read_file(&PathBuf::from("./config.toml"))
+ .and_then(|bytes| String::from_utf8(bytes).map_err(|_| ReadError::InvalidFormat))
+ .and_then(|content| toml::from_str(&content).map_err(|_| ReadError::InvalidFormat))
+ .unwrap();
let cli = Cli::parse();
- let mut bundle = Bundle::load_from_disk(PathBuf::from(&db_path));
+ let mut bundle = Bundle::load_from_disk(PathBuf::from(&config.db_path));
match &cli.command {
- Some(Commands::EditKey{ name, locale } ) => edit_key(&mut bundle, name.to_owned(), langid!("en-US"), &editor),
+ Some(Commands::EditKey { name, locale }) => {
+ let identifier = locale.parse::<LanguageIdentifier>().unwrap();
+ edit_key(&mut bundle, name.to_owned(), identifier, &editor)
+ }
Some(Commands::ListKeys) => {
for (key, _) in bundle.message_iter() {
println!("{}", key);
}
- },
- Some(Commands::Export{..}) => todo!(),
- None => {},
+ }
+ Some(Commands::Export { .. }) => todo!(),
+ None => {}
}
}
diff --git a/l10n-db/src/editor.rs b/l10n-db/src/editor.rs
index a650b39..c51d580 100644
--- a/l10n-db/src/editor.rs
+++ b/l10n-db/src/editor.rs
@@ -1,17 +1,19 @@
use std::{io::{BufReader, Read, Write}, path::Path, process::Command};
-use icu_locid::LanguageIdentifier;
+use icu_locid::{langid, LanguageIdentifier};
use serde::{Deserialize, Serialize};
-use crate::{Message, Variant};
+use crate::{read_fh, Message, Variant};
#[derive(Serialize, Deserialize, Debug, Clone)]
struct EditorMessage {
description: String,
+ source: String,
content: String,
}
+/*
impl EditorMessage {
fn from_variant(description: String, variant: &Variant) -> Self {
Self {
@@ -20,6 +22,7 @@ impl EditorMessage {
}
}
}
+*/
pub struct Editor {
}
@@ -27,8 +30,14 @@ pub struct Editor {
impl Editor {
pub fn edit(msg: &mut Message, locale: LanguageIdentifier, editor: &str) {
let description = msg.description().to_owned();
+ let source_string = msg.variant_mut(langid!("en")).content().to_owned();
let variant = msg.variant_mut(locale);
- let editable_content = EditorMessage::from_variant(description, &variant);
+ // let editable_content = EditorMessage::from_variant(description, &variant);
+ let editable_content = EditorMessage {
+ description,
+ source: source_string,
+ content: variant.content().to_owned(),
+ };
let mut file = tempfile::NamedTempFile::new().unwrap();
let _ = file.write(toml::to_string(&editable_content).unwrap().as_bytes());
@@ -36,12 +45,7 @@ impl Editor {
let mut cmd = Command::new(editor).args([file.path()]).spawn().unwrap();
cmd.wait().unwrap();
let file = file.reopen().unwrap();
- let mut reader = BufReader::new(file);
- let mut content = Vec::new();
- let _ = reader.read_to_end(&mut content);
-
- println!("content");
- println!("{}", String::from_utf8(content.clone()).unwrap());
+ let content = read_fh(&file).unwrap();
let new_variant: EditorMessage = toml::from_str(&String::from_utf8(content).unwrap()).unwrap();
diff --git a/l10n-db/src/lib.rs b/l10n-db/src/lib.rs
index 9dd0718..ab1eec2 100644
--- a/l10n-db/src/lib.rs
+++ b/l10n-db/src/lib.rs
@@ -7,6 +7,9 @@ pub use editor::Editor;
mod types;
pub use types::{Message, Variant};
+mod utils;
+pub use utils::*;
+
/*
#[cfg(test)]
mod test {
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index 32c4268..13b447d 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -45,7 +45,7 @@ impl Message {
}
}
-#[derive(Deserialize, Serialize, Debug)]
+#[derive(Deserialize, Serialize, Debug, Clone)]
pub struct Variant {
locale: LanguageIdentifier,
content: String,
diff --git a/l10n-db/src/utils.rs b/l10n-db/src/utils.rs
new file mode 100644
index 0000000..b499b9d
--- /dev/null
+++ b/l10n-db/src/utils.rs
@@ -0,0 +1,31 @@
+use std::{fs::File, io::{BufReader, ErrorKind, Read}, path::Path};
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum ReadError {
+ #[error("file not found")]
+ FileNotFound,
+
+ #[error("invalid file format")]
+ InvalidFormat,
+
+ #[error("unhandled read error")]
+ Unhandled(ErrorKind),
+}
+
+pub fn read_file(path: &Path) -> Result<Vec<u8>, ReadError> {
+ let file = File::open(path).map_err(|err| {
+ match err.kind() {
+ ErrorKind::NotFound => ReadError::FileNotFound,
+ _ => ReadError::Unhandled( err.kind()),
+ }
+ })?;
+ read_fh(&file)
+}
+
+pub fn read_fh(file: &File) -> Result<Vec<u8>, ReadError> {
+ let mut content = Vec::new();
+ let mut reader = BufReader::new(file);
+ reader.read_to_end(&mut content).map_err(|err| ReadError::Unhandled(err.kind()))?;
+ Ok(content)
+}
From 52a0d6e3f2cc8626736664ac98f756c6968cd15e Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 22 Feb 2025 18:45:36 -0500
Subject: [PATCH 06/34] Put in more meaningful working text
---
Cargo.lock | 1 +
l10n-db/i18n/OpenSandbox.toml | 12 ------------
l10n-db/i18n/SaveSettings.toml | 7 +++++++
l10n-db/i18n/Welcome.toml | 7 +++++++
4 files changed, 15 insertions(+), 12 deletions(-)
delete mode 100644 l10n-db/i18n/OpenSandbox.toml
create mode 100644 l10n-db/i18n/SaveSettings.toml
create mode 100644 l10n-db/i18n/Welcome.toml
diff --git a/Cargo.lock b/Cargo.lock
index d48d3bd..2f50fae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2419,6 +2419,7 @@ dependencies = [
"icu_locid",
"serde 1.0.218",
"tempfile",
+ "thiserror 2.0.11",
"toml",
]
diff --git a/l10n-db/i18n/OpenSandbox.toml b/l10n-db/i18n/OpenSandbox.toml
deleted file mode 100644
index 81b7d4f..0000000
--- a/l10n-db/i18n/OpenSandbox.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-key = "OpenSandbox"
-description = "A sandbox vault refers to a stock vault that contains test data and allows the user to make edits and run experiments on test data."
-
-[variants.eo]
-locale = "eo"
-content = "Malfermi sekurkofro"
-modified = "2025-02-22T23:35:29.692299091Z"
-
-[variants.en]
-locale = "en"
-content = "Open Sandbox vault"
-modified = "2025-02-22T21:35:02.032300406Z"
diff --git a/l10n-db/i18n/SaveSettings.toml b/l10n-db/i18n/SaveSettings.toml
new file mode 100644
index 0000000..c2a4d1c
--- /dev/null
+++ b/l10n-db/i18n/SaveSettings.toml
@@ -0,0 +1,7 @@
+key = "SaveSettings"
+description = "This is a label on a button which will save the settings when clicked"
+
+[variants.en]
+locale = "en"
+content = "Save Settings"
+modified = "2025-02-22T23:44:18.874218939Z"
diff --git a/l10n-db/i18n/Welcome.toml b/l10n-db/i18n/Welcome.toml
new file mode 100644
index 0000000..556c993
--- /dev/null
+++ b/l10n-db/i18n/Welcome.toml
@@ -0,0 +1,7 @@
+key = "Welcome"
+description = "This is a welcome content that will be shown on first app opening, before configuration."
+
+[variants.en]
+locale = "en"
+content = "Welcome to FitnessTrax"
+modified = "2025-02-22T23:43:24.786544124Z"
From 44ee6ec8a5ceba050d21cfdbb8e02299e4d92be0 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 22 Feb 2025 19:11:29 -0500
Subject: [PATCH 07/34] Export to json
---
Cargo.lock | 5 +++--
l10n-db/Cargo.toml | 1 +
l10n-db/output.json | 1 +
l10n-db/src/bin/main.rs | 9 ++++++---
l10n-db/src/bundle.rs | 2 +-
l10n-db/src/js_format.rs | 22 ++++++++++++++++++++++
l10n-db/src/lib.rs | 3 +++
l10n-db/src/types.rs | 4 ++++
l10n-db/src/utils.rs | 6 ++++++
9 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 l10n-db/output.json
create mode 100644 l10n-db/src/js_format.rs
diff --git a/Cargo.lock b/Cargo.lock
index 2f50fae..4982051 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2418,6 +2418,7 @@ dependencies = [
"clap",
"icu_locid",
"serde 1.0.218",
+ "serde_json",
"tempfile",
"thiserror 2.0.11",
"toml",
@@ -3915,9 +3916,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.136"
+version = "1.0.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336a0c23cf42a38d9eaa7cd22c7040d04e1228a19a933890805ffd00a16437d2"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
dependencies = [
"itoa",
"memchr",
diff --git a/l10n-db/Cargo.toml b/l10n-db/Cargo.toml
index e36077b..8016440 100644
--- a/l10n-db/Cargo.toml
+++ b/l10n-db/Cargo.toml
@@ -8,6 +8,7 @@ chrono = { version = "0.4.39", features = ["serde"] }
clap = { version = "4.5.30", features = ["derive"] }
icu_locid = { version = "1.5.0", features = ["serde"] }
serde = { version = "1.0.218", features = ["derive"] }
+serde_json = "1.0.139"
tempfile = "3.17.1"
thiserror = "2.0.11"
toml = "0.8.20"
diff --git a/l10n-db/output.json b/l10n-db/output.json
new file mode 100644
index 0000000..fe23c55
--- /dev/null
+++ b/l10n-db/output.json
@@ -0,0 +1 @@
+{"SaveSettings":"Save Settings","Welcome":"Welcome to FitnessTrax"}
\ No newline at end of file
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index 1860136..a7880f8 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -7,7 +7,7 @@ use std::{
use clap::{Parser, Subcommand};
use icu_locid::{langid, LanguageIdentifier};
-use l10n_db::{self, read_file, Bundle, Editor, ReadError};
+use l10n_db::{self, export_file, read_file, Bundle, Editor, ReadError};
use serde::Deserialize;
#[derive(Parser)]
@@ -35,7 +35,7 @@ enum Commands {
#[arg(short, long)]
format: String,
#[arg(short, long)]
- locale: String,
+ locale: Option<String>,
},
}
@@ -74,7 +74,10 @@ fn main() {
println!("{}", key);
}
}
- Some(Commands::Export { .. }) => todo!(),
+ Some(Commands::Export { format, locale }) => {
+ let locale = locale.as_ref().map(|l| l.clone().parse::<LanguageIdentifier>().unwrap()).unwrap_or(langid!("en"));
+ export_file(&bundle, locale, &PathBuf::from("output.json")).unwrap();
+ },
None => {}
}
}
diff --git a/l10n-db/src/bundle.rs b/l10n-db/src/bundle.rs
index 3144ea9..df1e6b1 100644
--- a/l10n-db/src/bundle.rs
+++ b/l10n-db/src/bundle.rs
@@ -1,6 +1,6 @@
use std::{collections::HashMap, fs::File, io::Write, path::PathBuf};
-use crate::Message;
+use crate::{Message, WriteError};
pub struct Bundle {
path: PathBuf,
diff --git a/l10n-db/src/js_format.rs b/l10n-db/src/js_format.rs
new file mode 100644
index 0000000..c8c5844
--- /dev/null
+++ b/l10n-db/src/js_format.rs
@@ -0,0 +1,22 @@
+use std::{collections::BTreeMap, fs::File, io::Write, path::Path};
+
+use icu_locid::LanguageIdentifier;
+
+use crate::{Bundle, WriteError};
+
+pub fn export_file(bundle: &Bundle, locale: LanguageIdentifier, path: &Path) -> Result<(), WriteError> {
+ let mut file = File::create(path).unwrap();
+ export_fh(bundle, locale, &mut file)
+}
+
+pub fn export_fh(bundle: &Bundle, locale: LanguageIdentifier, fh: &mut File) -> Result<(), WriteError> {
+ let messages = bundle.message_iter().map(|(key, message)| {
+ let content = message.variant(&locale).unwrap().content().to_owned();
+ (key.to_owned(), content)
+ }).collect::<Vec<(String, String)>>();
+
+ let messages: BTreeMap<String, String> = messages.into_iter().collect();
+ fh.write(serde_json::to_string(&messages).unwrap().as_bytes()).unwrap();
+
+ Ok(())
+}
diff --git a/l10n-db/src/lib.rs b/l10n-db/src/lib.rs
index ab1eec2..a5286f6 100644
--- a/l10n-db/src/lib.rs
+++ b/l10n-db/src/lib.rs
@@ -4,6 +4,9 @@ pub use bundle::Bundle;
mod editor;
pub use editor::Editor;
+mod js_format;
+pub use js_format::{export_file, export_fh};
+
mod types;
pub use types::{Message, Variant};
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index 13b447d..ad5caa0 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -36,6 +36,10 @@ impl Message {
&self.description
}
+ pub fn variant(&self, locale: &LanguageIdentifier) -> Option<&Variant> {
+ self.variants.get(locale)
+ }
+
pub fn variant_mut(&mut self, locale: LanguageIdentifier) -> &mut Variant {
self.variants.entry(locale.clone()).or_insert(Variant {
locale,
diff --git a/l10n-db/src/utils.rs b/l10n-db/src/utils.rs
index b499b9d..82435a0 100644
--- a/l10n-db/src/utils.rs
+++ b/l10n-db/src/utils.rs
@@ -29,3 +29,9 @@ pub fn read_fh(file: &File) -> Result<Vec<u8>, ReadError> {
reader.read_to_end(&mut content).map_err(|err| ReadError::Unhandled(err.kind()))?;
Ok(content)
}
+
+#[derive(Debug, Error)]
+pub enum WriteError {
+ #[error("unhandled write error")]
+ Unhandled(ErrorKind),
+}
From 0df0ff941967abb89604583f85b678ce97e2c70f Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sun, 23 Feb 2025 21:48:13 -0500
Subject: [PATCH 08/34] Start on an xliff output
---
Cargo.lock | 7 +++
l10n-db/Cargo.toml | 1 +
l10n-db/output.json | 1 -
l10n-db/src/bin/main.rs | 9 +++-
l10n-db/src/{js_format.rs => formats/js.rs} | 0
l10n-db/src/formats/mod.rs | 4 ++
l10n-db/src/formats/xliff.rs | 48 +++++++++++++++++++++
l10n-db/src/lib.rs | 18 +-------
8 files changed, 69 insertions(+), 19 deletions(-)
delete mode 100644 l10n-db/output.json
rename l10n-db/src/{js_format.rs => formats/js.rs} (100%)
create mode 100644 l10n-db/src/formats/mod.rs
create mode 100644 l10n-db/src/formats/xliff.rs
diff --git a/Cargo.lock b/Cargo.lock
index 4982051..b4bc05f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2422,6 +2422,7 @@ dependencies = [
"tempfile",
"thiserror 2.0.11",
"toml",
+ "xml-rs",
]
[[package]]
@@ -5435,6 +5436,12 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+[[package]]
+name = "xml-rs"
+version = "0.8.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
+
[[package]]
name = "yansi-term"
version = "0.1.2"
diff --git a/l10n-db/Cargo.toml b/l10n-db/Cargo.toml
index 8016440..5a1f64a 100644
--- a/l10n-db/Cargo.toml
+++ b/l10n-db/Cargo.toml
@@ -12,6 +12,7 @@ serde_json = "1.0.139"
tempfile = "3.17.1"
thiserror = "2.0.11"
toml = "0.8.20"
+xml-rs = "0.8.25"
# [lib]
# name = "l10n_db"
diff --git a/l10n-db/output.json b/l10n-db/output.json
deleted file mode 100644
index fe23c55..0000000
--- a/l10n-db/output.json
+++ /dev/null
@@ -1 +0,0 @@
-{"SaveSettings":"Save Settings","Welcome":"Welcome to FitnessTrax"}
\ No newline at end of file
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index a7880f8..d1b304e 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -7,7 +7,7 @@ use std::{
use clap::{Parser, Subcommand};
use icu_locid::{langid, LanguageIdentifier};
-use l10n_db::{self, export_file, read_file, Bundle, Editor, ReadError};
+use l10n_db::{self, js, read_file, xliff, Bundle, Editor, ReadError};
use serde::Deserialize;
#[derive(Parser)]
@@ -76,7 +76,12 @@ fn main() {
}
Some(Commands::Export { format, locale }) => {
let locale = locale.as_ref().map(|l| l.clone().parse::<LanguageIdentifier>().unwrap()).unwrap_or(langid!("en"));
- export_file(&bundle, locale, &PathBuf::from("output.json")).unwrap();
+
+ match format.as_ref() {
+ "js" => js::export_file(&bundle, locale, &PathBuf::from("output.json")).unwrap(),
+ "xliff" => xliff::export_file(&bundle, locale, &PathBuf::from("output.xliff")).unwrap(),
+ _ => todo!(),
+ }
},
None => {}
}
diff --git a/l10n-db/src/js_format.rs b/l10n-db/src/formats/js.rs
similarity index 100%
rename from l10n-db/src/js_format.rs
rename to l10n-db/src/formats/js.rs
diff --git a/l10n-db/src/formats/mod.rs b/l10n-db/src/formats/mod.rs
new file mode 100644
index 0000000..6fbd8ce
--- /dev/null
+++ b/l10n-db/src/formats/mod.rs
@@ -0,0 +1,4 @@
+pub mod js;
+pub mod xliff;
+
+
diff --git a/l10n-db/src/formats/xliff.rs b/l10n-db/src/formats/xliff.rs
new file mode 100644
index 0000000..9563e52
--- /dev/null
+++ b/l10n-db/src/formats/xliff.rs
@@ -0,0 +1,48 @@
+use std::{fs::File, io, path::Path};
+
+use icu_locid::LanguageIdentifier;
+use xml::{writer::XmlEvent, EmitterConfig, EventWriter};
+
+use crate::{Bundle, Message, WriteError};
+
+pub fn export_file(
+ bundle: &Bundle,
+ locale: LanguageIdentifier,
+ path: &Path,
+) -> Result<(), WriteError> {
+ let mut file = File::create(path).unwrap();
+ export_fh(bundle, locale, &mut file)
+}
+
+pub fn export_fh(
+ bundle: &Bundle,
+ locale: LanguageIdentifier,
+ fh: &mut File,
+) -> Result<(), WriteError> {
+ let output = io::stdout();
+ let mut writer = EmitterConfig::new()
+ .perform_indent(true)
+ .create_writer(output);
+
+ writer.write(XmlEvent::start_element("xliff")).unwrap();
+ writer.write(XmlEvent::start_element("file")).unwrap();
+
+ for (key, message) in bundle.message_iter() {
+ write_message(&mut writer, message, &locale);
+ }
+
+ writer.write(XmlEvent::end_element()).unwrap();
+ writer.write(XmlEvent::end_element()).unwrap();
+ Ok(())
+}
+
+fn write_message<T>(writer: &mut EventWriter<T>, message: &Message, locale: &LanguageIdentifier)
+where
+ T: std::io::Write,
+{
+ writer.write(XmlEvent::start_element("unit")).unwrap();
+ writer.write(XmlEvent::start_element("segment")).unwrap();
+ writer.write(XmlEvent::characters(message.variant(locale).unwrap().content())).unwrap();
+ writer.write(XmlEvent::end_element()).unwrap();
+ writer.write(XmlEvent::end_element()).unwrap();
+}
diff --git a/l10n-db/src/lib.rs b/l10n-db/src/lib.rs
index a5286f6..d826d47 100644
--- a/l10n-db/src/lib.rs
+++ b/l10n-db/src/lib.rs
@@ -4,8 +4,8 @@ pub use bundle::Bundle;
mod editor;
pub use editor::Editor;
-mod js_format;
-pub use js_format::{export_file, export_fh};
+mod formats;
+pub use formats::{js, xliff};
mod types;
pub use types::{Message, Variant};
@@ -13,17 +13,3 @@ pub use types::{Message, Variant};
mod utils;
pub use utils::*;
-/*
-#[cfg(test)]
-mod test {
- #[test]
- fn it_can_represent_an_untranslated_message() {
- todo!()
- }
-
- #[test]
- fn it_can_represent_a_partially_translated_message() {
- todo!()
- }
-}
-*/
From a8a61cf03f8ae9a623ab2129b056bac625b049a6 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 09:44:44 -0500
Subject: [PATCH 09/34] Fill out the xliff exporter
---
l10n-db/i18n/TimeDistance.toml | 7 +++++
l10n-db/src/formats/xliff.rs | 47 +++++++++++++++++++++++++---------
2 files changed, 42 insertions(+), 12 deletions(-)
create mode 100644 l10n-db/i18n/TimeDistance.toml
diff --git a/l10n-db/i18n/TimeDistance.toml b/l10n-db/i18n/TimeDistance.toml
new file mode 100644
index 0000000..f13ee13
--- /dev/null
+++ b/l10n-db/i18n/TimeDistance.toml
@@ -0,0 +1,7 @@
+key = "TimeDistance"
+description = "A summary of a workout or many workouts that involve a time and a distance"
+
+[variants.en]
+locale = "en"
+content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour}, other {{hours} hours} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
+modified = "2025-02-24T14:09:17.361641899Z"
diff --git a/l10n-db/src/formats/xliff.rs b/l10n-db/src/formats/xliff.rs
index 9563e52..075971b 100644
--- a/l10n-db/src/formats/xliff.rs
+++ b/l10n-db/src/formats/xliff.rs
@@ -19,16 +19,24 @@ pub fn export_fh(
locale: LanguageIdentifier,
fh: &mut File,
) -> Result<(), WriteError> {
- let output = io::stdout();
let mut writer = EmitterConfig::new()
.perform_indent(true)
- .create_writer(output);
+ .create_writer(fh);
- writer.write(XmlEvent::start_element("xliff")).unwrap();
- writer.write(XmlEvent::start_element("file")).unwrap();
+ writer
+ .write(
+ XmlEvent::start_element("xliff")
+ .attr("xmlns", "urn:oasis:names:tc:xliff:document:2.0")
+ .attr("version", "2.0")
+ .attr("srcLang", &format!("{}", locale)),
+ )
+ .unwrap();
+ writer
+ .write(XmlEvent::start_element("file").attr("id", "main"))
+ .unwrap();
for (key, message) in bundle.message_iter() {
- write_message(&mut writer, message, &locale);
+ write_message(&mut writer, key, message, &locale);
}
writer.write(XmlEvent::end_element()).unwrap();
@@ -36,13 +44,28 @@ pub fn export_fh(
Ok(())
}
-fn write_message<T>(writer: &mut EventWriter<T>, message: &Message, locale: &LanguageIdentifier)
-where
+fn write_message<T>(
+ writer: &mut EventWriter<T>,
+ key: &str,
+ message: &Message,
+ locale: &LanguageIdentifier,
+) where
T: std::io::Write,
{
- writer.write(XmlEvent::start_element("unit")).unwrap();
- writer.write(XmlEvent::start_element("segment")).unwrap();
- writer.write(XmlEvent::characters(message.variant(locale).unwrap().content())).unwrap();
- writer.write(XmlEvent::end_element()).unwrap();
- writer.write(XmlEvent::end_element()).unwrap();
+ [
+ XmlEvent::start_element("unit").attr("id", key).into(),
+ XmlEvent::start_element("notes").into(),
+ XmlEvent::start_element("note").into(),
+ XmlEvent::characters(message.description()).into(),
+ XmlEvent::end_element().into(),
+ XmlEvent::end_element().into(),
+ XmlEvent::start_element("segment").into(),
+ XmlEvent::start_element("source").into(),
+ XmlEvent::characters(message.variant(locale).unwrap().content()).into(),
+ XmlEvent::end_element().into(),
+ XmlEvent::end_element().into(),
+ XmlEvent::end_element().into(),
+ ]
+ .into_iter()
+ .for_each(|elem: XmlEvent| writer.write(elem).unwrap());
}
From cd5837a4376990f09fcf02a8398cf4fc89171a0c Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 12:35:54 -0500
Subject: [PATCH 10/34] Fix the ICU message in TimeDistance
---
l10n-db/i18n/TimeDistance.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/l10n-db/i18n/TimeDistance.toml b/l10n-db/i18n/TimeDistance.toml
index f13ee13..2e541f1 100644
--- a/l10n-db/i18n/TimeDistance.toml
+++ b/l10n-db/i18n/TimeDistance.toml
@@ -3,5 +3,5 @@ description = "A summary of a workout or many workouts that involve a time and a
[variants.en]
locale = "en"
-content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour}, other {{hours} hours} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
+content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour} other {{hours} hours}} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
modified = "2025-02-24T14:09:17.361641899Z"
From 704009b76c77cda0c00ee3fa62fe9ab7032fed4c Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 21:11:12 -0500
Subject: [PATCH 11/34] Import translated xliff data
---
l10n-db/i18n/SaveSettings.toml | 15 ++++
l10n-db/i18n/TimeDistance.toml | 15 ++++
l10n-db/i18n/Welcome.toml | 15 ++++
l10n-db/src/bin/main.rs | 10 ++-
l10n-db/src/formats/js.rs | 2 +-
l10n-db/src/formats/xliff.rs | 144 ++++++++++++++++++++++++++-------
6 files changed, 170 insertions(+), 31 deletions(-)
diff --git a/l10n-db/i18n/SaveSettings.toml b/l10n-db/i18n/SaveSettings.toml
index c2a4d1c..3f8d37d 100644
--- a/l10n-db/i18n/SaveSettings.toml
+++ b/l10n-db/i18n/SaveSettings.toml
@@ -5,3 +5,18 @@ description = "This is a label on a button which will save the settings when cli
locale = "en"
content = "Save Settings"
modified = "2025-02-22T23:44:18.874218939Z"
+
+[variants.eo]
+locale = "eo"
+content = "Konservi Agordojn"
+modified = "2025-02-24T19:32:11.246639077Z"
+
+[variants.de]
+locale = "de"
+content = "Einstellungen Speichern"
+modified = "2025-02-24T19:33:19.516005843Z"
+
+[variants.es]
+locale = "es"
+content = "Guardar Configuraciones"
+modified = "2025-02-24T19:33:23.861329923Z"
diff --git a/l10n-db/i18n/TimeDistance.toml b/l10n-db/i18n/TimeDistance.toml
index 2e541f1..3525af3 100644
--- a/l10n-db/i18n/TimeDistance.toml
+++ b/l10n-db/i18n/TimeDistance.toml
@@ -5,3 +5,18 @@ description = "A summary of a workout or many workouts that involve a time and a
locale = "en"
content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour} other {{hours} hours}} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
modified = "2025-02-24T14:09:17.361641899Z"
+
+[variants.eo]
+locale = "eo"
+content = "{distance} de {activity} en {hours, plural, =1 {{hours} horo} other {{hours} horoj}} {minutes, plural, =1 {{minutes} minuto} other {{minutes} minutoj}}"
+modified = "2025-02-24T19:32:11.246943602Z"
+
+[variants.de]
+locale = "de"
+content = "{distance} von {activity} in {hours, plural, one {}=1 {{hours} Stunde} other {{hours} Stunden}} und {minutes, plural, one {}=1 {{minutes} Minute} other {{minutes} Minuten}}"
+modified = "2025-02-24T19:33:19.516210807Z"
+
+[variants.es]
+locale = "es"
+content = "{distance} de {activity} en {hours, plural, one {}=1 {{hours} hora} other {{hours} horas}} y {minutes, plural, one {}=1 {{minutes} minuto} other {{minutes} minutos}}"
+modified = "2025-02-24T19:33:23.861604738Z"
diff --git a/l10n-db/i18n/Welcome.toml b/l10n-db/i18n/Welcome.toml
index 556c993..47cc700 100644
--- a/l10n-db/i18n/Welcome.toml
+++ b/l10n-db/i18n/Welcome.toml
@@ -1,7 +1,22 @@
key = "Welcome"
description = "This is a welcome content that will be shown on first app opening, before configuration."
+[variants.eo]
+locale = "eo"
+content = "Bonvenon al FitnessTrax"
+modified = "2025-02-24T19:32:11.246407627Z"
+
[variants.en]
locale = "en"
content = "Welcome to FitnessTrax"
modified = "2025-02-22T23:43:24.786544124Z"
+
+[variants.es]
+locale = "es"
+content = "Bienvenido a FitnessTrax"
+modified = "2025-02-24T19:33:23.861143003Z"
+
+[variants.de]
+locale = "de"
+content = "Willkommen bei FitnessTrax"
+modified = "2025-02-24T19:33:19.515861453Z"
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index d1b304e..f7cbd54 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -7,7 +7,7 @@ use std::{
use clap::{Parser, Subcommand};
use icu_locid::{langid, LanguageIdentifier};
-use l10n_db::{self, js, read_file, xliff, Bundle, Editor, ReadError};
+use l10n_db::{self, js, read_file, xliff::{self, import_file}, Bundle, Editor, ReadError};
use serde::Deserialize;
#[derive(Parser)]
@@ -30,6 +30,10 @@ enum Commands {
ListKeys,
// Search the database
// Search { },
+ Import {
+ #[arg(short, long)]
+ file: String,
+ },
/// Export the database
Export {
#[arg(short, long)]
@@ -74,6 +78,10 @@ fn main() {
println!("{}", key);
}
}
+ Some(Commands::Import { file }) => {
+ import_file(&mut bundle, &PathBuf::from(file)).unwrap();
+ bundle.save();
+ }
Some(Commands::Export { format, locale }) => {
let locale = locale.as_ref().map(|l| l.clone().parse::<LanguageIdentifier>().unwrap()).unwrap_or(langid!("en"));
diff --git a/l10n-db/src/formats/js.rs b/l10n-db/src/formats/js.rs
index c8c5844..79d68cb 100644
--- a/l10n-db/src/formats/js.rs
+++ b/l10n-db/src/formats/js.rs
@@ -16,7 +16,7 @@ pub fn export_fh(bundle: &Bundle, locale: LanguageIdentifier, fh: &mut File) ->
}).collect::<Vec<(String, String)>>();
let messages: BTreeMap<String, String> = messages.into_iter().collect();
- fh.write(serde_json::to_string(&messages).unwrap().as_bytes()).unwrap();
+ fh.write(serde_json::to_string_pretty(&messages).unwrap().as_bytes()).unwrap();
Ok(())
}
diff --git a/l10n-db/src/formats/xliff.rs b/l10n-db/src/formats/xliff.rs
index 075971b..cbde7a3 100644
--- a/l10n-db/src/formats/xliff.rs
+++ b/l10n-db/src/formats/xliff.rs
@@ -1,9 +1,24 @@
-use std::{fs::File, io, path::Path};
+use std::{
+ collections::HashMap,
+ fs::File,
+ io::{self, BufReader, Read, Write},
+ path::Path,
+};
-use icu_locid::LanguageIdentifier;
-use xml::{writer::XmlEvent, EmitterConfig, EventWriter};
+use chrono::{DateTime, Utc};
+use icu_locid::{langid, LanguageIdentifier};
+use xml::{attribute::OwnedAttribute, reader, writer, EmitterConfig, EventReader, EventWriter};
-use crate::{Bundle, Message, WriteError};
+use crate::{Bundle, Message, ReadError, WriteError};
+
+struct PartialMessage {
+ variants: HashMap<LanguageIdentifier, PartialVariant>,
+}
+
+struct PartialVariant {
+ content: Option<String>,
+ modified: Option<DateTime<Utc>>,
+}
pub fn export_file(
bundle: &Bundle,
@@ -14,33 +29,93 @@ pub fn export_file(
export_fh(bundle, locale, &mut file)
}
-pub fn export_fh(
- bundle: &Bundle,
- locale: LanguageIdentifier,
- fh: &mut File,
-) -> Result<(), WriteError> {
- let mut writer = EmitterConfig::new()
- .perform_indent(true)
- .create_writer(fh);
+pub fn export_fh<W>(bundle: &Bundle, locale: LanguageIdentifier, fh: W) -> Result<(), WriteError>
+where
+ W: Write,
+{
+ let mut writer = EmitterConfig::new().perform_indent(true).create_writer(fh);
writer
.write(
- XmlEvent::start_element("xliff")
+ writer::XmlEvent::start_element("xliff")
.attr("xmlns", "urn:oasis:names:tc:xliff:document:2.0")
.attr("version", "2.0")
.attr("srcLang", &format!("{}", locale)),
)
.unwrap();
writer
- .write(XmlEvent::start_element("file").attr("id", "main"))
+ .write(writer::XmlEvent::start_element("file").attr("id", "main"))
.unwrap();
for (key, message) in bundle.message_iter() {
write_message(&mut writer, key, message, &locale);
}
- writer.write(XmlEvent::end_element()).unwrap();
- writer.write(XmlEvent::end_element()).unwrap();
+ writer.write(writer::XmlEvent::end_element()).unwrap();
+ writer.write(writer::XmlEvent::end_element()).unwrap();
+ Ok(())
+}
+
+pub fn import_file(bundle: &mut Bundle, path: &Path) -> Result<(), ReadError> {
+ let file = File::open(path).unwrap();
+ let file = BufReader::new(file);
+
+ import_reader(bundle, file)
+}
+
+pub fn import_reader<R>(bundle: &mut Bundle, fh: R) -> Result<(), ReadError>
+where
+ R: Read,
+{
+ let parser = EventReader::new(fh);
+
+ let mut locale: LanguageIdentifier = langid!("en");
+ let mut current_key = None;
+ let mut current_text: Option<String> = None;
+ let mut in_target = false;
+
+ for event in parser {
+ match event {
+ Ok(reader::XmlEvent::StartElement {
+ name, attributes, ..
+ }) => match name.local_name.as_ref() {
+ "xliff" => {
+ locale = find_attribute(&attributes, "trgLang")
+ .unwrap()
+ .parse::<LanguageIdentifier>()
+ .unwrap();
+ }
+ "unit" => current_key = find_attribute(&attributes, "id"),
+ "target" => in_target = true,
+ _ => println!("name: {}", name),
+ },
+ Ok(reader::XmlEvent::EndElement { name }) => match name.local_name.as_ref() {
+ "unit" => {
+ if let Some(key) = current_key {
+ let message = bundle.message(key);
+ let variant = message.variant_mut(locale.clone());
+ if let Some(ref text) = current_text {
+ variant.set_content(text.clone());
+ }
+ }
+ current_key = None;
+ }
+ "target" => in_target = false,
+ _ => {}
+ },
+ Ok(reader::XmlEvent::Characters(data)) => {
+ if in_target {
+ current_text = Some(data)
+ }
+ }
+ Err(e) => {
+ eprintln!("error: {e}");
+ break;
+ }
+ _ => {}
+ }
+ }
+
Ok(())
}
@@ -53,19 +128,30 @@ fn write_message<T>(
T: std::io::Write,
{
[
- XmlEvent::start_element("unit").attr("id", key).into(),
- XmlEvent::start_element("notes").into(),
- XmlEvent::start_element("note").into(),
- XmlEvent::characters(message.description()).into(),
- XmlEvent::end_element().into(),
- XmlEvent::end_element().into(),
- XmlEvent::start_element("segment").into(),
- XmlEvent::start_element("source").into(),
- XmlEvent::characters(message.variant(locale).unwrap().content()).into(),
- XmlEvent::end_element().into(),
- XmlEvent::end_element().into(),
- XmlEvent::end_element().into(),
+ writer::XmlEvent::start_element("unit")
+ .attr("id", key)
+ .into(),
+ writer::XmlEvent::start_element("notes").into(),
+ writer::XmlEvent::start_element("note").into(),
+ writer::XmlEvent::characters(message.description()).into(),
+ writer::XmlEvent::end_element().into(),
+ writer::XmlEvent::end_element().into(),
+ writer::XmlEvent::start_element("segment").into(),
+ writer::XmlEvent::start_element("source").into(),
+ writer::XmlEvent::characters(message.variant(locale).unwrap().content()).into(),
+ writer::XmlEvent::end_element().into(),
+ writer::XmlEvent::end_element().into(),
+ writer::XmlEvent::end_element().into(),
]
.into_iter()
- .for_each(|elem: XmlEvent| writer.write(elem).unwrap());
+ .for_each(|elem: writer::XmlEvent| writer.write(elem).unwrap());
+}
+
+fn find_attribute(attrs: &Vec<OwnedAttribute>, name: &str) -> Option<String> {
+ for f in attrs {
+ if name == f.name.local_name {
+ return Some(f.value.clone());
+ }
+ }
+ None
}
From e5b3c7e4e163c421cd4113a5349cdce7c08ca8a8 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 22:18:42 -0500
Subject: [PATCH 12/34] Write a rudimentary report
---
l10n-db/i18n/SaveSettings.toml | 20 ++++++------
l10n-db/i18n/TimeDistance.toml | 18 +++++-----
l10n-db/i18n/Welcome.toml | 10 +++---
l10n-db/src/bin/main.rs | 60 +++++++++++++++++++++++++++++++---
l10n-db/src/types.rs | 4 +++
5 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/l10n-db/i18n/SaveSettings.toml b/l10n-db/i18n/SaveSettings.toml
index 3f8d37d..384705e 100644
--- a/l10n-db/i18n/SaveSettings.toml
+++ b/l10n-db/i18n/SaveSettings.toml
@@ -1,22 +1,22 @@
key = "SaveSettings"
description = "This is a label on a button which will save the settings when clicked"
-[variants.en]
-locale = "en"
-content = "Save Settings"
-modified = "2025-02-22T23:44:18.874218939Z"
-
[variants.eo]
locale = "eo"
content = "Konservi Agordojn"
modified = "2025-02-24T19:32:11.246639077Z"
-[variants.de]
-locale = "de"
-content = "Einstellungen Speichern"
-modified = "2025-02-24T19:33:19.516005843Z"
-
[variants.es]
locale = "es"
content = "Guardar Configuraciones"
modified = "2025-02-24T19:33:23.861329923Z"
+
+[variants.en]
+locale = "en"
+content = "Save Settings"
+modified = "2025-02-22T23:44:18.874218939Z"
+
+[variants.de]
+locale = "de"
+content = "Einstellungen Speichern"
+modified = "2025-02-24T19:33:19.516005843Z"
diff --git a/l10n-db/i18n/TimeDistance.toml b/l10n-db/i18n/TimeDistance.toml
index 3525af3..aa6ffb2 100644
--- a/l10n-db/i18n/TimeDistance.toml
+++ b/l10n-db/i18n/TimeDistance.toml
@@ -1,22 +1,22 @@
key = "TimeDistance"
description = "A summary of a workout or many workouts that involve a time and a distance"
-[variants.en]
-locale = "en"
-content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour} other {{hours} hours}} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
-modified = "2025-02-24T14:09:17.361641899Z"
+[variants.es]
+locale = "es"
+content = "{distance} de {activity} en {hours, plural, one {}=1 {{hours} hora} other {{hours} horas}} y {minutes, plural, one {}=1 {{minutes} minuto} other {{minutes} minutos}}"
+modified = "2025-02-24T19:33:23.861604738Z"
[variants.eo]
locale = "eo"
content = "{distance} de {activity} en {hours, plural, =1 {{hours} horo} other {{hours} horoj}} {minutes, plural, =1 {{minutes} minuto} other {{minutes} minutoj}}"
modified = "2025-02-24T19:32:11.246943602Z"
+[variants.en]
+locale = "en"
+content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour} other {{hours} hours}} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
+modified = "2025-02-24T14:09:17.361641899Z"
+
[variants.de]
locale = "de"
content = "{distance} von {activity} in {hours, plural, one {}=1 {{hours} Stunde} other {{hours} Stunden}} und {minutes, plural, one {}=1 {{minutes} Minute} other {{minutes} Minuten}}"
modified = "2025-02-24T19:33:19.516210807Z"
-
-[variants.es]
-locale = "es"
-content = "{distance} de {activity} en {hours, plural, one {}=1 {{hours} hora} other {{hours} horas}} y {minutes, plural, one {}=1 {{minutes} minuto} other {{minutes} minutos}}"
-modified = "2025-02-24T19:33:23.861604738Z"
diff --git a/l10n-db/i18n/Welcome.toml b/l10n-db/i18n/Welcome.toml
index 47cc700..db36ae3 100644
--- a/l10n-db/i18n/Welcome.toml
+++ b/l10n-db/i18n/Welcome.toml
@@ -1,16 +1,16 @@
key = "Welcome"
description = "This is a welcome content that will be shown on first app opening, before configuration."
+[variants.en]
+locale = "en"
+content = "Welcome to FitnessTrax, the privacy-centered fitness tracker"
+modified = "2025-02-25T02:12:25.757240004Z"
+
[variants.eo]
locale = "eo"
content = "Bonvenon al FitnessTrax"
modified = "2025-02-24T19:32:11.246407627Z"
-[variants.en]
-locale = "en"
-content = "Welcome to FitnessTrax"
-modified = "2025-02-22T23:43:24.786544124Z"
-
[variants.es]
locale = "es"
content = "Bienvenido a FitnessTrax"
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index f7cbd54..56a8f0a 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -7,7 +7,11 @@ use std::{
use clap::{Parser, Subcommand};
use icu_locid::{langid, LanguageIdentifier};
-use l10n_db::{self, js, read_file, xliff::{self, import_file}, Bundle, Editor, ReadError};
+use l10n_db::{
+ self, js, read_file,
+ xliff::{self, import_file},
+ Bundle, Editor, ReadError,
+};
use serde::Deserialize;
#[derive(Parser)]
@@ -41,6 +45,7 @@ enum Commands {
#[arg(short, long)]
locale: Option<String>,
},
+ Report,
}
#[derive(Debug, Deserialize)]
@@ -56,6 +61,44 @@ fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor
bundle.save();
}
+#[derive(Clone, Debug, Default)]
+struct Report {
+ keys: Vec<String>,
+ source_deleted: Vec<String>,
+ out_of_date: Vec<String>,
+}
+
+fn generate_report(
+ bundle: &Bundle,
+ base_locale: &LanguageIdentifier,
+ locales: Vec<LanguageIdentifier>,
+) -> Report {
+ let mut report: Report = Default::default();
+ let locales: Vec<LanguageIdentifier> =
+ locales.into_iter().filter(|a| a != base_locale).collect();
+ for (key, message) in bundle.message_iter() {
+ match message.variant(base_locale) {
+ Some(ref base_variant) => {
+ for locale in locales.iter() {
+ match message.variant(locale) {
+ Some(v) if v.modified() < base_variant.modified() => {
+ report.out_of_date.push(key.to_owned())
+ }
+ Some(_) => {}
+ None => report.out_of_date.push(key.to_owned()),
+ }
+ }
+ }
+ None => {
+ report.source_deleted.push(key.clone());
+ }
+ }
+ let base_variant = message.variant(base_locale).clone();
+ }
+
+ report
+}
+
fn main() {
let editor = std::env::var("EDITOR").expect("Set EDITOR to the path to your favorite editor");
@@ -83,14 +126,23 @@ fn main() {
bundle.save();
}
Some(Commands::Export { format, locale }) => {
- let locale = locale.as_ref().map(|l| l.clone().parse::<LanguageIdentifier>().unwrap()).unwrap_or(langid!("en"));
+ let locale = locale
+ .as_ref()
+ .map(|l| l.clone().parse::<LanguageIdentifier>().unwrap())
+ .unwrap_or(langid!("en"));
match format.as_ref() {
"js" => js::export_file(&bundle, locale, &PathBuf::from("output.json")).unwrap(),
- "xliff" => xliff::export_file(&bundle, locale, &PathBuf::from("output.xliff")).unwrap(),
+ "xliff" => {
+ xliff::export_file(&bundle, locale, &PathBuf::from("output.xliff")).unwrap()
+ }
_ => todo!(),
}
- },
+ }
+ Some(Commands::Report) => {
+ let report = generate_report(&bundle, &config.base_locale, config.locales);
+ println!("{:?}", report);
+ }
None => {}
}
}
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index ad5caa0..5b8c9ee 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -65,6 +65,10 @@ impl Variant {
self.content = content;
self.modified = Utc::now();
}
+
+ pub fn modified(&self) -> DateTime<Utc> {
+ self.modified
+ }
}
/*
From 76de75210f027e9f17a7abf86936f0d7c34faff1 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 22:50:06 -0500
Subject: [PATCH 13/34] Improve the report format
---
l10n-db/src/bin/main.rs | 36 ++++++++++++++----------------------
l10n-db/src/types.rs | 27 ++++++++++++++++++++++++++-
2 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index 56a8f0a..9df9dde 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -1,7 +1,5 @@
use std::{
- io::{BufReader, Read, Write},
- path::PathBuf,
- process::Command,
+ fmt, io::{BufReader, Read, Write}, path::PathBuf, process::Command
};
use clap::{Parser, Subcommand};
@@ -68,32 +66,26 @@ struct Report {
out_of_date: Vec<String>,
}
+impl fmt::Display for Report {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "Out of date messages\n")?;
+ for key in self.out_of_date.iter() {
+ write!(f, "\t{}\n", key)?;
+ }
+ Ok(())
+ }
+}
+
fn generate_report(
bundle: &Bundle,
base_locale: &LanguageIdentifier,
locales: Vec<LanguageIdentifier>,
) -> Report {
let mut report: Report = Default::default();
- let locales: Vec<LanguageIdentifier> =
- locales.into_iter().filter(|a| a != base_locale).collect();
for (key, message) in bundle.message_iter() {
- match message.variant(base_locale) {
- Some(ref base_variant) => {
- for locale in locales.iter() {
- match message.variant(locale) {
- Some(v) if v.modified() < base_variant.modified() => {
- report.out_of_date.push(key.to_owned())
- }
- Some(_) => {}
- None => report.out_of_date.push(key.to_owned()),
- }
- }
- }
- None => {
- report.source_deleted.push(key.clone());
- }
+ if message.variants_out_of_date(base_locale).len() > 0 {
+ report.out_of_date.push(key.to_owned())
}
- let base_variant = message.variant(base_locale).clone();
}
report
@@ -141,7 +133,7 @@ fn main() {
}
Some(Commands::Report) => {
let report = generate_report(&bundle, &config.base_locale, config.locales);
- println!("{:?}", report);
+ println!("{}", report);
}
None => {}
}
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
index 5b8c9ee..7b878d8 100644
--- a/l10n-db/src/types.rs
+++ b/l10n-db/src/types.rs
@@ -1,4 +1,8 @@
-use std::{collections::HashMap, io::{BufReader, Read}, path::Path};
+use std::{
+ collections::HashMap,
+ io::{BufReader, Read},
+ path::Path,
+};
use chrono::{DateTime, Utc};
use icu_locid::LanguageIdentifier;
@@ -47,6 +51,27 @@ impl Message {
modified: Utc::now(),
})
}
+
+ pub fn variants_out_of_date(
+ &self,
+ base_locale: &LanguageIdentifier,
+ ) -> Vec<LanguageIdentifier> {
+ match self
+ .variants
+ .get(base_locale)
+ .map(|variant| variant.modified())
+ {
+ Some(base_date) => self
+ .variants
+ .iter()
+ .filter(|(_, value)| base_date > value.modified())
+ .map(|(locale, _)| locale.clone())
+ .collect(),
+ None => vec![],
+ }
+ }
+
+ // pub fn missing_variants(&self, locals: Vec<LanguageIdentifier>) -> Vec<LanguageIdentifier> {}
}
#[derive(Deserialize, Serialize, Debug, Clone)]
From a07ecae04a20e13474ee2c4fbd0b050703910751 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 22:54:39 -0500
Subject: [PATCH 14/34] Mvoe teh message and variant types into the bundle
---
l10n-db/src/bundle.rs | 95 ++++++++++++++++++++++++++++++++++-
l10n-db/src/editor.rs | 2 +-
l10n-db/src/lib.rs | 6 +--
l10n-db/src/types.rs | 112 ------------------------------------------
4 files changed, 95 insertions(+), 120 deletions(-)
delete mode 100644 l10n-db/src/types.rs
diff --git a/l10n-db/src/bundle.rs b/l10n-db/src/bundle.rs
index df1e6b1..72af3e3 100644
--- a/l10n-db/src/bundle.rs
+++ b/l10n-db/src/bundle.rs
@@ -1,6 +1,8 @@
-use std::{collections::HashMap, fs::File, io::Write, path::PathBuf};
+use std::{collections::HashMap, fs::File, io::{BufReader, Read, Write}, path::{Path, PathBuf}};
-use crate::{Message, WriteError};
+use chrono::{DateTime, Utc};
+use icu_locid::LanguageIdentifier;
+use serde::{Deserialize, Serialize};
pub struct Bundle {
path: PathBuf,
@@ -48,5 +50,94 @@ fn save_file(path: &PathBuf, s: &[u8]) {
f.write(s).unwrap();
}
+#[derive(Deserialize, Serialize, Debug)]
+pub struct Message {
+ key: String,
+ description: String,
+ variants: HashMap<LanguageIdentifier, Variant>,
+}
+
+impl Message {
+ pub fn new(key: String) -> Self {
+ Self {
+ key,
+ description: "".to_owned(),
+ variants: HashMap::new(),
+ }
+ }
+
+ pub fn from_file(path: &Path) -> Message {
+ let file = std::fs::File::open(path).unwrap();
+ let mut content = Vec::new();
+ let mut reader = BufReader::new(file);
+ let _ = reader.read_to_end(&mut content);
+ toml::from_str(&String::from_utf8(content).unwrap()).unwrap()
+ }
+
+ pub fn set_description(&mut self, desc: String) {
+ self.description = desc;
+ }
+
+ pub fn description(&self) -> &str {
+ &self.description
+ }
+
+ pub fn variant(&self, locale: &LanguageIdentifier) -> Option<&Variant> {
+ self.variants.get(locale)
+ }
+
+ pub fn variant_mut(&mut self, locale: LanguageIdentifier) -> &mut Variant {
+ self.variants.entry(locale.clone()).or_insert(Variant {
+ locale,
+ content: "".to_owned(),
+ modified: Utc::now(),
+ })
+ }
+
+ pub fn variants_out_of_date(
+ &self,
+ base_locale: &LanguageIdentifier,
+ ) -> Vec<LanguageIdentifier> {
+ match self
+ .variants
+ .get(base_locale)
+ .map(|variant| variant.modified())
+ {
+ Some(base_date) => self
+ .variants
+ .iter()
+ .filter(|(_, value)| base_date > value.modified())
+ .map(|(locale, _)| locale.clone())
+ .collect(),
+ None => vec![],
+ }
+ }
+
+ // pub fn missing_variants(&self, locals: Vec<LanguageIdentifier>) -> Vec<LanguageIdentifier> {}
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct Variant {
+ locale: LanguageIdentifier,
+ content: String,
+ modified: DateTime<Utc>,
+}
+
+impl Variant {
+ pub fn content(&self) -> &str {
+ &self.content
+ }
+
+ pub fn set_content(&mut self, content: String) {
+ self.content = content;
+ self.modified = Utc::now();
+ }
+
+ pub fn modified(&self) -> DateTime<Utc> {
+ self.modified
+ }
+}
+
+
#[cfg(test)]
mod test {}
diff --git a/l10n-db/src/editor.rs b/l10n-db/src/editor.rs
index c51d580..039ea9e 100644
--- a/l10n-db/src/editor.rs
+++ b/l10n-db/src/editor.rs
@@ -3,7 +3,7 @@ use std::{io::{BufReader, Read, Write}, path::Path, process::Command};
use icu_locid::{langid, LanguageIdentifier};
use serde::{Deserialize, Serialize};
-use crate::{read_fh, Message, Variant};
+use crate::{read_fh, Message};
#[derive(Serialize, Deserialize, Debug, Clone)]
diff --git a/l10n-db/src/lib.rs b/l10n-db/src/lib.rs
index d826d47..2268a86 100644
--- a/l10n-db/src/lib.rs
+++ b/l10n-db/src/lib.rs
@@ -1,5 +1,5 @@
mod bundle;
-pub use bundle::Bundle;
+pub use bundle::{Bundle, Message, Variant};
mod editor;
pub use editor::Editor;
@@ -7,9 +7,5 @@ pub use editor::Editor;
mod formats;
pub use formats::{js, xliff};
-mod types;
-pub use types::{Message, Variant};
-
mod utils;
pub use utils::*;
-
diff --git a/l10n-db/src/types.rs b/l10n-db/src/types.rs
deleted file mode 100644
index 7b878d8..0000000
--- a/l10n-db/src/types.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use std::{
- collections::HashMap,
- io::{BufReader, Read},
- path::Path,
-};
-
-use chrono::{DateTime, Utc};
-use icu_locid::LanguageIdentifier;
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
-
-#[derive(Deserialize, Serialize, Debug)]
-pub struct Message {
- key: String,
- description: String,
- variants: HashMap<LanguageIdentifier, Variant>,
-}
-
-impl Message {
- pub fn new(key: String) -> Self {
- Self {
- key,
- description: "".to_owned(),
- variants: HashMap::new(),
- }
- }
-
- pub fn from_file(path: &Path) -> Message {
- let file = std::fs::File::open(path).unwrap();
- let mut content = Vec::new();
- let mut reader = BufReader::new(file);
- let _ = reader.read_to_end(&mut content);
- toml::from_str(&String::from_utf8(content).unwrap()).unwrap()
- }
-
- pub fn set_description(&mut self, desc: String) {
- self.description = desc;
- }
-
- pub fn description(&self) -> &str {
- &self.description
- }
-
- pub fn variant(&self, locale: &LanguageIdentifier) -> Option<&Variant> {
- self.variants.get(locale)
- }
-
- pub fn variant_mut(&mut self, locale: LanguageIdentifier) -> &mut Variant {
- self.variants.entry(locale.clone()).or_insert(Variant {
- locale,
- content: "".to_owned(),
- modified: Utc::now(),
- })
- }
-
- pub fn variants_out_of_date(
- &self,
- base_locale: &LanguageIdentifier,
- ) -> Vec<LanguageIdentifier> {
- match self
- .variants
- .get(base_locale)
- .map(|variant| variant.modified())
- {
- Some(base_date) => self
- .variants
- .iter()
- .filter(|(_, value)| base_date > value.modified())
- .map(|(locale, _)| locale.clone())
- .collect(),
- None => vec![],
- }
- }
-
- // pub fn missing_variants(&self, locals: Vec<LanguageIdentifier>) -> Vec<LanguageIdentifier> {}
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct Variant {
- locale: LanguageIdentifier,
- content: String,
- modified: DateTime<Utc>,
-}
-
-impl Variant {
- pub fn content(&self) -> &str {
- &self.content
- }
-
- pub fn set_content(&mut self, content: String) {
- self.content = content;
- self.modified = Utc::now();
- }
-
- pub fn modified(&self) -> DateTime<Utc> {
- self.modified
- }
-}
-
-/*
-fn time_to_number<S>(time: &DateTime, s: S) -> Result<S::Ok, S::Error>
-where S: Serializer {
- let seconds: u64 = time.as_secs();
- s.serialize_u64(seconds)
-}
-
-fn number_to_time<'de, D>(d: D) -> Result<DateTime, D::Error>
-where D: Deserializer<'de> {
- let buf = String::deserialize(d)?;
- let num = buf.parse::<u64>().unwrap();
- Ok(DateTime::try_from(num).unwrap())
-}
-*/
From 254a2aefd78df897638379b9d77dc713f5423346 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 23:05:18 -0500
Subject: [PATCH 15/34] Remove remaining warnings
---
l10n-db/src/bin/main.rs | 47 +++++++++++++++++++-----------------
l10n-db/src/bundle.rs | 2 +-
l10n-db/src/editor.rs | 21 +++-------------
l10n-db/src/formats/js.rs | 2 +-
l10n-db/src/formats/xliff.rs | 17 +++----------
5 files changed, 34 insertions(+), 55 deletions(-)
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/main.rs
index 9df9dde..d02b30e 100644
--- a/l10n-db/src/bin/main.rs
+++ b/l10n-db/src/bin/main.rs
@@ -1,6 +1,4 @@
-use std::{
- fmt, io::{BufReader, Read, Write}, path::PathBuf, process::Command
-};
+use std::{fmt, path::PathBuf};
use clap::{Parser, Subcommand};
@@ -24,9 +22,9 @@ enum Commands {
/// Edit, potentially creating, a key
EditKey {
#[arg(short, long)]
- name: String,
+ key: String,
#[arg(short, long)]
- locale: String,
+ locale: Option<String>,
},
/// List al keys in the database
ListKeys,
@@ -41,6 +39,8 @@ enum Commands {
#[arg(short, long)]
format: String,
#[arg(short, long)]
+ file: String,
+ #[arg(short, long)]
locale: Option<String>,
},
Report,
@@ -50,7 +50,6 @@ enum Commands {
struct Config {
db_path: PathBuf,
base_locale: LanguageIdentifier,
- locales: Vec<LanguageIdentifier>,
}
fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor: &str) {
@@ -62,28 +61,26 @@ fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor
#[derive(Clone, Debug, Default)]
struct Report {
keys: Vec<String>,
- source_deleted: Vec<String>,
+ // source_deleted: Vec<String>,
out_of_date: Vec<String>,
}
impl fmt::Display for Report {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(f, "Out of date messages\n")?;
+ writeln!(f, "{} messages in bundle", self.keys.len())?;
+ writeln!(f, "Out of date messages")?;
for key in self.out_of_date.iter() {
- write!(f, "\t{}\n", key)?;
+ writeln!(f, "\t{}", key)?;
}
Ok(())
}
}
-fn generate_report(
- bundle: &Bundle,
- base_locale: &LanguageIdentifier,
- locales: Vec<LanguageIdentifier>,
-) -> Report {
+fn generate_report(bundle: &Bundle, base_locale: &LanguageIdentifier) -> Report {
let mut report: Report = Default::default();
for (key, message) in bundle.message_iter() {
- if message.variants_out_of_date(base_locale).len() > 0 {
+ report.keys.push(key.to_owned());
+ if !message.variants_out_of_date(base_locale).is_empty() {
report.out_of_date.push(key.to_owned())
}
}
@@ -104,9 +101,11 @@ fn main() {
let mut bundle = Bundle::load_from_disk(PathBuf::from(&config.db_path));
match &cli.command {
- Some(Commands::EditKey { name, locale }) => {
- let identifier = locale.parse::<LanguageIdentifier>().unwrap();
- edit_key(&mut bundle, name.to_owned(), identifier, &editor)
+ Some(Commands::EditKey { key, locale }) => {
+ let identifier = locale.as_ref()
+ .map(|l| l.parse::<LanguageIdentifier>().unwrap())
+ .unwrap_or(config.base_locale);
+ edit_key(&mut bundle, key.to_owned(), identifier, &editor)
}
Some(Commands::ListKeys) => {
for (key, _) in bundle.message_iter() {
@@ -117,22 +116,26 @@ fn main() {
import_file(&mut bundle, &PathBuf::from(file)).unwrap();
bundle.save();
}
- Some(Commands::Export { format, locale }) => {
+ Some(Commands::Export {
+ format,
+ file,
+ locale,
+ }) => {
let locale = locale
.as_ref()
.map(|l| l.clone().parse::<LanguageIdentifier>().unwrap())
.unwrap_or(langid!("en"));
match format.as_ref() {
- "js" => js::export_file(&bundle, locale, &PathBuf::from("output.json")).unwrap(),
+ "js" => js::export_file(&bundle, locale, &PathBuf::from(file)).unwrap(),
"xliff" => {
- xliff::export_file(&bundle, locale, &PathBuf::from("output.xliff")).unwrap()
+ xliff::export_file(&bundle, locale, &PathBuf::from(file)).unwrap()
}
_ => todo!(),
}
}
Some(Commands::Report) => {
- let report = generate_report(&bundle, &config.base_locale, config.locales);
+ let report = generate_report(&bundle, &config.base_locale);
println!("{}", report);
}
None => {}
diff --git a/l10n-db/src/bundle.rs b/l10n-db/src/bundle.rs
index 72af3e3..1b55392 100644
--- a/l10n-db/src/bundle.rs
+++ b/l10n-db/src/bundle.rs
@@ -47,7 +47,7 @@ impl Bundle {
fn save_file(path: &PathBuf, s: &[u8]) {
let mut f = File::create(path).unwrap();
- f.write(s).unwrap();
+ let _ = f.write(s).unwrap();
}
#[derive(Deserialize, Serialize, Debug)]
diff --git a/l10n-db/src/editor.rs b/l10n-db/src/editor.rs
index 039ea9e..b6d9a9f 100644
--- a/l10n-db/src/editor.rs
+++ b/l10n-db/src/editor.rs
@@ -1,11 +1,10 @@
-use std::{io::{BufReader, Read, Write}, path::Path, process::Command};
+use std::{io::Write, process::Command};
use icu_locid::{langid, LanguageIdentifier};
use serde::{Deserialize, Serialize};
use crate::{read_fh, Message};
-
#[derive(Serialize, Deserialize, Debug, Clone)]
struct EditorMessage {
description: String,
@@ -13,19 +12,7 @@ struct EditorMessage {
content: String,
}
-/*
-impl EditorMessage {
- fn from_variant(description: String, variant: &Variant) -> Self {
- Self {
- description,
- content: variant.content().to_string()
- }
- }
-}
-*/
-
-pub struct Editor {
-}
+pub struct Editor {}
impl Editor {
pub fn edit(msg: &mut Message, locale: LanguageIdentifier, editor: &str) {
@@ -47,10 +34,10 @@ impl Editor {
let file = file.reopen().unwrap();
let content = read_fh(&file).unwrap();
- let new_variant: EditorMessage = toml::from_str(&String::from_utf8(content).unwrap()).unwrap();
+ let new_variant: EditorMessage =
+ toml::from_str(&String::from_utf8(content).unwrap()).unwrap();
variant.set_content(new_variant.content);
msg.set_description(new_variant.description);
}
}
-
diff --git a/l10n-db/src/formats/js.rs b/l10n-db/src/formats/js.rs
index 79d68cb..6aa94b2 100644
--- a/l10n-db/src/formats/js.rs
+++ b/l10n-db/src/formats/js.rs
@@ -16,7 +16,7 @@ pub fn export_fh(bundle: &Bundle, locale: LanguageIdentifier, fh: &mut File) ->
}).collect::<Vec<(String, String)>>();
let messages: BTreeMap<String, String> = messages.into_iter().collect();
- fh.write(serde_json::to_string_pretty(&messages).unwrap().as_bytes()).unwrap();
+ let _ = fh.write(serde_json::to_string_pretty(&messages).unwrap().as_bytes()).unwrap();
Ok(())
}
diff --git a/l10n-db/src/formats/xliff.rs b/l10n-db/src/formats/xliff.rs
index cbde7a3..d05ecaa 100644
--- a/l10n-db/src/formats/xliff.rs
+++ b/l10n-db/src/formats/xliff.rs
@@ -1,25 +1,14 @@
use std::{
- collections::HashMap,
fs::File,
- io::{self, BufReader, Read, Write},
+ io::{BufReader, Read, Write},
path::Path,
};
-use chrono::{DateTime, Utc};
use icu_locid::{langid, LanguageIdentifier};
use xml::{attribute::OwnedAttribute, reader, writer, EmitterConfig, EventReader, EventWriter};
use crate::{Bundle, Message, ReadError, WriteError};
-struct PartialMessage {
- variants: HashMap<LanguageIdentifier, PartialVariant>,
-}
-
-struct PartialVariant {
- content: Option<String>,
- modified: Option<DateTime<Utc>>,
-}
-
pub fn export_file(
bundle: &Bundle,
locale: LanguageIdentifier,
@@ -133,12 +122,12 @@ fn write_message<T>(
.into(),
writer::XmlEvent::start_element("notes").into(),
writer::XmlEvent::start_element("note").into(),
- writer::XmlEvent::characters(message.description()).into(),
+ writer::XmlEvent::characters(message.description()),
writer::XmlEvent::end_element().into(),
writer::XmlEvent::end_element().into(),
writer::XmlEvent::start_element("segment").into(),
writer::XmlEvent::start_element("source").into(),
- writer::XmlEvent::characters(message.variant(locale).unwrap().content()).into(),
+ writer::XmlEvent::characters(message.variant(locale).unwrap().content()),
writer::XmlEvent::end_element().into(),
writer::XmlEvent::end_element().into(),
writer::XmlEvent::end_element().into(),
From afa846f7e0efc4e2ff20fe48d969f776425d48c8 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 24 Feb 2025 23:37:59 -0500
Subject: [PATCH 16/34] Add a crane build for l10n-db
---
Cargo.nix | 2044 +++++------------------
crate-hashes.json | 59 +-
flake.lock | 24 +-
flake.nix | 13 +-
l10n-db/src/bin/{main.rs => l10n-db.rs} | 0
5 files changed, 449 insertions(+), 1691 deletions(-)
rename l10n-db/src/bin/{main.rs => l10n-db.rs} (100%)
diff --git a/Cargo.nix b/Cargo.nix
index 5e3a985..5af2594 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -225,6 +225,16 @@ rec {
# File a bug if you depend on any for non-debug work!
debug = internal.debugCrate { inherit packageId; };
};
+ "l10n-db" = rec {
+ packageId = "l10n-db";
+ build = internal.buildRustCrateWithFeatures {
+ packageId = "l10n-db";
+ };
+
+ # Debug support which might change between releases.
+ # File a bug if you depend on any for non-debug work!
+ debug = internal.debugCrate { inherit packageId; };
+ };
"lights-core" = rec {
packageId = "lights-core";
build = internal.buildRustCrateWithFeatures {
@@ -295,6 +305,16 @@ rec {
# File a bug if you depend on any for non-debug work!
debug = internal.debugCrate { inherit packageId; };
};
+ "server" = rec {
+ packageId = "server";
+ build = internal.buildRustCrateWithFeatures {
+ packageId = "server";
+ };
+
+ # Debug support which might change between releases.
+ # File a bug if you depend on any for non-debug work!
+ debug = internal.debugCrate { inherit packageId; };
+ };
"sgf" = rec {
packageId = "sgf";
build = internal.buildRustCrateWithFeatures {
@@ -331,16 +351,6 @@ rec {
packageId = "tree";
};
- # Debug support which might change between releases.
- # File a bug if you depend on any for non-debug work!
- debug = internal.debugCrate { inherit packageId; };
- };
- "visions" = rec {
- packageId = "visions";
- build = internal.buildRustCrateWithFeatures {
- packageId = "visions";
- };
-
# Debug support which might change between releases.
# File a bug if you depend on any for non-debug work!
debug = internal.debugCrate { inherit packageId; };
@@ -448,49 +458,6 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
- "ahash" = rec {
- crateName = "ahash";
- version = "0.8.11";
- edition = "2018";
- sha256 = "04chdfkls5xmhp1d48gnjsmglbqibizs3bpbj6rsj604m10si7g8";
- authors = [
- "Tom Kaitchuck <Tom.Kaitchuck@gmail.com>"
- ];
- dependencies = [
- {
- name = "cfg-if";
- packageId = "cfg-if";
- }
- {
- name = "once_cell";
- packageId = "once_cell";
- usesDefaultFeatures = false;
- target = { target, features }: (!(("arm" == target."arch") && ("none" == target."os")));
- features = [ "alloc" ];
- }
- {
- name = "zerocopy";
- packageId = "zerocopy";
- usesDefaultFeatures = false;
- features = [ "simd" ];
- }
- ];
- buildDependencies = [
- {
- name = "version_check";
- packageId = "version_check 0.9.5";
- }
- ];
- features = {
- "atomic-polyfill" = [ "dep:atomic-polyfill" "once_cell/atomic-polyfill" ];
- "compile-time-rng" = [ "const-random" ];
- "const-random" = [ "dep:const-random" ];
- "default" = [ "std" "runtime-rng" ];
- "getrandom" = [ "dep:getrandom" ];
- "runtime-rng" = [ "getrandom" ];
- "serde" = [ "dep:serde" ];
- };
- };
"aho-corasick" = rec {
crateName = "aho-corasick";
version = "1.1.3";
@@ -721,34 +688,6 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
- "assert-json-diff" = rec {
- crateName = "assert-json-diff";
- version = "2.0.2";
- edition = "2018";
- sha256 = "04mg3w0rh3schpla51l18362hsirl23q93aisws2irrj32wg5r27";
- libName = "assert_json_diff";
- authors = [
- "David Pedersen <david.pdrsn@gmail.com>"
- ];
- dependencies = [
- {
- name = "serde";
- packageId = "serde 1.0.217";
- }
- {
- name = "serde_json";
- packageId = "serde_json";
- }
- ];
- devDependencies = [
- {
- name = "serde";
- packageId = "serde 1.0.217";
- features = [ "derive" ];
- }
- ];
-
- };
"async-channel 1.9.0" = rec {
crateName = "async-channel";
version = "1.9.0";
@@ -1267,7 +1206,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -1301,17 +1240,6 @@ rec {
}
];
- };
- "auto-future" = rec {
- crateName = "auto-future";
- version = "1.0.0";
- edition = "2021";
- sha256 = "0wykbakzh227vz6frx9p48zsq0wpswgmb7v3917m53m7gr2pw7iw";
- libName = "auto_future";
- authors = [
- "Joseph Lenton <josephlenton@gmail.com>"
- ];
-
};
"autocfg 0.1.8" = rec {
crateName = "autocfg";
@@ -1339,429 +1267,6 @@ rec {
];
};
- "axum" = rec {
- crateName = "axum";
- version = "0.7.9";
- edition = "2021";
- sha256 = "07z7wqczi9i8xb4460rvn39p4wjqwr32hx907crd1vwb2fy8ijpd";
- dependencies = [
- {
- name = "async-trait";
- packageId = "async-trait";
- }
- {
- name = "axum-core";
- packageId = "axum-core";
- }
- {
- name = "axum-macros";
- packageId = "axum-macros";
- optional = true;
- }
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- features = [ "alloc" ];
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "http-body";
- packageId = "http-body 1.0.1";
- }
- {
- name = "http-body-util";
- packageId = "http-body-util";
- }
- {
- name = "hyper";
- packageId = "hyper 1.5.2";
- optional = true;
- }
- {
- name = "hyper-util";
- packageId = "hyper-util";
- optional = true;
- features = [ "tokio" "server" "service" ];
- }
- {
- name = "itoa";
- packageId = "itoa";
- }
- {
- name = "matchit";
- packageId = "matchit";
- }
- {
- name = "memchr";
- packageId = "memchr";
- }
- {
- name = "mime";
- packageId = "mime 0.3.17";
- }
- {
- name = "percent-encoding";
- packageId = "percent-encoding 2.3.1";
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- {
- name = "rustversion";
- packageId = "rustversion";
- }
- {
- name = "serde";
- packageId = "serde 1.0.217";
- }
- {
- name = "serde_json";
- packageId = "serde_json";
- optional = true;
- features = [ "raw_value" ];
- }
- {
- name = "serde_path_to_error";
- packageId = "serde_path_to_error";
- optional = true;
- }
- {
- name = "serde_urlencoded";
- packageId = "serde_urlencoded";
- optional = true;
- }
- {
- name = "sync_wrapper";
- packageId = "sync_wrapper 1.0.2";
- }
- {
- name = "tokio";
- packageId = "tokio";
- rename = "tokio";
- optional = true;
- features = [ "time" ];
- }
- {
- name = "tower";
- packageId = "tower";
- usesDefaultFeatures = false;
- features = [ "util" ];
- }
- {
- name = "tower-layer";
- packageId = "tower-layer";
- }
- {
- name = "tower-service";
- packageId = "tower-service";
- }
- {
- name = "tracing";
- packageId = "tracing";
- optional = true;
- usesDefaultFeatures = false;
- }
- ];
- devDependencies = [
- {
- name = "axum-macros";
- packageId = "axum-macros";
- features = [ "__private" ];
- }
- {
- name = "serde";
- packageId = "serde 1.0.217";
- features = [ "derive" ];
- }
- {
- name = "serde_json";
- packageId = "serde_json";
- features = [ "raw_value" ];
- }
- {
- name = "tokio";
- packageId = "tokio";
- rename = "tokio";
- features = [ "macros" "rt" "rt-multi-thread" "net" "test-util" ];
- }
- {
- name = "tower";
- packageId = "tower";
- rename = "tower";
- features = [ "util" "timeout" "limit" "load-shed" "steer" "filter" ];
- }
- {
- name = "tracing";
- packageId = "tracing";
- }
- ];
- features = {
- "__private_docs" = [ "axum-core/__private_docs" "tower/full" "dep:tower-http" ];
- "default" = [ "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ];
- "form" = [ "dep:serde_urlencoded" ];
- "http1" = [ "dep:hyper" "hyper?/http1" "hyper-util?/http1" ];
- "http2" = [ "dep:hyper" "hyper?/http2" "hyper-util?/http2" ];
- "json" = [ "dep:serde_json" "dep:serde_path_to_error" ];
- "macros" = [ "dep:axum-macros" ];
- "multipart" = [ "dep:multer" ];
- "query" = [ "dep:serde_urlencoded" ];
- "tokio" = [ "dep:hyper-util" "dep:tokio" "tokio/net" "tokio/rt" "tower/make" "tokio/macros" ];
- "tower-log" = [ "tower/log" ];
- "tracing" = [ "dep:tracing" "axum-core/tracing" ];
- "ws" = [ "dep:hyper" "tokio" "dep:tokio-tungstenite" "dep:sha1" "dep:base64" ];
- };
- resolvedDefaultFeatures = [ "default" "form" "http1" "json" "macros" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ];
- };
- "axum-core" = rec {
- crateName = "axum-core";
- version = "0.4.5";
- edition = "2021";
- sha256 = "16b1496c4gm387q20hkv5ic3k5bd6xmnvk50kwsy6ymr8rhvvwh9";
- libName = "axum_core";
- dependencies = [
- {
- name = "async-trait";
- packageId = "async-trait";
- }
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- features = [ "alloc" ];
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "http-body";
- packageId = "http-body 1.0.1";
- }
- {
- name = "http-body-util";
- packageId = "http-body-util";
- }
- {
- name = "mime";
- packageId = "mime 0.3.17";
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- {
- name = "rustversion";
- packageId = "rustversion";
- }
- {
- name = "sync_wrapper";
- packageId = "sync_wrapper 1.0.2";
- }
- {
- name = "tower-layer";
- packageId = "tower-layer";
- }
- {
- name = "tower-service";
- packageId = "tower-service";
- }
- {
- name = "tracing";
- packageId = "tracing";
- optional = true;
- usesDefaultFeatures = false;
- }
- ];
- devDependencies = [
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- features = [ "alloc" ];
- }
- ];
- features = {
- "__private_docs" = [ "dep:tower-http" ];
- "tracing" = [ "dep:tracing" ];
- };
- resolvedDefaultFeatures = [ "tracing" ];
- };
- "axum-macros" = rec {
- crateName = "axum-macros";
- version = "0.4.2";
- edition = "2021";
- sha256 = "1klv77c889jm05bzayaaiinalarhvh2crc2w4nvp3l581xaj7lap";
- procMacro = true;
- libName = "axum_macros";
- dependencies = [
- {
- name = "proc-macro2";
- packageId = "proc-macro2";
- }
- {
- name = "quote";
- packageId = "quote";
- }
- {
- name = "syn";
- packageId = "syn 2.0.96";
- features = [ "full" "parsing" "extra-traits" ];
- }
- ];
- devDependencies = [
- {
- name = "syn";
- packageId = "syn 2.0.96";
- features = [ "full" "extra-traits" ];
- }
- ];
- features = {
- "__private" = [ "syn/visit-mut" ];
- };
- resolvedDefaultFeatures = [ "default" ];
- };
- "axum-test" = rec {
- crateName = "axum-test";
- version = "16.4.1";
- edition = "2021";
- sha256 = "1p5qxacvxsagnqq30nr2wznjyhgb8svsfb925ah3d2b0s91s9qv3";
- libName = "axum_test";
- authors = [
- "Joseph Lenton <josephlenton@gmail.com>"
- ];
- dependencies = [
- {
- name = "anyhow";
- packageId = "anyhow";
- }
- {
- name = "assert-json-diff";
- packageId = "assert-json-diff";
- }
- {
- name = "auto-future";
- packageId = "auto-future";
- }
- {
- name = "axum";
- packageId = "axum";
- }
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "bytesize";
- packageId = "bytesize";
- }
- {
- name = "cookie";
- packageId = "cookie 0.18.1";
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "http-body-util";
- packageId = "http-body-util";
- }
- {
- name = "hyper";
- packageId = "hyper 1.5.2";
- features = [ "http1" ];
- }
- {
- name = "hyper-util";
- packageId = "hyper-util";
- features = [ "client" "http1" "client-legacy" ];
- }
- {
- name = "mime";
- packageId = "mime 0.3.17";
- }
- {
- name = "pretty_assertions";
- packageId = "pretty_assertions";
- optional = true;
- }
- {
- name = "reserve-port";
- packageId = "reserve-port";
- }
- {
- name = "rust-multipart-rfc7578_2";
- packageId = "rust-multipart-rfc7578_2";
- }
- {
- name = "serde";
- packageId = "serde 1.0.217";
- }
- {
- name = "serde_json";
- packageId = "serde_json";
- }
- {
- name = "serde_urlencoded";
- packageId = "serde_urlencoded";
- }
- {
- name = "smallvec";
- packageId = "smallvec";
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "rt" ];
- }
- {
- name = "tower";
- packageId = "tower";
- features = [ "util" "make" ];
- }
- {
- name = "url";
- packageId = "url 2.5.4";
- }
- ];
- devDependencies = [
- {
- name = "axum";
- packageId = "axum";
- features = [ "multipart" "tokio" "ws" ];
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "rt" "rt-multi-thread" "sync" "time" "macros" ];
- }
- ];
- features = {
- "all" = [ "pretty-assertions" "yaml" "msgpack" "reqwest" "shuttle" "typed-routing" "ws" ];
- "default" = [ "pretty-assertions" ];
- "msgpack" = [ "dep:rmp-serde" ];
- "pretty-assertions" = [ "dep:pretty_assertions" ];
- "reqwest" = [ "dep:reqwest" ];
- "shuttle" = [ "dep:shuttle-axum" ];
- "typed-routing" = [ "dep:axum-extra" ];
- "ws" = [ "axum/ws" "tokio/time" "dep:uuid" "dep:base64" "dep:tokio-tungstenite" "dep:futures-util" ];
- "yaml" = [ "dep:serde_yaml" ];
- };
- resolvedDefaultFeatures = [ "default" "pretty-assertions" ];
- };
"az" = rec {
crateName = "az";
version = "1.2.1";
@@ -2055,7 +1560,7 @@ rec {
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -2199,19 +1704,6 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
- "bytesize" = rec {
- crateName = "bytesize";
- version = "1.3.0";
- edition = "2015";
- sha256 = "1k3aak70iwz4s2gsjbxf0ws4xnixqbdz6p2ha96s06748fpniqx3";
- authors = [
- "Hyunsik Choi <hyunsik.choi@gmail.com>"
- ];
- features = {
- "serde" = [ "dep:serde" ];
- };
- resolvedDefaultFeatures = [ "default" ];
- };
"cairo-rs" = rec {
crateName = "cairo-rs";
version = "0.18.5";
@@ -2434,7 +1926,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -2494,7 +1986,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -2615,10 +2107,10 @@ rec {
};
"clap" = rec {
crateName = "clap";
- version = "4.5.26";
+ version = "4.5.30";
edition = "2021";
crateBin = [];
- sha256 = "10v7qvn90calfbhap1c4r249i5c7fbxj09fn3szfz9pkis85xsx8";
+ sha256 = "0vcyrn4ymq2gd56sl3xnfki8q8llg64sj3rj3qx33mgsf66v3dwj";
dependencies = [
{
name = "clap_builder";
@@ -2647,6 +2139,7 @@ rec {
"unicode" = [ "clap_builder/unicode" ];
"unstable-doc" = [ "clap_builder/unstable-doc" "derive" ];
"unstable-ext" = [ "clap_builder/unstable-ext" ];
+ "unstable-markdown" = [ "clap_derive/unstable-markdown" ];
"unstable-styles" = [ "clap_builder/unstable-styles" ];
"unstable-v5" = [ "clap_builder/unstable-v5" "clap_derive?/unstable-v5" "deprecated" ];
"usage" = [ "clap_builder/usage" ];
@@ -2656,9 +2149,9 @@ rec {
};
"clap_builder" = rec {
crateName = "clap_builder";
- version = "4.5.26";
+ version = "4.5.30";
edition = "2021";
- sha256 = "08f1mzcvi7zjhm7hvz6al4jnv70ccqhwiaq74hihlspwnl0iic4n";
+ sha256 = "0369xis2ar46icsaxqyy37976mlb62alzyx4j53k99vq2w3v4pd3";
dependencies = [
{
name = "anstream";
@@ -2695,9 +2188,9 @@ rec {
};
"clap_derive" = rec {
crateName = "clap_derive";
- version = "4.5.24";
+ version = "4.5.28";
edition = "2021";
- sha256 = "131ih3dm76srkbpfx7zfspp9b556zgzj31wqhl0ji2b39lcmbdsl";
+ sha256 = "1vgigkhljp3r8r5lwdrn1ij93nafmjwh8cx77nppb9plqsaysk5z";
procMacro = true;
dependencies = [
{
@@ -2720,6 +2213,7 @@ rec {
];
features = {
"raw-deprecated" = [ "deprecated" ];
+ "unstable-markdown" = [ "dep:pulldown-cmark" "dep:anstyle" ];
"unstable-v5" = [ "deprecated" ];
};
resolvedDefaultFeatures = [ "default" ];
@@ -2811,7 +2305,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -2887,7 +2381,7 @@ rec {
"random" = [ "rand" ];
};
};
- "cookie 0.17.0" = rec {
+ "cookie" = rec {
crateName = "cookie";
version = "0.17.0";
edition = "2018";
@@ -2926,45 +2420,6 @@ rec {
"subtle" = [ "dep:subtle" ];
};
};
- "cookie 0.18.1" = rec {
- crateName = "cookie";
- version = "0.18.1";
- edition = "2018";
- sha256 = "0iy749flficrlvgr3hjmf3igr738lk81n5akzf4ym4cs6cxg7pjd";
- authors = [
- "Sergio Benitez <sb@sergio.bz>"
- "Alex Crichton <alex@alexcrichton.com>"
- ];
- dependencies = [
- {
- name = "time";
- packageId = "time 0.3.37";
- usesDefaultFeatures = false;
- features = [ "std" "parsing" "formatting" "macros" ];
- }
- ];
- buildDependencies = [
- {
- name = "version_check";
- packageId = "version_check 0.9.5";
- }
- ];
- features = {
- "aes-gcm" = [ "dep:aes-gcm" ];
- "base64" = [ "dep:base64" ];
- "hkdf" = [ "dep:hkdf" ];
- "hmac" = [ "dep:hmac" ];
- "key-expansion" = [ "sha2" "hkdf" ];
- "percent-encode" = [ "percent-encoding" ];
- "percent-encoding" = [ "dep:percent-encoding" ];
- "private" = [ "aes-gcm" "base64" "rand" "subtle" ];
- "rand" = [ "dep:rand" ];
- "secure" = [ "private" "signed" "key-expansion" ];
- "sha2" = [ "dep:sha2" ];
- "signed" = [ "hmac" "sha2" "base64" "rand" "subtle" ];
- "subtle" = [ "dep:subtle" ];
- };
- };
"cookie-factory" = rec {
crateName = "cookie-factory";
version = "0.3.3";
@@ -3325,7 +2780,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -3495,7 +2950,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -3626,16 +3081,6 @@ rec {
};
resolvedDefaultFeatures = [ "alloc" "powerfmt" "std" ];
};
- "diff" = rec {
- crateName = "diff";
- version = "0.1.13";
- edition = "2015";
- sha256 = "1j0nzjxci2zqx63hdcihkp0a4dkdmzxd7my4m7zk6cjyfy34j9an";
- authors = [
- "Utkarsh Kukreti <utkarshkukreti@gmail.com>"
- ];
-
- };
"digest" = rec {
crateName = "digest";
version = "0.10.7";
@@ -3702,7 +3147,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
}
{
@@ -3742,7 +3187,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
}
{
@@ -3821,7 +3266,7 @@ rec {
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
features = [ "derive" ];
}
@@ -3857,7 +3302,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
{
name = "serde_derive";
@@ -4145,33 +3590,6 @@ rec {
];
};
- "fallible-iterator" = rec {
- crateName = "fallible-iterator";
- version = "0.3.0";
- edition = "2018";
- sha256 = "0ja6l56yka5vn4y4pk6hn88z0bpny7a8k1919aqjzp0j1yhy9k1a";
- libName = "fallible_iterator";
- authors = [
- "Steven Fackler <sfackler@gmail.com>"
- ];
- features = {
- "default" = [ "alloc" ];
- "std" = [ "alloc" ];
- };
- resolvedDefaultFeatures = [ "alloc" "default" ];
- };
- "fallible-streaming-iterator" = rec {
- crateName = "fallible-streaming-iterator";
- version = "0.1.9";
- edition = "2015";
- sha256 = "0nj6j26p71bjy8h42x6jahx1hn0ng6mc2miwpgwnp8vnwqf4jq3k";
- libName = "fallible_streaming_iterator";
- authors = [
- "Steven Fackler <sfackler@gmail.com>"
- ];
- features = {
- };
- };
"fastrand" = rec {
crateName = "fastrand";
version = "2.3.0";
@@ -4277,7 +3695,7 @@ rec {
}
{
name = "cookie";
- packageId = "cookie 0.17.0";
+ packageId = "cookie";
}
{
name = "futures-util";
@@ -4317,7 +3735,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -4841,7 +4259,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -5481,7 +4899,7 @@ rec {
libName = "geo_types";
};
- "getrandom" = rec {
+ "getrandom 0.2.15" = rec {
crateName = "getrandom";
version = "0.2.15";
edition = "2018";
@@ -5517,6 +4935,84 @@ rec {
};
resolvedDefaultFeatures = [ "std" ];
};
+ "getrandom 0.3.1" = rec {
+ crateName = "getrandom";
+ version = "0.3.1";
+ edition = "2021";
+ sha256 = "1y154yzby383p63ndw6zpfm0fz3vf6c0zdwc7df6vkl150wrr923";
+ authors = [
+ "The Rand Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "cfg-if";
+ packageId = "cfg-if";
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: ((("linux" == target."os") || ("android" == target."os")) && (!(("custom" == target."getrandom_backend") || ("rdrand" == target."getrandom_backend") || ("rndr" == target."getrandom_backend"))));
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: (("dragonfly" == target."os") || ("freebsd" == target."os") || ("hurd" == target."os") || ("illumos" == target."os") || (("horizon" == target."os") && ("arm" == target."arch")));
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: (("haiku" == target."os") || ("redox" == target."os") || ("nto" == target."os") || ("aix" == target."os"));
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: (("ios" == target."os") || ("visionos" == target."os") || ("watchos" == target."os") || ("tvos" == target."os"));
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: (("macos" == target."os") || ("openbsd" == target."os") || ("vita" == target."os") || ("emscripten" == target."os"));
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: ("netbsd" == target."os");
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: ("solaris" == target."os");
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: ("vxworks" == target."os");
+ }
+ {
+ name = "wasi";
+ packageId = "wasi 0.13.3+wasi-0.2.2";
+ usesDefaultFeatures = false;
+ target = { target, features }: (("wasm32" == target."arch") && ("wasi" == target."os") && ("p2" == target."env"));
+ }
+ {
+ name = "windows-targets";
+ packageId = "windows-targets 0.52.6";
+ target = { target, features }: ((target."windows" or false) && (!("win7" == target."vendor")));
+ }
+ ];
+ features = {
+ "rustc-dep-of-std" = [ "dep:compiler_builtins" "dep:core" ];
+ "wasm_js" = [ "dep:wasm-bindgen" "dep:js-sys" ];
+ };
+ };
"gif 0.11.4" = rec {
crateName = "gif";
version = "0.11.4";
@@ -5868,7 +5364,7 @@ rec {
}
{
name = "proc-macro-crate";
- packageId = "proc-macro-crate 2.0.2";
+ packageId = "proc-macro-crate 2.0.0";
}
{
name = "proc-macro-error";
@@ -6027,7 +5523,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
{
name = "serde_json";
@@ -6075,7 +5571,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "alloc" "derive" ];
}
{
@@ -6642,39 +6138,7 @@ rec {
};
resolvedDefaultFeatures = [ "alloc" "default" "std" ];
};
- "hashbrown 0.14.5" = rec {
- crateName = "hashbrown";
- version = "0.14.5";
- edition = "2021";
- sha256 = "1wa1vy1xs3mp11bn3z9dv0jricgr6a2j0zkf1g19yz3vw4il89z5";
- authors = [
- "Amanieu d'Antras <amanieu@gmail.com>"
- ];
- dependencies = [
- {
- name = "ahash";
- packageId = "ahash";
- optional = true;
- usesDefaultFeatures = false;
- }
- ];
- features = {
- "ahash" = [ "dep:ahash" ];
- "alloc" = [ "dep:alloc" ];
- "allocator-api2" = [ "dep:allocator-api2" ];
- "compiler_builtins" = [ "dep:compiler_builtins" ];
- "core" = [ "dep:core" ];
- "default" = [ "ahash" "inline-more" "allocator-api2" ];
- "equivalent" = [ "dep:equivalent" ];
- "nightly" = [ "allocator-api2?/nightly" "bumpalo/allocator_api" ];
- "rayon" = [ "dep:rayon" ];
- "rkyv" = [ "dep:rkyv" ];
- "rustc-dep-of-std" = [ "nightly" "core" "compiler_builtins" "alloc" "rustc-internal-api" ];
- "serde" = [ "dep:serde" ];
- };
- resolvedDefaultFeatures = [ "ahash" "inline-more" ];
- };
- "hashbrown 0.15.2" = rec {
+ "hashbrown" = rec {
crateName = "hashbrown";
version = "0.15.2";
edition = "2021";
@@ -6718,7 +6182,7 @@ rec {
};
resolvedDefaultFeatures = [ "allocator-api2" "default" "default-hasher" "equivalent" "inline-more" "raw-entry" ];
};
- "hashlink 0.10.0" = rec {
+ "hashlink" = rec {
crateName = "hashlink";
version = "0.10.0";
edition = "2018";
@@ -6729,7 +6193,7 @@ rec {
dependencies = [
{
name = "hashbrown";
- packageId = "hashbrown 0.15.2";
+ packageId = "hashbrown";
usesDefaultFeatures = false;
features = [ "default-hasher" "inline-more" ];
}
@@ -6739,27 +6203,6 @@ rec {
"serde_impl" = [ "serde" ];
};
};
- "hashlink 0.9.1" = rec {
- crateName = "hashlink";
- version = "0.9.1";
- edition = "2018";
- sha256 = "1byq4nyrflm5s6wdx5qwp96l1qbp2d0nljvrr5yqrsfy51qzz93b";
- authors = [
- "kyren <kerriganw@gmail.com>"
- ];
- dependencies = [
- {
- name = "hashbrown";
- packageId = "hashbrown 0.14.5";
- usesDefaultFeatures = false;
- features = [ "ahash" "inline-more" ];
- }
- ];
- features = {
- "serde" = [ "dep:serde" ];
- "serde_impl" = [ "serde" ];
- };
- };
"headers" = rec {
crateName = "headers";
version = "0.3.9";
@@ -7073,7 +6516,7 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
- "http-body 0.4.6" = rec {
+ "http-body" = rec {
crateName = "http-body";
version = "0.4.6";
edition = "2018";
@@ -7099,65 +6542,6 @@ rec {
}
];
- };
- "http-body 1.0.1" = rec {
- crateName = "http-body";
- version = "1.0.1";
- edition = "2018";
- sha256 = "111ir5k2b9ihz5nr9cz7cwm7fnydca7dx4hc7vr16scfzghxrzhy";
- libName = "http_body";
- authors = [
- "Carl Lerche <me@carllerche.com>"
- "Lucio Franco <luciofranco14@gmail.com>"
- "Sean McArthur <sean@seanmonstar.com>"
- ];
- dependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- ];
-
- };
- "http-body-util" = rec {
- crateName = "http-body-util";
- version = "0.1.2";
- edition = "2018";
- sha256 = "0kslwazg4400qnc2azkrgqqci0fppv12waicnsy5d8hncvbjjd3r";
- libName = "http_body_util";
- authors = [
- "Carl Lerche <me@carllerche.com>"
- "Lucio Franco <luciofranco14@gmail.com>"
- "Sean McArthur <sean@seanmonstar.com>"
- ];
- dependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "http-body";
- packageId = "http-body 1.0.1";
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- ];
-
};
"httparse" = rec {
crateName = "httparse";
@@ -7288,7 +6672,7 @@ rec {
}
{
name = "http-body";
- packageId = "http-body 0.4.6";
+ packageId = "http-body";
}
{
name = "httparse";
@@ -7357,108 +6741,6 @@ rec {
};
resolvedDefaultFeatures = [ "client" "default" "h2" "http1" "http2" "runtime" "server" "socket2" "stream" "tcp" ];
};
- "hyper 1.5.2" = rec {
- crateName = "hyper";
- version = "1.5.2";
- edition = "2021";
- sha256 = "1q7akfb443yrjzkmnnbp2vs8zi15hgbk466rr4y144v4ppabhvr5";
- authors = [
- "Sean McArthur <sean@seanmonstar.com>"
- ];
- dependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "futures-channel";
- packageId = "futures-channel";
- optional = true;
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- optional = true;
- usesDefaultFeatures = false;
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "http-body";
- packageId = "http-body 1.0.1";
- }
- {
- name = "httparse";
- packageId = "httparse";
- optional = true;
- }
- {
- name = "httpdate";
- packageId = "httpdate";
- optional = true;
- }
- {
- name = "itoa";
- packageId = "itoa";
- optional = true;
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- optional = true;
- }
- {
- name = "smallvec";
- packageId = "smallvec";
- optional = true;
- features = [ "const_generics" "const_new" ];
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "sync" ];
- }
- {
- name = "want";
- packageId = "want";
- optional = true;
- }
- ];
- devDependencies = [
- {
- name = "futures-channel";
- packageId = "futures-channel";
- features = [ "sink" ];
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- features = [ "alloc" "sink" ];
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "fs" "macros" "net" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ];
- }
- ];
- features = {
- "client" = [ "dep:want" "dep:pin-project-lite" "dep:smallvec" ];
- "ffi" = [ "dep:http-body-util" "futures-util?/alloc" ];
- "full" = [ "client" "http1" "http2" "server" ];
- "http1" = [ "dep:futures-channel" "dep:futures-util" "dep:httparse" "dep:itoa" ];
- "http2" = [ "dep:futures-channel" "dep:futures-util" "dep:h2" ];
- "server" = [ "dep:httpdate" "dep:pin-project-lite" "dep:smallvec" ];
- "tracing" = [ "dep:tracing" ];
- };
- resolvedDefaultFeatures = [ "client" "default" "http1" "server" ];
- };
"hyper-tls" = rec {
crateName = "hyper-tls";
version = "0.5.0";
@@ -7509,101 +6791,6 @@ rec {
"vendored" = [ "native-tls/vendored" ];
};
};
- "hyper-util" = rec {
- crateName = "hyper-util";
- version = "0.1.10";
- edition = "2021";
- sha256 = "1d1iwrkysjhq63pg54zk3vfby1j7zmxzm9zzyfr4lwvp0szcybfz";
- libName = "hyper_util";
- authors = [
- "Sean McArthur <sean@seanmonstar.com>"
- ];
- dependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "futures-channel";
- packageId = "futures-channel";
- optional = true;
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "http-body";
- packageId = "http-body 1.0.1";
- }
- {
- name = "hyper";
- packageId = "hyper 1.5.2";
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- {
- name = "socket2";
- packageId = "socket2";
- optional = true;
- features = [ "all" ];
- }
- {
- name = "tokio";
- packageId = "tokio";
- optional = true;
- usesDefaultFeatures = false;
- }
- {
- name = "tower-service";
- packageId = "tower-service";
- optional = true;
- }
- {
- name = "tracing";
- packageId = "tracing";
- optional = true;
- usesDefaultFeatures = false;
- features = [ "std" ];
- }
- ];
- devDependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "hyper";
- packageId = "hyper 1.5.2";
- features = [ "full" ];
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "macros" "test-util" "signal" ];
- }
- ];
- features = {
- "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower-service" ];
- "client-legacy" = [ "client" "dep:socket2" "tokio/sync" ];
- "full" = [ "client" "client-legacy" "server" "server-auto" "server-graceful" "service" "http1" "http2" "tokio" ];
- "http1" = [ "hyper/http1" ];
- "http2" = [ "hyper/http2" ];
- "server" = [ "hyper/server" ];
- "server-auto" = [ "server" "http1" "http2" ];
- "server-graceful" = [ "server" "tokio/sync" "futures-util/alloc" ];
- "service" = [ "dep:tower-service" ];
- "tokio" = [ "dep:tokio" "tokio/net" "tokio/rt" "tokio/time" ];
- };
- resolvedDefaultFeatures = [ "client" "client-legacy" "default" "http1" "server" "service" "tokio" ];
- };
"iana-time-zone" = rec {
crateName = "iana-time-zone";
version = "0.1.61";
@@ -7766,6 +6953,13 @@ rec {
usesDefaultFeatures = false;
features = [ "alloc" ];
}
+ {
+ name = "serde";
+ packageId = "serde 1.0.218";
+ optional = true;
+ usesDefaultFeatures = false;
+ features = [ "alloc" "derive" ];
+ }
{
name = "tinystr";
packageId = "tinystr";
@@ -7784,13 +6978,21 @@ rec {
usesDefaultFeatures = false;
}
];
+ devDependencies = [
+ {
+ name = "serde";
+ packageId = "serde 1.0.218";
+ usesDefaultFeatures = false;
+ features = [ "derive" ];
+ }
+ ];
features = {
"bench" = [ "serde" ];
"databake" = [ "dep:databake" ];
"serde" = [ "dep:serde" "tinystr/serde" ];
"zerovec" = [ "dep:zerovec" ];
};
- resolvedDefaultFeatures = [ "zerovec" ];
+ resolvedDefaultFeatures = [ "serde" "zerovec" ];
};
"icu_locid_transform" = rec {
crateName = "icu_locid_transform";
@@ -8369,49 +7571,6 @@ rec {
};
resolvedDefaultFeatures = [ "bmp" "dds" "default" "dxt" "exr" "farbfeld" "gif" "hdr" "ico" "jpeg" "jpeg_rayon" "openexr" "png" "pnm" "qoi" "tga" "tiff" "webp" ];
};
- "include_dir" = rec {
- crateName = "include_dir";
- version = "0.7.4";
- edition = "2021";
- sha256 = "1pfh3g45z88kwq93skng0n6g3r7zkhq9ldqs9y8rvr7i11s12gcj";
- authors = [
- "Michael Bryan <michaelfbryan@gmail.com>"
- ];
- dependencies = [
- {
- name = "include_dir_macros";
- packageId = "include_dir_macros";
- }
- ];
- features = {
- "glob" = [ "dep:glob" ];
- "metadata" = [ "include_dir_macros/metadata" ];
- "nightly" = [ "include_dir_macros/nightly" ];
- };
- resolvedDefaultFeatures = [ "default" ];
- };
- "include_dir_macros" = rec {
- crateName = "include_dir_macros";
- version = "0.7.4";
- edition = "2021";
- sha256 = "0x8smnf6knd86g69p19z5lpfsaqp8w0nx14kdpkz1m8bxnkqbavw";
- procMacro = true;
- authors = [
- "Michael Bryan <michaelfbryan@gmail.com>"
- ];
- dependencies = [
- {
- name = "proc-macro2";
- packageId = "proc-macro2";
- }
- {
- name = "quote";
- packageId = "quote";
- }
- ];
- features = {
- };
- };
"indent_write" = rec {
crateName = "indent_write";
version = "2.2.0";
@@ -8437,7 +7596,7 @@ rec {
}
{
name = "hashbrown";
- packageId = "hashbrown 0.15.2";
+ packageId = "hashbrown";
usesDefaultFeatures = false;
}
];
@@ -8732,6 +7891,67 @@ rec {
}
];
+ };
+ "l10n-db" = rec {
+ crateName = "l10n-db";
+ version = "0.1.0";
+ edition = "2021";
+ crateBin = [
+ {
+ name = "main";
+ path = "src/bin/main.rs";
+ requiredFeatures = [ ];
+ }
+ ];
+ # We can't filter paths with references in Nix 2.4
+ # See https://github.com/NixOS/nix/issues/5410
+ src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
+ then lib.cleanSourceWith { filter = sourceFilter; src = ./l10n-db; }
+ else ./l10n-db;
+ libName = "l10n_db";
+ dependencies = [
+ {
+ name = "chrono";
+ packageId = "chrono";
+ features = [ "serde" ];
+ }
+ {
+ name = "clap";
+ packageId = "clap";
+ features = [ "derive" ];
+ }
+ {
+ name = "icu_locid";
+ packageId = "icu_locid";
+ features = [ "serde" ];
+ }
+ {
+ name = "serde";
+ packageId = "serde 1.0.218";
+ features = [ "derive" ];
+ }
+ {
+ name = "serde_json";
+ packageId = "serde_json";
+ }
+ {
+ name = "tempfile";
+ packageId = "tempfile";
+ }
+ {
+ name = "thiserror";
+ packageId = "thiserror 2.0.11";
+ }
+ {
+ name = "toml";
+ packageId = "toml";
+ }
+ {
+ name = "xml-rs";
+ packageId = "xml-rs";
+ }
+ ];
+
};
"language-tags" = rec {
crateName = "language-tags";
@@ -9090,7 +8310,7 @@ rec {
"syn" = [ "dep:syn" ];
"vcpkg" = [ "dep:vcpkg" ];
};
- resolvedDefaultFeatures = [ "bundled" "bundled_bindings" "cc" "default" "min_sqlite_version_3_14_0" "pkg-config" "unlock_notify" "vcpkg" ];
+ resolvedDefaultFeatures = [ "bundled" "bundled_bindings" "cc" "pkg-config" "unlock_notify" "vcpkg" ];
};
"libyml" = rec {
crateName = "libyml";
@@ -9308,18 +8528,6 @@ rec {
libPath = "lib.rs";
};
- "matchit" = rec {
- crateName = "matchit";
- version = "0.7.3";
- edition = "2021";
- sha256 = "156bgdmmlv4crib31qhgg49nsjk88dxkdqp80ha2pk2rk6n6ax0f";
- authors = [
- "Ibraheem Ahmed <ibraheem@ibraheem.ca>"
- ];
- features = {
- };
- resolvedDefaultFeatures = [ "default" ];
- };
"md-5" = rec {
crateName = "md-5";
version = "0.10.6";
@@ -9412,7 +8620,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
{
name = "serde_derive";
@@ -10383,7 +9591,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -11349,31 +10557,6 @@ rec {
};
resolvedDefaultFeatures = [ "simd" "std" ];
};
- "pretty_assertions" = rec {
- crateName = "pretty_assertions";
- version = "1.4.1";
- edition = "2018";
- sha256 = "0v8iq35ca4rw3rza5is3wjxwsf88303ivys07anc5yviybi31q9s";
- authors = [
- "Colin Kiegel <kiegel@gmx.de>"
- "Florent Fayolle <florent.fayolle69@gmail.com>"
- "Tom Milligan <code@tommilligan.net>"
- ];
- dependencies = [
- {
- name = "diff";
- packageId = "diff";
- }
- {
- name = "yansi";
- packageId = "yansi";
- }
- ];
- features = {
- "default" = [ "std" ];
- };
- resolvedDefaultFeatures = [ "default" "std" ];
- };
"pretty_env_logger" = rec {
crateName = "pretty_env_logger";
version = "0.5.0";
@@ -11415,20 +10598,16 @@ rec {
];
};
- "proc-macro-crate 2.0.2" = rec {
+ "proc-macro-crate 2.0.0" = rec {
crateName = "proc-macro-crate";
- version = "2.0.2";
+ version = "2.0.0";
edition = "2021";
- sha256 = "092x5acqnic14cw6vacqap5kgknq3jn4c6jij9zi6j85839jc3xh";
+ sha256 = "1s23imns07vmacn2xjd5hv2h6rr94iqq3fd2frwa6i4h2nk6d0vy";
libName = "proc_macro_crate";
authors = [
"Bastian Köcher <git@kchr.de>"
];
dependencies = [
- {
- name = "toml_datetime";
- packageId = "toml_datetime";
- }
{
name = "toml_edit";
packageId = "toml_edit 0.20.2";
@@ -11962,7 +11141,7 @@ rec {
dependencies = [
{
name = "getrandom";
- packageId = "getrandom";
+ packageId = "getrandom 0.2.15";
optional = true;
}
];
@@ -12447,7 +11626,7 @@ rec {
}
{
name = "http-body";
- packageId = "http-body 0.4.6";
+ packageId = "http-body";
target = { target, features }: (!("wasm32" == target."arch"));
}
{
@@ -12513,7 +11692,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
{
name = "serde_json";
@@ -12531,7 +11710,7 @@ rec {
}
{
name = "sync_wrapper";
- packageId = "sync_wrapper 0.1.2";
+ packageId = "sync_wrapper";
}
{
name = "system-configuration";
@@ -12598,7 +11777,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
target = {target, features}: (!("wasm32" == target."arch"));
features = [ "derive" ];
}
@@ -12664,27 +11843,6 @@ rec {
};
resolvedDefaultFeatures = [ "__tls" "default" "default-tls" "hyper-tls" "json" "native-tls-crate" "serde_json" "tokio-native-tls" ];
};
- "reserve-port" = rec {
- crateName = "reserve-port";
- version = "2.0.1";
- edition = "2021";
- sha256 = "10x21rdb1hjzp6n5flbbw3hfd7brmirckz1q0zsf3a7s5d516f4q";
- libName = "reserve_port";
- authors = [
- "Joseph Lenton <josephlenton@gmail.com>"
- ];
- dependencies = [
- {
- name = "lazy_static";
- packageId = "lazy_static";
- }
- {
- name = "thiserror";
- packageId = "thiserror 1.0.69";
- }
- ];
-
- };
"result-extended" = rec {
crateName = "result-extended";
version = "0.1.0";
@@ -12803,158 +11961,6 @@ rec {
};
resolvedDefaultFeatures = [ "default" "pem" "std" "u64_digit" ];
};
- "rusqlite" = rec {
- crateName = "rusqlite";
- version = "0.32.1";
- edition = "2021";
- sha256 = "0vlx040bppl414pbjgbp7qr4jdxwszi9krx0m63zzf2f2whvflvp";
- authors = [
- "The rusqlite developers"
- ];
- dependencies = [
- {
- name = "bitflags";
- packageId = "bitflags 2.8.0";
- }
- {
- name = "fallible-iterator";
- packageId = "fallible-iterator";
- }
- {
- name = "fallible-streaming-iterator";
- packageId = "fallible-streaming-iterator";
- }
- {
- name = "hashlink";
- packageId = "hashlink 0.9.1";
- }
- {
- name = "libsqlite3-sys";
- packageId = "libsqlite3-sys";
- }
- {
- name = "smallvec";
- packageId = "smallvec";
- }
- ];
- features = {
- "array" = [ "vtab" ];
- "buildtime_bindgen" = [ "libsqlite3-sys/buildtime_bindgen" ];
- "bundled" = [ "libsqlite3-sys/bundled" "modern_sqlite" ];
- "bundled-full" = [ "modern-full" "bundled" ];
- "bundled-sqlcipher" = [ "libsqlite3-sys/bundled-sqlcipher" "bundled" ];
- "bundled-sqlcipher-vendored-openssl" = [ "libsqlite3-sys/bundled-sqlcipher-vendored-openssl" "bundled-sqlcipher" ];
- "bundled-windows" = [ "libsqlite3-sys/bundled-windows" ];
- "chrono" = [ "dep:chrono" ];
- "csv" = [ "dep:csv" ];
- "csvtab" = [ "csv" "vtab" ];
- "in_gecko" = [ "modern_sqlite" "libsqlite3-sys/in_gecko" ];
- "loadable_extension" = [ "libsqlite3-sys/loadable_extension" ];
- "modern-full" = [ "array" "backup" "blob" "modern_sqlite" "chrono" "collation" "column_decltype" "csvtab" "extra_check" "functions" "hooks" "i128_blob" "limits" "load_extension" "serde_json" "series" "time" "trace" "unlock_notify" "url" "uuid" "vtab" "window" ];
- "modern_sqlite" = [ "libsqlite3-sys/bundled_bindings" ];
- "preupdate_hook" = [ "libsqlite3-sys/preupdate_hook" "hooks" ];
- "rusqlite-macros" = [ "dep:rusqlite-macros" ];
- "serde_json" = [ "dep:serde_json" ];
- "serialize" = [ "modern_sqlite" ];
- "series" = [ "vtab" ];
- "session" = [ "libsqlite3-sys/session" "hooks" ];
- "sqlcipher" = [ "libsqlite3-sys/sqlcipher" ];
- "time" = [ "dep:time" ];
- "unlock_notify" = [ "libsqlite3-sys/unlock_notify" ];
- "url" = [ "dep:url" ];
- "uuid" = [ "dep:uuid" ];
- "wasm32-wasi-vfs" = [ "libsqlite3-sys/wasm32-wasi-vfs" ];
- "window" = [ "functions" ];
- "with-asan" = [ "libsqlite3-sys/with-asan" ];
- };
- };
- "rusqlite_migration" = rec {
- crateName = "rusqlite_migration";
- version = "1.3.1";
- edition = "2021";
- sha256 = "076dm65g0sngzrb93r07va4l5zl3gjx9gq5mlsh21p7p0bl44fwj";
- authors = [
- "Clément Joly <foss@131719.xyz>"
- ];
- dependencies = [
- {
- name = "include_dir";
- packageId = "include_dir";
- optional = true;
- }
- {
- name = "log";
- packageId = "log 0.4.25";
- }
- {
- name = "rusqlite";
- packageId = "rusqlite";
- usesDefaultFeatures = false;
- }
- ];
- features = {
- "alpha-async-tokio-rusqlite" = [ "dep:tokio-rusqlite" "dep:tokio" ];
- "from-directory" = [ "dep:include_dir" ];
- };
- resolvedDefaultFeatures = [ "default" "from-directory" ];
- };
- "rust-multipart-rfc7578_2" = rec {
- crateName = "rust-multipart-rfc7578_2";
- version = "0.6.1";
- edition = "2021";
- sha256 = "0mwd3i2mk91n6diaxnkw28vyjbifhrm5ls73pcpfzz8a1i0lidq3";
- libName = "rust_multipart_rfc7578_2";
- authors = [
- "Joseph Lenton <josephlenton@gmail.com>"
- "Ferris Tseng <ferristseng@fastmail.fm>"
- ];
- dependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "futures-core";
- packageId = "futures-core";
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- features = [ "io" ];
- }
- {
- name = "http";
- packageId = "http 0.2.12";
- }
- {
- name = "mime";
- packageId = "mime 0.3.17";
- }
- {
- name = "mime_guess";
- packageId = "mime_guess 2.0.5";
- }
- {
- name = "rand";
- packageId = "rand 0.8.5";
- features = [ "small_rng" ];
- }
- {
- name = "thiserror";
- packageId = "thiserror 1.0.69";
- }
- ];
- devDependencies = [
- {
- name = "futures-util";
- packageId = "futures-util";
- usesDefaultFeatures = false;
- features = [ "std" ];
- }
- ];
-
- };
"rustc-demangle" = rec {
crateName = "rustc-demangle";
version = "0.1.24";
@@ -13422,11 +12428,11 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
- "serde 1.0.217" = rec {
+ "serde 1.0.218" = rec {
crateName = "serde";
- version = "1.0.217";
+ version = "1.0.218";
edition = "2018";
- sha256 = "0w2ck1p1ajmrv1cf51qf7igjn2nc51r0izzc00fzmmhkvxjl5z02";
+ sha256 = "0q6z4bnrwagnms0bds4886711l6mc68s979i49zd3xnvkg8wkpz8";
authors = [
"Erick Tryzelaar <erick.tryzelaar@gmail.com>"
"David Tolnay <dtolnay@gmail.com>"
@@ -13458,9 +12464,9 @@ rec {
};
"serde_derive" = rec {
crateName = "serde_derive";
- version = "1.0.217";
+ version = "1.0.218";
edition = "2015";
- sha256 = "180r3rj5gi5s1m23q66cr5wlfgc5jrs6n1mdmql2njnhk37zg6ss";
+ sha256 = "0azqd74xbpb1v5vf6w1fdbgmwp39ljjfj25cib5rgrzlj7hh75gh";
procMacro = true;
authors = [
"Erick Tryzelaar <erick.tryzelaar@gmail.com>"
@@ -13492,9 +12498,9 @@ rec {
};
"serde_json" = rec {
crateName = "serde_json";
- version = "1.0.136";
+ version = "1.0.139";
edition = "2021";
- sha256 = "1lipcjhh1zazh283i4wsl4l14knh81q2rlkwmag8v8s2rwihqsik";
+ sha256 = "19kj3irpa22a7djz1jaf4wambzh7psiqa6zyafqnb76crhx6ry24";
authors = [
"Erick Tryzelaar <erick.tryzelaar@gmail.com>"
"David Tolnay <dtolnay@gmail.com>"
@@ -13515,14 +12521,14 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
usesDefaultFeatures = false;
}
];
devDependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
];
@@ -13535,26 +12541,6 @@ rec {
};
resolvedDefaultFeatures = [ "default" "raw_value" "std" ];
};
- "serde_path_to_error" = rec {
- crateName = "serde_path_to_error";
- version = "0.1.16";
- edition = "2021";
- sha256 = "19hlz2359l37ifirskpcds7sxg0gzpqvfilibs7whdys0128i6dg";
- authors = [
- "David Tolnay <dtolnay@gmail.com>"
- ];
- dependencies = [
- {
- name = "itoa";
- packageId = "itoa";
- }
- {
- name = "serde";
- packageId = "serde 1.0.217";
- }
- ];
-
- };
"serde_spanned" = rec {
crateName = "serde_spanned";
version = "0.6.8";
@@ -13563,14 +12549,14 @@ rec {
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
}
];
devDependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
];
features = {
@@ -13601,7 +12587,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
];
@@ -13638,7 +12624,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
];
buildDependencies = [
@@ -13650,7 +12636,7 @@ rec {
devDependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
];
@@ -13658,6 +12644,24 @@ rec {
};
resolvedDefaultFeatures = [ "default" ];
};
+ "server" = rec {
+ crateName = "server";
+ version = "0.1.0";
+ edition = "2021";
+ crateBin = [
+ {
+ name = "server";
+ path = "src/main.rs";
+ requiredFeatures = [ ];
+ }
+ ];
+ # We can't filter paths with references in Nix 2.4
+ # See https://github.com/NixOS/nix/issues/5410
+ src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
+ then lib.cleanSourceWith { filter = sourceFilter; src = ./visions/server; }
+ else ./visions/server;
+
+ };
"sgf" = rec {
crateName = "sgf";
version = "0.1.0";
@@ -13690,7 +12694,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -13992,7 +12996,7 @@ rec {
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -14245,11 +13249,11 @@ rec {
}
{
name = "hashbrown";
- packageId = "hashbrown 0.15.2";
+ packageId = "hashbrown";
}
{
name = "hashlink";
- packageId = "hashlink 0.10.0";
+ packageId = "hashlink";
}
{
name = "indexmap";
@@ -14275,7 +13279,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
features = [ "derive" "rc" ];
}
@@ -14478,7 +13482,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -14697,7 +13701,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
}
{
@@ -14864,7 +13868,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -14986,7 +13990,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
features = [ "derive" ];
}
@@ -15152,7 +14156,7 @@ rec {
};
resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "fold" "full" "parsing" "printing" "proc-macro" "visit" "visit-mut" ];
};
- "sync_wrapper 0.1.2" = rec {
+ "sync_wrapper" = rec {
crateName = "sync_wrapper";
version = "0.1.2";
edition = "2018";
@@ -15165,19 +14169,6 @@ rec {
"futures-core" = [ "dep:futures-core" ];
};
};
- "sync_wrapper 1.0.2" = rec {
- crateName = "sync_wrapper";
- version = "1.0.2";
- edition = "2021";
- sha256 = "0qvjyasd6w18mjg5xlaq5jgy84jsjfsvmnn12c13gypxbv75dwhb";
- authors = [
- "Actyx AG <developer@actyx.io>"
- ];
- features = {
- "futures" = [ "futures-core" ];
- "futures-core" = [ "dep:futures-core" ];
- };
- };
"synstructure" = rec {
crateName = "synstructure";
version = "0.13.1";
@@ -15330,9 +14321,9 @@ rec {
};
"tempfile" = rec {
crateName = "tempfile";
- version = "3.15.0";
+ version = "3.17.1";
edition = "2021";
- sha256 = "016pmkbwn3shas44gcwq1kc9lajalb90qafhiip5fvv8h6f5b2ls";
+ sha256 = "0c52ggq5vy5mzgk5ly36cgzs1cig3cv6r1jarijmzxgkn6na1r92";
authors = [
"Steven Allen <steven@stebalien.com>"
"The Rust Project Developers"
@@ -15350,7 +14341,7 @@ rec {
}
{
name = "getrandom";
- packageId = "getrandom";
+ packageId = "getrandom 0.3.1";
optional = true;
usesDefaultFeatures = false;
target = { target, features }: ((target."unix" or false) || (target."windows" or false) || ("wasi" == target."os"));
@@ -15613,7 +14604,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -15634,7 +14625,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
usesDefaultFeatures = false;
features = [ "derive" ];
}
@@ -15734,6 +14725,13 @@ rec {
packageId = "displaydoc";
usesDefaultFeatures = false;
}
+ {
+ name = "serde";
+ packageId = "serde 1.0.218";
+ optional = true;
+ usesDefaultFeatures = false;
+ features = [ "alloc" ];
+ }
{
name = "zerovec";
packageId = "zerovec";
@@ -15747,7 +14745,7 @@ rec {
"serde" = [ "dep:serde" ];
"zerovec" = [ "dep:zerovec" ];
};
- resolvedDefaultFeatures = [ "alloc" "default" "zerovec" ];
+ resolvedDefaultFeatures = [ "alloc" "default" "serde" "zerovec" ];
};
"tinyvec" = rec {
crateName = "tinyvec";
@@ -16109,16 +15107,16 @@ rec {
};
"toml" = rec {
crateName = "toml";
- version = "0.8.2";
+ version = "0.8.20";
edition = "2021";
- sha256 = "0g9ysjaqvm2mv8q85xpqfn7hi710hj24sd56k49wyddvvyq8lp8q";
+ sha256 = "0j012b37iz1mihksr6a928s6dzszxvblzg3l5wxp7azzsv6sb1yd";
authors = [
"Alex Crichton <alex@alexcrichton.com>"
];
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
{
name = "serde_spanned";
@@ -16132,39 +15130,40 @@ rec {
}
{
name = "toml_edit";
- packageId = "toml_edit 0.20.2";
+ packageId = "toml_edit 0.22.24";
optional = true;
+ usesDefaultFeatures = false;
features = [ "serde" ];
}
];
devDependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
];
features = {
"default" = [ "parse" "display" ];
- "display" = [ "dep:toml_edit" ];
+ "display" = [ "dep:toml_edit" "toml_edit?/display" ];
"indexmap" = [ "dep:indexmap" ];
- "parse" = [ "dep:toml_edit" ];
+ "parse" = [ "dep:toml_edit" "toml_edit?/parse" ];
"preserve_order" = [ "indexmap" ];
};
- resolvedDefaultFeatures = [ "parse" ];
+ resolvedDefaultFeatures = [ "default" "display" "parse" ];
};
"toml_datetime" = rec {
crateName = "toml_datetime";
- version = "0.6.3";
+ version = "0.6.8";
edition = "2021";
- sha256 = "0jsy7v8bdvmzsci6imj8fzgd255fmy5fzp6zsri14yrry7i77nkw";
+ sha256 = "0hgv7v9g35d7y9r2afic58jvlwnf73vgd1mz2k8gihlgrf73bmqd";
authors = [
"Alex Crichton <alex@alexcrichton.com>"
];
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
}
];
@@ -16194,7 +15193,7 @@ rec {
}
{
name = "winnow";
- packageId = "winnow";
+ packageId = "winnow 0.5.40";
}
];
features = {
@@ -16212,6 +15211,36 @@ rec {
"Andronik Ordian <write@reusable.software>"
"Ed Page <eopage@gmail.com>"
];
+ dependencies = [
+ {
+ name = "indexmap";
+ packageId = "indexmap";
+ features = [ "std" ];
+ }
+ {
+ name = "toml_datetime";
+ packageId = "toml_datetime";
+ }
+ {
+ name = "winnow";
+ packageId = "winnow 0.5.40";
+ }
+ ];
+ features = {
+ "perf" = [ "dep:kstring" ];
+ "serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ];
+ };
+ resolvedDefaultFeatures = [ "default" ];
+ };
+ "toml_edit 0.22.24" = rec {
+ crateName = "toml_edit";
+ version = "0.22.24";
+ edition = "2021";
+ sha256 = "0x0lgp70x5cl9nla03xqs5vwwwlrwmd0djkdrp3h3lpdymgpkd0p";
+ authors = [
+ "Andronik Ordian <write@reusable.software>"
+ "Ed Page <eopage@gmail.com>"
+ ];
dependencies = [
{
name = "indexmap";
@@ -16220,7 +15249,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
}
{
@@ -16235,209 +15264,17 @@ rec {
}
{
name = "winnow";
- packageId = "winnow";
+ packageId = "winnow 0.7.3";
+ optional = true;
}
];
features = {
+ "default" = [ "parse" "display" ];
+ "parse" = [ "dep:winnow" ];
"perf" = [ "dep:kstring" ];
"serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ];
};
- resolvedDefaultFeatures = [ "default" "serde" ];
- };
- "tower" = rec {
- crateName = "tower";
- version = "0.5.2";
- edition = "2018";
- sha256 = "1ybmd59nm4abl9bsvy6rx31m4zvzp5rja2slzpn712y9b68ssffh";
- authors = [
- "Tower Maintainers <team@tower-rs.com>"
- ];
- dependencies = [
- {
- name = "futures-core";
- packageId = "futures-core";
- optional = true;
- }
- {
- name = "futures-util";
- packageId = "futures-util";
- optional = true;
- usesDefaultFeatures = false;
- features = [ "alloc" ];
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- optional = true;
- }
- {
- name = "sync_wrapper";
- packageId = "sync_wrapper 1.0.2";
- optional = true;
- }
- {
- name = "tokio";
- packageId = "tokio";
- optional = true;
- features = [ "sync" ];
- }
- {
- name = "tower-layer";
- packageId = "tower-layer";
- }
- {
- name = "tower-service";
- packageId = "tower-service";
- }
- {
- name = "tracing";
- packageId = "tracing";
- optional = true;
- usesDefaultFeatures = false;
- features = [ "std" ];
- }
- ];
- devDependencies = [
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "macros" "sync" "test-util" "rt-multi-thread" ];
- }
- {
- name = "tracing";
- packageId = "tracing";
- usesDefaultFeatures = false;
- features = [ "std" ];
- }
- ];
- features = {
- "__common" = [ "futures-core" "pin-project-lite" ];
- "balance" = [ "discover" "load" "ready-cache" "make" "slab" "util" ];
- "buffer" = [ "__common" "tokio/sync" "tokio/rt" "tokio-util" "tracing" ];
- "discover" = [ "__common" ];
- "filter" = [ "__common" "futures-util" ];
- "full" = [ "balance" "buffer" "discover" "filter" "hedge" "limit" "load" "load-shed" "make" "ready-cache" "reconnect" "retry" "spawn-ready" "steer" "timeout" "util" ];
- "futures-core" = [ "dep:futures-core" ];
- "futures-util" = [ "dep:futures-util" ];
- "hdrhistogram" = [ "dep:hdrhistogram" ];
- "hedge" = [ "util" "filter" "futures-util" "hdrhistogram" "tokio/time" "tracing" ];
- "indexmap" = [ "dep:indexmap" ];
- "limit" = [ "__common" "tokio/time" "tokio/sync" "tokio-util" "tracing" ];
- "load" = [ "__common" "tokio/time" "tracing" ];
- "load-shed" = [ "__common" ];
- "log" = [ "tracing/log" ];
- "make" = [ "futures-util" "pin-project-lite" "tokio/io-std" ];
- "pin-project-lite" = [ "dep:pin-project-lite" ];
- "ready-cache" = [ "futures-core" "futures-util" "indexmap" "tokio/sync" "tracing" "pin-project-lite" ];
- "reconnect" = [ "make" "tokio/io-std" "tracing" ];
- "retry" = [ "__common" "tokio/time" "util" ];
- "slab" = [ "dep:slab" ];
- "spawn-ready" = [ "__common" "futures-util" "tokio/sync" "tokio/rt" "util" "tracing" ];
- "sync_wrapper" = [ "dep:sync_wrapper" ];
- "timeout" = [ "pin-project-lite" "tokio/time" ];
- "tokio" = [ "dep:tokio" ];
- "tokio-stream" = [ "dep:tokio-stream" ];
- "tokio-util" = [ "dep:tokio-util" ];
- "tracing" = [ "dep:tracing" ];
- "util" = [ "__common" "futures-util" "pin-project-lite" "sync_wrapper" ];
- };
- resolvedDefaultFeatures = [ "__common" "futures-core" "futures-util" "log" "make" "pin-project-lite" "sync_wrapper" "tokio" "tracing" "util" ];
- };
- "tower-http" = rec {
- crateName = "tower-http";
- version = "0.6.2";
- edition = "2018";
- sha256 = "15wnvhl6cpir9125s73bqjzjsvfb0fmndmsimnl2ddnlhfvs6gs0";
- libName = "tower_http";
- authors = [
- "Tower Maintainers <team@tower-rs.com>"
- ];
- dependencies = [
- {
- name = "bitflags";
- packageId = "bitflags 2.8.0";
- }
- {
- name = "bytes";
- packageId = "bytes";
- }
- {
- name = "http";
- packageId = "http 1.2.0";
- }
- {
- name = "pin-project-lite";
- packageId = "pin-project-lite";
- }
- {
- name = "tower-layer";
- packageId = "tower-layer";
- }
- {
- name = "tower-service";
- packageId = "tower-service";
- }
- ];
- devDependencies = [
- {
- name = "bytes";
- packageId = "bytes";
- }
- ];
- features = {
- "async-compression" = [ "dep:async-compression" ];
- "auth" = [ "base64" "validate-request" ];
- "base64" = [ "dep:base64" ];
- "catch-panic" = [ "tracing" "futures-util/std" "dep:http-body" "dep:http-body-util" ];
- "compression-br" = [ "async-compression/brotli" "futures-core" "dep:http-body" "tokio-util" "tokio" ];
- "compression-deflate" = [ "async-compression/zlib" "futures-core" "dep:http-body" "tokio-util" "tokio" ];
- "compression-full" = [ "compression-br" "compression-deflate" "compression-gzip" "compression-zstd" ];
- "compression-gzip" = [ "async-compression/gzip" "futures-core" "dep:http-body" "tokio-util" "tokio" ];
- "compression-zstd" = [ "async-compression/zstd" "futures-core" "dep:http-body" "tokio-util" "tokio" ];
- "decompression-br" = [ "async-compression/brotli" "futures-core" "dep:http-body" "dep:http-body-util" "tokio-util" "tokio" ];
- "decompression-deflate" = [ "async-compression/zlib" "futures-core" "dep:http-body" "dep:http-body-util" "tokio-util" "tokio" ];
- "decompression-full" = [ "decompression-br" "decompression-deflate" "decompression-gzip" "decompression-zstd" ];
- "decompression-gzip" = [ "async-compression/gzip" "futures-core" "dep:http-body" "dep:http-body-util" "tokio-util" "tokio" ];
- "decompression-zstd" = [ "async-compression/zstd" "futures-core" "dep:http-body" "dep:http-body-util" "tokio-util" "tokio" ];
- "follow-redirect" = [ "futures-util" "dep:http-body" "iri-string" "tower/util" ];
- "fs" = [ "futures-util" "dep:http-body" "dep:http-body-util" "tokio/fs" "tokio-util/io" "tokio/io-util" "dep:http-range-header" "mime_guess" "mime" "percent-encoding" "httpdate" "set-status" "futures-util/alloc" "tracing" ];
- "full" = [ "add-extension" "auth" "catch-panic" "compression-full" "cors" "decompression-full" "follow-redirect" "fs" "limit" "map-request-body" "map-response-body" "metrics" "normalize-path" "propagate-header" "redirect" "request-id" "sensitive-headers" "set-header" "set-status" "timeout" "trace" "util" "validate-request" ];
- "futures-core" = [ "dep:futures-core" ];
- "futures-util" = [ "dep:futures-util" ];
- "httpdate" = [ "dep:httpdate" ];
- "iri-string" = [ "dep:iri-string" ];
- "limit" = [ "dep:http-body" "dep:http-body-util" ];
- "metrics" = [ "dep:http-body" "tokio/time" ];
- "mime" = [ "dep:mime" ];
- "mime_guess" = [ "dep:mime_guess" ];
- "percent-encoding" = [ "dep:percent-encoding" ];
- "request-id" = [ "uuid" ];
- "timeout" = [ "dep:http-body" "tokio/time" ];
- "tokio" = [ "dep:tokio" ];
- "tokio-util" = [ "dep:tokio-util" ];
- "tower" = [ "dep:tower" ];
- "trace" = [ "dep:http-body" "tracing" ];
- "tracing" = [ "dep:tracing" ];
- "util" = [ "tower" ];
- "uuid" = [ "dep:uuid" ];
- "validate-request" = [ "mime" ];
- };
- resolvedDefaultFeatures = [ "cors" "default" ];
- };
- "tower-layer" = rec {
- crateName = "tower-layer";
- version = "0.3.3";
- edition = "2018";
- sha256 = "03kq92fdzxin51w8iqix06dcfgydyvx7yr6izjq0p626v9n2l70j";
- libName = "tower_layer";
- authors = [
- "Tower Maintainers <team@tower-rs.com>"
- ];
-
+ resolvedDefaultFeatures = [ "display" "parse" "serde" ];
};
"tower-service" = rec {
crateName = "tower-service";
@@ -16743,7 +15580,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
features = [ "derive" ];
}
{
@@ -17047,17 +15884,6 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
- "urlencoding" = rec {
- crateName = "urlencoding";
- version = "2.1.3";
- edition = "2021";
- sha256 = "1nj99jp37k47n0hvaz5fvz7z6jd0sb4ppvfy3nphr1zbnyixpy6s";
- authors = [
- "Kornel <kornel@geekhood.net>"
- "Bertram Truong <b@bertramtruong.com>"
- ];
-
- };
"utf-8" = rec {
crateName = "utf-8";
version = "0.7.6";
@@ -17146,12 +15972,12 @@ rec {
dependencies = [
{
name = "getrandom";
- packageId = "getrandom";
+ packageId = "getrandom 0.2.15";
optional = true;
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -17186,7 +16012,7 @@ rec {
dependencies = [
{
name = "getrandom";
- packageId = "getrandom";
+ packageId = "getrandom 0.2.15";
optional = true;
}
];
@@ -17278,129 +16104,6 @@ rec {
"Sergio Benitez <sb@sergio.bz>"
];
- };
- "visions" = rec {
- crateName = "visions";
- version = "0.1.0";
- edition = "2021";
- crateBin = [
- {
- name = "visions";
- path = "src/main.rs";
- requiredFeatures = [ ];
- }
- ];
- # We can't filter paths with references in Nix 2.4
- # See https://github.com/NixOS/nix/issues/5410
- src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
- then lib.cleanSourceWith { filter = sourceFilter; src = ./visions/server; }
- else ./visions/server;
- dependencies = [
- {
- name = "async-std";
- packageId = "async-std";
- }
- {
- name = "async-trait";
- packageId = "async-trait";
- }
- {
- name = "authdb";
- packageId = "authdb";
- }
- {
- name = "axum";
- packageId = "axum";
- features = [ "macros" ];
- }
- {
- name = "futures";
- packageId = "futures";
- }
- {
- name = "include_dir";
- packageId = "include_dir";
- }
- {
- name = "lazy_static";
- packageId = "lazy_static";
- }
- {
- name = "mime";
- packageId = "mime 0.3.17";
- }
- {
- name = "mime_guess";
- packageId = "mime_guess 2.0.5";
- }
- {
- name = "pretty_env_logger";
- packageId = "pretty_env_logger";
- }
- {
- name = "result-extended";
- packageId = "result-extended";
- }
- {
- name = "rusqlite";
- packageId = "rusqlite";
- }
- {
- name = "rusqlite_migration";
- packageId = "rusqlite_migration";
- features = [ "from-directory" ];
- }
- {
- name = "serde";
- packageId = "serde 1.0.217";
- }
- {
- name = "serde_json";
- packageId = "serde_json";
- }
- {
- name = "thiserror";
- packageId = "thiserror 2.0.11";
- }
- {
- name = "tokio";
- packageId = "tokio";
- features = [ "full" ];
- }
- {
- name = "tokio-stream";
- packageId = "tokio-stream";
- }
- {
- name = "tower-http";
- packageId = "tower-http";
- features = [ "cors" ];
- }
- {
- name = "typeshare";
- packageId = "typeshare";
- }
- {
- name = "urlencoding";
- packageId = "urlencoding";
- }
- {
- name = "uuid";
- packageId = "uuid 1.12.0";
- features = [ "v4" ];
- }
- ];
- devDependencies = [
- {
- name = "axum-test";
- packageId = "axum-test";
- }
- {
- name = "cool_asserts";
- packageId = "cool_asserts";
- }
- ];
-
};
"wait-timeout" = rec {
crateName = "wait-timeout";
@@ -17505,7 +16208,7 @@ rec {
}
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
}
{
name = "serde_json";
@@ -17598,6 +16301,29 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" ];
};
+ "wasi 0.13.3+wasi-0.2.2" = rec {
+ crateName = "wasi";
+ version = "0.13.3+wasi-0.2.2";
+ edition = "2021";
+ sha256 = "1lnapbvdcvi3kc749wzqvwrpd483win2kicn1faa4dja38p6v096";
+ authors = [
+ "The Cranelift Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "wit-bindgen-rt";
+ packageId = "wit-bindgen-rt";
+ features = [ "bitflags" ];
+ }
+ ];
+ features = {
+ "compiler_builtins" = [ "dep:compiler_builtins" ];
+ "core" = [ "dep:core" ];
+ "default" = [ "std" ];
+ "rustc-dep-of-std" = [ "compiler_builtins" "core" "rustc-std-workspace-alloc" ];
+ "rustc-std-workspace-alloc" = [ "dep:rustc-std-workspace-alloc" ];
+ };
+ };
"wasite" = rec {
crateName = "wasite";
version = "0.1.0";
@@ -19474,7 +18200,7 @@ rec {
];
};
- "winnow" = rec {
+ "winnow 0.5.40" = rec {
crateName = "winnow";
version = "0.5.40";
edition = "2021";
@@ -19496,6 +18222,28 @@ rec {
};
resolvedDefaultFeatures = [ "alloc" "default" "std" ];
};
+ "winnow 0.7.3" = rec {
+ crateName = "winnow";
+ version = "0.7.3";
+ edition = "2021";
+ sha256 = "1c9bmhpdwbdmll6b4l6skabz0296dchnmnxw84hh2y3ggyllwzqf";
+ dependencies = [
+ {
+ name = "memchr";
+ packageId = "memchr";
+ optional = true;
+ usesDefaultFeatures = false;
+ }
+ ];
+ features = {
+ "debug" = [ "std" "dep:anstream" "dep:anstyle" "dep:is-terminal" "dep:terminal_size" ];
+ "default" = [ "std" ];
+ "simd" = [ "dep:memchr" ];
+ "std" = [ "alloc" "memchr?/std" ];
+ "unstable-doc" = [ "alloc" "std" "simd" "unstable-recover" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "std" ];
+ };
"winreg" = rec {
crateName = "winreg";
version = "0.50.0";
@@ -19521,6 +18269,24 @@ rec {
"serialization-serde" = [ "transactions" "serde" ];
};
};
+ "wit-bindgen-rt" = rec {
+ crateName = "wit-bindgen-rt";
+ version = "0.33.0";
+ edition = "2021";
+ sha256 = "0g4lwfp9x6a2i1hgjn8k14nr4fsnpd5izxhc75zpi2s5cvcg6s1j";
+ libName = "wit_bindgen_rt";
+ dependencies = [
+ {
+ name = "bitflags";
+ packageId = "bitflags 2.8.0";
+ optional = true;
+ }
+ ];
+ features = {
+ "bitflags" = [ "dep:bitflags" ];
+ };
+ resolvedDefaultFeatures = [ "bitflags" ];
+ };
"write16" = rec {
crateName = "write16";
version = "1.0.0";
@@ -19544,23 +18310,17 @@ rec {
"either" = [ "dep:either" ];
};
};
- "yansi" = rec {
- crateName = "yansi";
- version = "1.0.1";
+ "xml-rs" = rec {
+ crateName = "xml-rs";
+ version = "0.8.25";
edition = "2021";
- sha256 = "0jdh55jyv0dpd38ij4qh60zglbw9aa8wafqai6m0wa7xaxk3mrfg";
+ crateBin = [];
+ sha256 = "1i73ajf6scni5bi1a51r19xykgrambdx5fkks0fyg5jqqbml1ff5";
+ libName = "xml";
authors = [
- "Sergio Benitez <sb@sergio.bz>"
+ "Vladimir Matveev <vmatveev@citrine.cc>"
];
- features = {
- "default" = [ "std" ];
- "detect-env" = [ "std" ];
- "detect-tty" = [ "is-terminal" "std" ];
- "hyperlink" = [ "std" ];
- "is-terminal" = [ "dep:is-terminal" ];
- "std" = [ "alloc" ];
- };
- resolvedDefaultFeatures = [ "alloc" "default" "std" ];
+
};
"yansi-term" = rec {
crateName = "yansi-term";
@@ -19598,7 +18358,7 @@ rec {
dependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
optional = true;
usesDefaultFeatures = false;
}
@@ -19623,7 +18383,7 @@ rec {
devDependencies = [
{
name = "serde";
- packageId = "serde 1.0.217";
+ packageId = "serde 1.0.218";
usesDefaultFeatures = false;
}
];
diff --git a/crate-hashes.json b/crate-hashes.json
index 47b533e..480f3ca 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -3,7 +3,6 @@
"registry+https://github.com/rust-lang/crates.io-index#adler2@2.0.0": "09r6drylvgy8vv8k20lnbvwq8gp09h7smfn6h1rxsy15pgh629si",
"registry+https://github.com/rust-lang/crates.io-index#adler32@1.2.0": "0d7jq7jsjyhsgbhnfq5fvrlh9j0i9g1fqrl2735ibv5f75yjgqda",
"registry+https://github.com/rust-lang/crates.io-index#adler@1.0.2": "1zim79cvzd5yrkzl3nyfx0avijwgk9fqv3yrscdy1cc79ih02qpj",
- "registry+https://github.com/rust-lang/crates.io-index#ahash@0.8.11": "04chdfkls5xmhp1d48gnjsmglbqibizs3bpbj6rsj604m10si7g8",
"registry+https://github.com/rust-lang/crates.io-index#aho-corasick@1.1.3": "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f",
"registry+https://github.com/rust-lang/crates.io-index#allocator-api2@0.2.21": "08zrzs022xwndihvzdn78yqarv2b9696y67i6h78nla3ww87jgb8",
"registry+https://github.com/rust-lang/crates.io-index#android-tzdata@0.1.1": "1w7ynjxrfs97xg3qlcdns4kgfpwcdv824g611fq32cag4cdr96g9",
@@ -15,7 +14,6 @@
"registry+https://github.com/rust-lang/crates.io-index#anstyle-wincon@3.0.7": "0kmf0fq4c8yribdpdpylzz1zccpy84hizmcsac3wrac1f7kk8dfa",
"registry+https://github.com/rust-lang/crates.io-index#anstyle@1.0.10": "1yai2vppmd7zlvlrp9grwll60knrmscalf8l2qpfz8b7y5lkpk2m",
"registry+https://github.com/rust-lang/crates.io-index#anyhow@1.0.95": "010vd1ki8w84dzgx6c81sc8qm9n02fxic1gkpv52zp4nwrn0kb1l",
- "registry+https://github.com/rust-lang/crates.io-index#assert-json-diff@2.0.2": "04mg3w0rh3schpla51l18362hsirl23q93aisws2irrj32wg5r27",
"registry+https://github.com/rust-lang/crates.io-index#async-channel@1.9.0": "0dbdlkzlncbibd3ij6y6jmvjd0cmdn48ydcfdpfhw09njd93r5c1",
"registry+https://github.com/rust-lang/crates.io-index#async-channel@2.3.1": "0skvwxj6ysfc6d7bhczz9a2550260g62bm5gl0nmjxxyn007id49",
"registry+https://github.com/rust-lang/crates.io-index#async-executor@1.13.1": "1v6w1dbvsmw6cs4dk4lxj5dvrikc6xi479wikwaab2qy3h09mjih",
@@ -27,13 +25,8 @@
"registry+https://github.com/rust-lang/crates.io-index#async-trait@0.1.85": "0mm0gwad44zs7mna4a0m1z4dhzpmydfj73w4wm23c8xpnhrli4rz",
"registry+https://github.com/rust-lang/crates.io-index#atoi@2.0.0": "0a05h42fggmy7h0ajjv6m7z72l924i7igbx13hk9d8pyign9k3gj",
"registry+https://github.com/rust-lang/crates.io-index#atomic-waker@1.1.2": "1h5av1lw56m0jf0fd3bchxq8a30xv0b4wv8s4zkp4s0i7mfvs18m",
- "registry+https://github.com/rust-lang/crates.io-index#auto-future@1.0.0": "0wykbakzh227vz6frx9p48zsq0wpswgmb7v3917m53m7gr2pw7iw",
"registry+https://github.com/rust-lang/crates.io-index#autocfg@0.1.8": "0y4vw4l4izdxq1v0rrhvmlbqvalrqrmk60v1z0dqlgnlbzkl7phd",
"registry+https://github.com/rust-lang/crates.io-index#autocfg@1.4.0": "09lz3by90d2hphbq56znag9v87gfpd9gb8nr82hll8z6x2nhprdc",
- "registry+https://github.com/rust-lang/crates.io-index#axum-core@0.4.5": "16b1496c4gm387q20hkv5ic3k5bd6xmnvk50kwsy6ymr8rhvvwh9",
- "registry+https://github.com/rust-lang/crates.io-index#axum-macros@0.4.2": "1klv77c889jm05bzayaaiinalarhvh2crc2w4nvp3l581xaj7lap",
- "registry+https://github.com/rust-lang/crates.io-index#axum-test@16.4.1": "1p5qxacvxsagnqq30nr2wznjyhgb8svsfb925ah3d2b0s91s9qv3",
- "registry+https://github.com/rust-lang/crates.io-index#axum@0.7.9": "07z7wqczi9i8xb4460rvn39p4wjqwr32hx907crd1vwb2fy8ijpd",
"registry+https://github.com/rust-lang/crates.io-index#az@1.2.1": "0ww9k1w3al7x5qmb7f13v3s9c2pg1pdxbs8xshqy6zyrchj4qzkv",
"registry+https://github.com/rust-lang/crates.io-index#backtrace@0.3.74": "06pfif7nwx66qf2zaanc2fcq7m64i91ki9imw9xd3bnz5hrwp0ld",
"registry+https://github.com/rust-lang/crates.io-index#base64@0.21.7": "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx",
@@ -53,7 +46,6 @@
"registry+https://github.com/rust-lang/crates.io-index#bytemuck@1.21.0": "18wj81x9xhqcd6985r8qxmbik6szjfjfj62q3xklw8h2p3x7srgg",
"registry+https://github.com/rust-lang/crates.io-index#byteorder@1.5.0": "0jzncxyf404mwqdbspihyzpkndfgda450l0893pz5xj685cg5l0z",
"registry+https://github.com/rust-lang/crates.io-index#bytes@1.9.0": "16ykzx24v1x4f42v2lxyvlczqhdfji3v7r4ghwckpwijzvb1hn9j",
- "registry+https://github.com/rust-lang/crates.io-index#bytesize@1.3.0": "1k3aak70iwz4s2gsjbxf0ws4xnixqbdz6p2ha96s06748fpniqx3",
"registry+https://github.com/rust-lang/crates.io-index#cairo-rs@0.18.5": "1qjfkcq3mrh3p01nnn71dy3kn99g21xx3j8xcdvzn8ll2pq6x8lc",
"registry+https://github.com/rust-lang/crates.io-index#cairo-sys-rs@0.18.2": "0lfsxl7ylw3phbnwmz3k58j1gnqi6kc2hdc7g3bb7f4hwnl9yp38",
"registry+https://github.com/rust-lang/crates.io-index#cc@1.2.10": "0aaj2ivamhfzhgb9maasnfkh03s2mzhzpzwrkghgzbkfnv5qy80k",
@@ -64,9 +56,9 @@
"registry+https://github.com/rust-lang/crates.io-index#chrono-tz@0.8.6": "0vlksnmpb6rd4h55245agnfhphnpslwnq9al3aw3is43dd3f16nm",
"registry+https://github.com/rust-lang/crates.io-index#chrono@0.4.39": "09g8nf409lb184kl9j4s85k0kn8wzgjkp5ls9zid50b886fwqdky",
"registry+https://github.com/rust-lang/crates.io-index#clang-sys@1.8.1": "1x1r9yqss76z8xwpdanw313ss6fniwc1r7dzb5ycjn0ph53kj0hb",
- "registry+https://github.com/rust-lang/crates.io-index#clap@4.5.26": "10v7qvn90calfbhap1c4r249i5c7fbxj09fn3szfz9pkis85xsx8",
- "registry+https://github.com/rust-lang/crates.io-index#clap_builder@4.5.26": "08f1mzcvi7zjhm7hvz6al4jnv70ccqhwiaq74hihlspwnl0iic4n",
- "registry+https://github.com/rust-lang/crates.io-index#clap_derive@4.5.24": "131ih3dm76srkbpfx7zfspp9b556zgzj31wqhl0ji2b39lcmbdsl",
+ "registry+https://github.com/rust-lang/crates.io-index#clap@4.5.30": "0vcyrn4ymq2gd56sl3xnfki8q8llg64sj3rj3qx33mgsf66v3dwj",
+ "registry+https://github.com/rust-lang/crates.io-index#clap_builder@4.5.30": "0369xis2ar46icsaxqyy37976mlb62alzyx4j53k99vq2w3v4pd3",
+ "registry+https://github.com/rust-lang/crates.io-index#clap_derive@4.5.28": "1vgigkhljp3r8r5lwdrn1ij93nafmjwh8cx77nppb9plqsaysk5z",
"registry+https://github.com/rust-lang/crates.io-index#clap_lex@0.7.4": "19nwfls5db269js5n822vkc8dw0wjq2h1wf0hgr06ld2g52d2spl",
"registry+https://github.com/rust-lang/crates.io-index#cloudabi@0.0.3": "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x",
"registry+https://github.com/rust-lang/crates.io-index#color_quant@1.1.0": "12q1n427h2bbmmm1mnglr57jaz2dj9apk0plcxw7nwqiai7qjyrx",
@@ -76,7 +68,6 @@
"registry+https://github.com/rust-lang/crates.io-index#convert_case@0.6.0": "1jn1pq6fp3rri88zyw6jlhwwgf6qiyc08d6gjv0qypgkl862n67c",
"registry+https://github.com/rust-lang/crates.io-index#cookie-factory@0.3.3": "18mka6fk3843qq3jw1fdfvzyv05kx7kcmirfbs2vg2kbw9qzm1cq",
"registry+https://github.com/rust-lang/crates.io-index#cookie@0.17.0": "096c52jg9iq4lfcps2psncswv33fc30mmnaa2sbzzcfcw71kgyvy",
- "registry+https://github.com/rust-lang/crates.io-index#cookie@0.18.1": "0iy749flficrlvgr3hjmf3igr738lk81n5akzf4ym4cs6cxg7pjd",
"registry+https://github.com/rust-lang/crates.io-index#cool_asserts@2.0.3": "1v18dg7ifx41k2f82j3gsnpm1fg9wk5s4zv7sf42c7pnad72b7zf",
"registry+https://github.com/rust-lang/crates.io-index#core-foundation-sys@0.8.7": "12w8j73lazxmr1z0h98hf3z623kl8ms7g07jch7n4p8f9nwlhdkp",
"registry+https://github.com/rust-lang/crates.io-index#core-foundation@0.9.4": "13zvbbj07yk3b61b8fhwfzhy35535a583irf23vlcg59j7h9bqci",
@@ -94,7 +85,6 @@
"registry+https://github.com/rust-lang/crates.io-index#deflate@0.8.6": "0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk",
"registry+https://github.com/rust-lang/crates.io-index#der@0.7.9": "1h4vzjfa1lczxdf8avfj9qlwh1qianqlxdy1g5rn762qnvkzhnzm",
"registry+https://github.com/rust-lang/crates.io-index#deranged@0.3.11": "1d1ibqqnr5qdrpw8rclwrf1myn3wf0dygl04idf4j2s49ah6yaxl",
- "registry+https://github.com/rust-lang/crates.io-index#diff@0.1.13": "1j0nzjxci2zqx63hdcihkp0a4dkdmzxd7my4m7zk6cjyfy34j9an",
"registry+https://github.com/rust-lang/crates.io-index#digest@0.10.7": "14p2n6ih29x81akj097lvz7wi9b6b9hvls0lwrv7b6xwyy0s5ncy",
"registry+https://github.com/rust-lang/crates.io-index#dimensioned@0.7.0": "09ky8s3higkf677lmyqg30hmj66gpg7hx907s6hfvbk2a9av05r5",
"registry+https://github.com/rust-lang/crates.io-index#dimensioned@0.8.0": "15s3j4ry943xqlac63bp81sgdk9s3yilysabzww35j9ibmnaic50",
@@ -110,8 +100,6 @@
"registry+https://github.com/rust-lang/crates.io-index#event-listener@2.5.3": "1q4w3pndc518crld6zsqvvpy9lkzwahp2zgza9kbzmmqh9gif1h2",
"registry+https://github.com/rust-lang/crates.io-index#event-listener@5.4.0": "1bii2gn3vaa33s0gr2zph7cagiq0ppcfxcxabs24ri9z9kgar4il",
"registry+https://github.com/rust-lang/crates.io-index#exr@1.73.0": "1q47yq78q9k210r6jy1wwrilxwwxqavik9l3l426rd17k7srfcgq",
- "registry+https://github.com/rust-lang/crates.io-index#fallible-iterator@0.3.0": "0ja6l56yka5vn4y4pk6hn88z0bpny7a8k1919aqjzp0j1yhy9k1a",
- "registry+https://github.com/rust-lang/crates.io-index#fallible-streaming-iterator@0.1.9": "0nj6j26p71bjy8h42x6jahx1hn0ng6mc2miwpgwnp8vnwqf4jq3k",
"registry+https://github.com/rust-lang/crates.io-index#fastrand@2.3.0": "1ghiahsw1jd68df895cy5h3gzwk30hndidn3b682zmshpgmrx41p",
"registry+https://github.com/rust-lang/crates.io-index#fdeflate@0.3.7": "130ga18vyxbb5idbgi07njymdaavvk6j08yh1dfarm294ssm6s0y",
"registry+https://github.com/rust-lang/crates.io-index#field-offset@0.3.6": "0zq5sssaa2ckmcmxxbly8qgz3sxpb8g1lwv90sdh1z74qif2gqiq",
@@ -146,6 +134,7 @@
"registry+https://github.com/rust-lang/crates.io-index#generic-array@0.11.2": "0a7w8w0rg47nmcinnfzv443lcyb8mplwc251p1jyr5xj2yh6wzv6",
"registry+https://github.com/rust-lang/crates.io-index#generic-array@0.14.7": "16lyyrzrljfq424c3n8kfwkqihlimmsg5nhshbbp48np3yjrqr45",
"registry+https://github.com/rust-lang/crates.io-index#getrandom@0.2.15": "1mzlnrb3dgyd1fb84gvw10pyr8wdqdl4ry4sr64i1s8an66pqmn4",
+ "registry+https://github.com/rust-lang/crates.io-index#getrandom@0.3.1": "1y154yzby383p63ndw6zpfm0fz3vf6c0zdwc7df6vkl150wrr923",
"registry+https://github.com/rust-lang/crates.io-index#gif@0.11.4": "01hbw3isapzpzff8l6aw55jnaqx2bcscrbwyf3rglkbbfp397p9y",
"registry+https://github.com/rust-lang/crates.io-index#gif@0.13.1": "1whrkvdg26gp1r7f95c6800y6ijqw5y0z8rgj6xihpi136dxdciz",
"registry+https://github.com/rust-lang/crates.io-index#gimli@0.31.1": "0gvqc0ramx8szv76jhfd4dms0zyamvlg4whhiz11j34hh3dqxqh7",
@@ -170,10 +159,8 @@
"registry+https://github.com/rust-lang/crates.io-index#gtk4@0.7.3": "0hh8nzglmz94v1m1h6vy8z12m6fr7ia467ry0md5fa4p7sm53sss",
"registry+https://github.com/rust-lang/crates.io-index#h2@0.3.26": "1s7msnfv7xprzs6xzfj5sg6p8bjcdpcqcmjjbkd345cyi1x55zl1",
"registry+https://github.com/rust-lang/crates.io-index#half@2.4.1": "123q4zzw1x4309961i69igzd1wb7pj04aaii3kwasrz3599qrl3d",
- "registry+https://github.com/rust-lang/crates.io-index#hashbrown@0.14.5": "1wa1vy1xs3mp11bn3z9dv0jricgr6a2j0zkf1g19yz3vw4il89z5",
"registry+https://github.com/rust-lang/crates.io-index#hashbrown@0.15.2": "12dj0yfn59p3kh3679ac0w1fagvzf4z2zp87a13gbbqbzw0185dz",
"registry+https://github.com/rust-lang/crates.io-index#hashlink@0.10.0": "1h8lzvnl9qxi3zyagivzz2p1hp6shgddfmccyf6jv7s1cdicz0kk",
- "registry+https://github.com/rust-lang/crates.io-index#hashlink@0.9.1": "1byq4nyrflm5s6wdx5qwp96l1qbp2d0nljvrr5yqrsfy51qzz93b",
"registry+https://github.com/rust-lang/crates.io-index#headers-core@0.2.0": "0ab469xfpd411mc3dhmjhmzrhqikzyj8a17jn5bkj9zfpy0n9xp7",
"registry+https://github.com/rust-lang/crates.io-index#headers@0.3.9": "0w62gnwh2p1lml0zqdkrx9dp438881nhz32zrzdy61qa0a9kns06",
"registry+https://github.com/rust-lang/crates.io-index#heck@0.4.1": "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m",
@@ -185,19 +172,15 @@
"registry+https://github.com/rust-lang/crates.io-index#hkdf@0.12.4": "1xxxzcarz151p1b858yn5skmhyrvn8fs4ivx5km3i1kjmnr8wpvv",
"registry+https://github.com/rust-lang/crates.io-index#hmac@0.12.1": "0pmbr069sfg76z7wsssfk5ddcqd9ncp79fyz6zcm6yn115yc6jbc",
"registry+https://github.com/rust-lang/crates.io-index#home@0.5.11": "1kxb4k87a9sayr8jipr7nq9wpgmjk4hk4047hmf9kc24692k75aq",
- "registry+https://github.com/rust-lang/crates.io-index#http-body-util@0.1.2": "0kslwazg4400qnc2azkrgqqci0fppv12waicnsy5d8hncvbjjd3r",
"registry+https://github.com/rust-lang/crates.io-index#http-body@0.4.6": "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw",
- "registry+https://github.com/rust-lang/crates.io-index#http-body@1.0.1": "111ir5k2b9ihz5nr9cz7cwm7fnydca7dx4hc7vr16scfzghxrzhy",
"registry+https://github.com/rust-lang/crates.io-index#http@0.2.12": "1w81s4bcbmcj9bjp7mllm8jlz6b31wzvirz8bgpzbqkpwmbvn730",
"registry+https://github.com/rust-lang/crates.io-index#http@1.2.0": "1skglzdf98j5nzxlii540n11is0w4l80mi5sm3xrj716asps4v7i",
"registry+https://github.com/rust-lang/crates.io-index#httparse@1.9.5": "0ip9v8m9lvgvq1lznl31wvn0ch1v254na7lhid9p29yx9rbx6wbx",
"registry+https://github.com/rust-lang/crates.io-index#httpdate@1.0.3": "1aa9rd2sac0zhjqh24c9xvir96g188zldkx0hr6dnnlx5904cfyz",
"registry+https://github.com/rust-lang/crates.io-index#humantime@2.1.0": "1r55pfkkf5v0ji1x6izrjwdq9v6sc7bv99xj6srywcar37xmnfls",
"registry+https://github.com/rust-lang/crates.io-index#hyper-tls@0.5.0": "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n",
- "registry+https://github.com/rust-lang/crates.io-index#hyper-util@0.1.10": "1d1iwrkysjhq63pg54zk3vfby1j7zmxzm9zzyfr4lwvp0szcybfz",
"registry+https://github.com/rust-lang/crates.io-index#hyper@0.10.16": "0wwjh9p3mzvg3fss2lqz5r7ddcgl1fh9w6my2j69d6k0lbcm41ha",
"registry+https://github.com/rust-lang/crates.io-index#hyper@0.14.32": "1rvcb0smz8q1i0y6p7rwxr02x5sclfg2hhxf3g0774zczn0cgps1",
- "registry+https://github.com/rust-lang/crates.io-index#hyper@1.5.2": "1q7akfb443yrjzkmnnbp2vs8zi15hgbk466rr4y144v4ppabhvr5",
"registry+https://github.com/rust-lang/crates.io-index#iana-time-zone-haiku@0.1.2": "17r6jmj31chn7xs9698r122mapq85mfnv98bb4pg6spm0si2f67k",
"registry+https://github.com/rust-lang/crates.io-index#iana-time-zone@0.1.61": "085jjsls330yj1fnwykfzmb2f10zp6l7w4fhq81ng81574ghhpi3",
"registry+https://github.com/rust-lang/crates.io-index#icu_collections@1.5.0": "09j5kskirl59mvqc8kabhy7005yyy7dp88jw9f6f3gkf419a8byv",
@@ -215,8 +198,6 @@
"registry+https://github.com/rust-lang/crates.io-index#idna_adapter@1.2.0": "0wggnkiivaj5lw0g0384ql2d7zk4ppkn3b1ry4n0ncjpr7qivjns",
"registry+https://github.com/rust-lang/crates.io-index#image@0.23.14": "18gn2f7xp30pf9aqka877knlq308khxqiwjvsccvzaa4f9zcpzr4",
"registry+https://github.com/rust-lang/crates.io-index#image@0.24.9": "17gnr6ifnpzvhjf6dwbl9hki8x6bji5mwcqp0048x1jm5yfi742n",
- "registry+https://github.com/rust-lang/crates.io-index#include_dir@0.7.4": "1pfh3g45z88kwq93skng0n6g3r7zkhq9ldqs9y8rvr7i11s12gcj",
- "registry+https://github.com/rust-lang/crates.io-index#include_dir_macros@0.7.4": "0x8smnf6knd86g69p19z5lpfsaqp8w0nx14kdpkz1m8bxnkqbavw",
"registry+https://github.com/rust-lang/crates.io-index#indent_write@2.2.0": "1hqjp80argdskrhd66g9sh542yxy8qi77j6rc69qd0l7l52rdzhc",
"registry+https://github.com/rust-lang/crates.io-index#indexmap@2.7.0": "07s7jmdymvd0rm4yswp0j3napx57hkjm9gs9n55lvs2g78vj5y32",
"registry+https://github.com/rust-lang/crates.io-index#intl-memoizer@0.5.2": "1nkvql7c7b76axv4g68di1p2m9bnxq1cbn6mlqcawf72zhhf08py",
@@ -251,7 +232,6 @@
"registry+https://github.com/rust-lang/crates.io-index#log@0.4.25": "17ydv5zhfv1zzygy458bmg3f3jx1vfziv9d74817w76yhfqgbjq4",
"registry+https://github.com/rust-lang/crates.io-index#logger@0.4.0": "14xlxvkspcfnspjil0xi63qj5cybxn1hjmr5gq8m4v1g9k5p54bc",
"registry+https://github.com/rust-lang/crates.io-index#matches@0.1.10": "1994402fq4viys7pjhzisj4wcw894l53g798kkm2y74laxk0jci5",
- "registry+https://github.com/rust-lang/crates.io-index#matchit@0.7.3": "156bgdmmlv4crib31qhgg49nsjk88dxkdqp80ha2pk2rk6n6ax0f",
"registry+https://github.com/rust-lang/crates.io-index#md-5@0.10.6": "1kvq5rnpm4fzwmyv5nmnxygdhhb2369888a06gdc9pxyrzh7x7nq",
"registry+https://github.com/rust-lang/crates.io-index#memchr@2.7.4": "18z32bhxrax0fnjikv475z7ii718hq457qwmaryixfxsl2qrmjkq",
"registry+https://github.com/rust-lang/crates.io-index#memoffset@0.9.1": "12i17wh9a9plx869g7j4whf62xw68k5zd4k0k5nh6ys5mszid028",
@@ -317,10 +297,9 @@
"registry+https://github.com/rust-lang/crates.io-index#polling@3.7.4": "0bs4nhwfwsvlzlhah2gbhj3aa9ynvchv2g350wapswh26a65c156",
"registry+https://github.com/rust-lang/crates.io-index#powerfmt@0.2.0": "14ckj2xdpkhv3h6l5sdmb9f1d57z8hbfpdldjc2vl5givq2y77j3",
"registry+https://github.com/rust-lang/crates.io-index#ppv-lite86@0.2.20": "017ax9ssdnpww7nrl1hvqh2lzncpv04nnsibmnw9nxjnaqlpp5bp",
- "registry+https://github.com/rust-lang/crates.io-index#pretty_assertions@1.4.1": "0v8iq35ca4rw3rza5is3wjxwsf88303ivys07anc5yviybi31q9s",
"registry+https://github.com/rust-lang/crates.io-index#pretty_env_logger@0.5.0": "076w9dnvcpx6d3mdbkqad8nwnsynb7c8haxmscyrz7g3vga28mw6",
"registry+https://github.com/rust-lang/crates.io-index#proc-macro-crate@1.3.1": "069r1k56bvgk0f58dm5swlssfcp79im230affwk6d9ck20g04k3z",
- "registry+https://github.com/rust-lang/crates.io-index#proc-macro-crate@2.0.2": "092x5acqnic14cw6vacqap5kgknq3jn4c6jij9zi6j85839jc3xh",
+ "registry+https://github.com/rust-lang/crates.io-index#proc-macro-crate@2.0.0": "1s23imns07vmacn2xjd5hv2h6rr94iqq3fd2frwa6i4h2nk6d0vy",
"registry+https://github.com/rust-lang/crates.io-index#proc-macro-error-attr@1.0.4": "0sgq6m5jfmasmwwy8x4mjygx5l7kp8s4j60bv25ckv2j1qc41gm1",
"registry+https://github.com/rust-lang/crates.io-index#proc-macro-error@1.0.4": "1373bhxaf0pagd8zkyd03kkx6bchzf6g0dkwrwzsnal9z47lj9fs",
"registry+https://github.com/rust-lang/crates.io-index#proc-macro2@1.0.93": "169dw9wch753if1mgyi2nfl1il77gslvh6y2q46qplprwml6m530",
@@ -353,11 +332,7 @@
"registry+https://github.com/rust-lang/crates.io-index#regex@1.11.1": "148i41mzbx8bmq32hsj1q4karkzzx5m60qza6gdw4pdc9qdyyi5m",
"registry+https://github.com/rust-lang/crates.io-index#remove_dir_all@0.5.3": "1rzqbsgkmr053bxxl04vmvsd1njyz0nxvly97aip6aa2cmb15k9s",
"registry+https://github.com/rust-lang/crates.io-index#reqwest@0.11.27": "0qjary4hpplpgdi62d2m0xvbn6lnzckwffm0rgkm2x51023m6ryx",
- "registry+https://github.com/rust-lang/crates.io-index#reserve-port@2.0.1": "10x21rdb1hjzp6n5flbbw3hfd7brmirckz1q0zsf3a7s5d516f4q",
"registry+https://github.com/rust-lang/crates.io-index#rsa@0.9.7": "06amqm85raq26v6zg00fbf93lbj3kx559n2lpxc3wrvbbiy5vis7",
- "registry+https://github.com/rust-lang/crates.io-index#rusqlite@0.32.1": "0vlx040bppl414pbjgbp7qr4jdxwszi9krx0m63zzf2f2whvflvp",
- "registry+https://github.com/rust-lang/crates.io-index#rusqlite_migration@1.3.1": "076dm65g0sngzrb93r07va4l5zl3gjx9gq5mlsh21p7p0bl44fwj",
- "registry+https://github.com/rust-lang/crates.io-index#rust-multipart-rfc7578_2@0.6.1": "0mwd3i2mk91n6diaxnkw28vyjbifhrm5ls73pcpfzz8a1i0lidq3",
"registry+https://github.com/rust-lang/crates.io-index#rustc-demangle@0.1.24": "07zysaafgrkzy2rjgwqdj2a8qdpsm6zv6f5pgpk9x0lm40z9b6vi",
"registry+https://github.com/rust-lang/crates.io-index#rustc-hash@1.1.0": "1qkc5khrmv5pqi5l5ca9p5nl5hs742cagrndhbrlk3dhlrx3zm08",
"registry+https://github.com/rust-lang/crates.io-index#rustc_version@0.4.1": "14lvdsmr5si5qbqzrajgb6vfn69k0sfygrvfvr2mps26xwi3mjyg",
@@ -377,10 +352,9 @@
"registry+https://github.com/rust-lang/crates.io-index#self_cell@1.1.0": "1gmxk5bvnnimcif7v1jk8ai2azfvh9djki545nd86vsnphjgrzf2",
"registry+https://github.com/rust-lang/crates.io-index#semver@1.0.24": "1fmvjjkd3f64y5fqr1nakkq371mnwzv09fbz5mbmdxril63ypdiw",
"registry+https://github.com/rust-lang/crates.io-index#serde@0.9.15": "1bsla8l5xr9pp5sirkal6mngxcq6q961km88jvf339j5ff8j7dil",
- "registry+https://github.com/rust-lang/crates.io-index#serde@1.0.217": "0w2ck1p1ajmrv1cf51qf7igjn2nc51r0izzc00fzmmhkvxjl5z02",
- "registry+https://github.com/rust-lang/crates.io-index#serde_derive@1.0.217": "180r3rj5gi5s1m23q66cr5wlfgc5jrs6n1mdmql2njnhk37zg6ss",
- "registry+https://github.com/rust-lang/crates.io-index#serde_json@1.0.136": "1lipcjhh1zazh283i4wsl4l14knh81q2rlkwmag8v8s2rwihqsik",
- "registry+https://github.com/rust-lang/crates.io-index#serde_path_to_error@0.1.16": "19hlz2359l37ifirskpcds7sxg0gzpqvfilibs7whdys0128i6dg",
+ "registry+https://github.com/rust-lang/crates.io-index#serde@1.0.218": "0q6z4bnrwagnms0bds4886711l6mc68s979i49zd3xnvkg8wkpz8",
+ "registry+https://github.com/rust-lang/crates.io-index#serde_derive@1.0.218": "0azqd74xbpb1v5vf6w1fdbgmwp39ljjfj25cib5rgrzlj7hh75gh",
+ "registry+https://github.com/rust-lang/crates.io-index#serde_json@1.0.139": "19kj3irpa22a7djz1jaf4wambzh7psiqa6zyafqnb76crhx6ry24",
"registry+https://github.com/rust-lang/crates.io-index#serde_spanned@0.6.8": "1q89g70azwi4ybilz5jb8prfpa575165lmrffd49vmcf76qpqq47",
"registry+https://github.com/rust-lang/crates.io-index#serde_urlencoded@0.7.1": "1zgklbdaysj3230xivihs30qi5vkhigg323a9m62k8jwf4a1qjfk",
"registry+https://github.com/rust-lang/crates.io-index#serde_yml@0.0.12": "1p8xwz4znd6fj962y22fdvvv16gb8c0hx4iv5hjplngiidcdvqjr",
@@ -412,14 +386,13 @@
"registry+https://github.com/rust-lang/crates.io-index#syn@1.0.109": "0ds2if4600bd59wsv7jjgfkayfzy3hnazs394kz6zdkmna8l3dkj",
"registry+https://github.com/rust-lang/crates.io-index#syn@2.0.96": "102wk3cgawimi3i0q3r3xw3i858zkyingg6y7gsxfy733amsvl6m",
"registry+https://github.com/rust-lang/crates.io-index#sync_wrapper@0.1.2": "0q01lyj0gr9a93n10nxsn8lwbzq97jqd6b768x17c8f7v7gccir0",
- "registry+https://github.com/rust-lang/crates.io-index#sync_wrapper@1.0.2": "0qvjyasd6w18mjg5xlaq5jgy84jsjfsvmnn12c13gypxbv75dwhb",
"registry+https://github.com/rust-lang/crates.io-index#synstructure@0.13.1": "0wc9f002ia2zqcbj0q2id5x6n7g1zjqba7qkg2mr0qvvmdk7dby8",
"registry+https://github.com/rust-lang/crates.io-index#system-configuration-sys@0.5.0": "1jckxvdr37bay3i9v52izgy52dg690x5xfg3hd394sv2xf4b2px7",
"registry+https://github.com/rust-lang/crates.io-index#system-configuration@0.5.1": "1rz0r30xn7fiyqay2dvzfy56cvaa3km74hnbz2d72p97bkf3lfms",
"registry+https://github.com/rust-lang/crates.io-index#system-deps@6.2.2": "0j93ryw031n3h8b0nfpj5xwh3ify636xmv8kxianvlyyipmkbrd3",
"registry+https://github.com/rust-lang/crates.io-index#target-lexicon@0.12.16": "1cg3bnx1gdkdr5hac1hzxy64fhw4g7dqkd0n3dxy5lfngpr1mi31",
"registry+https://github.com/rust-lang/crates.io-index#tempdir@0.3.7": "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm",
- "registry+https://github.com/rust-lang/crates.io-index#tempfile@3.15.0": "016pmkbwn3shas44gcwq1kc9lajalb90qafhiip5fvv8h6f5b2ls",
+ "registry+https://github.com/rust-lang/crates.io-index#tempfile@3.17.1": "0c52ggq5vy5mzgk5ly36cgzs1cig3cv6r1jarijmzxgkn6na1r92",
"registry+https://github.com/rust-lang/crates.io-index#termcolor@1.4.1": "0mappjh3fj3p2nmrg4y7qv94rchwi9mzmgmfflr8p2awdj7lyy86",
"registry+https://github.com/rust-lang/crates.io-index#thiserror-impl@1.0.69": "1h84fmn2nai41cxbhk6pqf46bxqq1b344v8yz089w1chzi76rvjg",
"registry+https://github.com/rust-lang/crates.io-index#thiserror-impl@2.0.11": "1hkkn7p2y4cxbffcrprybkj0qy1rl1r6waxmxqvr764axaxc3br6",
@@ -440,14 +413,12 @@
"registry+https://github.com/rust-lang/crates.io-index#tokio-tungstenite@0.21.0": "0f5wj0crsx74rlll97lhw0wk6y12nhdnqvmnjx002hjn08fmcfy8",
"registry+https://github.com/rust-lang/crates.io-index#tokio-util@0.7.13": "0y0h10a52c7hrldmr3410bp7j3fadq0jn9nf7awddgd2an6smz6p",
"registry+https://github.com/rust-lang/crates.io-index#tokio@1.43.0": "17pdm49ihlhfw3rpxix3kdh2ppl1yv7nwp1kxazi5r1xz97zlq9x",
- "registry+https://github.com/rust-lang/crates.io-index#toml@0.8.2": "0g9ysjaqvm2mv8q85xpqfn7hi710hj24sd56k49wyddvvyq8lp8q",
- "registry+https://github.com/rust-lang/crates.io-index#toml_datetime@0.6.3": "0jsy7v8bdvmzsci6imj8fzgd255fmy5fzp6zsri14yrry7i77nkw",
+ "registry+https://github.com/rust-lang/crates.io-index#toml@0.8.20": "0j012b37iz1mihksr6a928s6dzszxvblzg3l5wxp7azzsv6sb1yd",
+ "registry+https://github.com/rust-lang/crates.io-index#toml_datetime@0.6.8": "0hgv7v9g35d7y9r2afic58jvlwnf73vgd1mz2k8gihlgrf73bmqd",
"registry+https://github.com/rust-lang/crates.io-index#toml_edit@0.19.15": "08bl7rp5g6jwmfpad9s8jpw8wjrciadpnbaswgywpr9hv9qbfnqv",
"registry+https://github.com/rust-lang/crates.io-index#toml_edit@0.20.2": "0f7k5svmxw98fhi28jpcyv7ldr2s3c867pjbji65bdxjpd44svir",
- "registry+https://github.com/rust-lang/crates.io-index#tower-http@0.6.2": "15wnvhl6cpir9125s73bqjzjsvfb0fmndmsimnl2ddnlhfvs6gs0",
- "registry+https://github.com/rust-lang/crates.io-index#tower-layer@0.3.3": "03kq92fdzxin51w8iqix06dcfgydyvx7yr6izjq0p626v9n2l70j",
+ "registry+https://github.com/rust-lang/crates.io-index#toml_edit@0.22.24": "0x0lgp70x5cl9nla03xqs5vwwwlrwmd0djkdrp3h3lpdymgpkd0p",
"registry+https://github.com/rust-lang/crates.io-index#tower-service@0.3.3": "1hzfkvkci33ra94xjx64vv3pp0sq346w06fpkcdwjcid7zhvdycd",
- "registry+https://github.com/rust-lang/crates.io-index#tower@0.5.2": "1ybmd59nm4abl9bsvy6rx31m4zvzp5rja2slzpn712y9b68ssffh",
"registry+https://github.com/rust-lang/crates.io-index#tracing-attributes@0.1.28": "0v92l9cxs42rdm4m5hsa8z7ln1xsiw1zc2iil8c6k7lzq0jf2nir",
"registry+https://github.com/rust-lang/crates.io-index#tracing-core@0.1.33": "170gc7cxyjx824r9kr17zc9gvzx89ypqfdzq259pr56gg5bwjwp6",
"registry+https://github.com/rust-lang/crates.io-index#tracing@0.1.41": "1l5xrzyjfyayrwhvhldfnwdyligi1mpqm8mzbi2m1d6y6p2hlkkq",
@@ -474,7 +445,6 @@
"registry+https://github.com/rust-lang/crates.io-index#unsafe-any@0.4.2": "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk",
"registry+https://github.com/rust-lang/crates.io-index#url@1.7.2": "0nim1c90mxpi9wgdw2xh8dqd72vlklwlzam436akcrhjac6pqknx",
"registry+https://github.com/rust-lang/crates.io-index#url@2.5.4": "0q6sgznyy2n4l5lm16zahkisvc9nip9aa5q1pps7656xra3bdy1j",
- "registry+https://github.com/rust-lang/crates.io-index#urlencoding@2.1.3": "1nj99jp37k47n0hvaz5fvz7z6jd0sb4ppvfy3nphr1zbnyixpy6s",
"registry+https://github.com/rust-lang/crates.io-index#utf-8@0.7.6": "1a9ns3fvgird0snjkd3wbdhwd3zdpc2h5gpyybrfr6ra5pkqxk09",
"registry+https://github.com/rust-lang/crates.io-index#utf16_iter@1.0.5": "0ik2krdr73hfgsdzw0218fn35fa09dg2hvbi1xp3bmdfrp9js8y8",
"registry+https://github.com/rust-lang/crates.io-index#utf8_iter@1.0.4": "1gmna9flnj8dbyd8ba17zigrp9c4c3zclngf5lnb5yvz1ri41hdn",
@@ -492,6 +462,7 @@
"registry+https://github.com/rust-lang/crates.io-index#warp@0.3.7": "07137zd13lchy5hxpspd0hs6sl19b0fv2zc1chf02nwnzw1d4y23",
"registry+https://github.com/rust-lang/crates.io-index#wasi@0.10.0+wasi-snapshot-preview1": "07y3l8mzfzzz4cj09c8y90yak4hpsi9g7pllyzpr6xvwrabka50s",
"registry+https://github.com/rust-lang/crates.io-index#wasi@0.11.0+wasi-snapshot-preview1": "08z4hxwkpdpalxjps1ai9y7ihin26y9f476i53dv98v45gkqg3cw",
+ "registry+https://github.com/rust-lang/crates.io-index#wasi@0.13.3+wasi-0.2.2": "1lnapbvdcvi3kc749wzqvwrpd483win2kicn1faa4dja38p6v096",
"registry+https://github.com/rust-lang/crates.io-index#wasite@0.1.0": "0nw5h9nmcl4fyf4j5d4mfdjfgvwi1cakpi349wc4zrr59wxxinmq",
"registry+https://github.com/rust-lang/crates.io-index#wasm-bindgen-backend@0.2.100": "1ihbf1hq3y81c4md9lyh6lcwbx6a5j0fw4fygd423g62lm8hc2ig",
"registry+https://github.com/rust-lang/crates.io-index#wasm-bindgen-futures@0.4.50": "0q8ymi6i9r3vxly551dhxcyai7nc491mspj0j1wbafxwq074fpam",
@@ -528,11 +499,13 @@
"registry+https://github.com/rust-lang/crates.io-index#windows_x86_64_msvc@0.48.5": "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d",
"registry+https://github.com/rust-lang/crates.io-index#windows_x86_64_msvc@0.52.6": "1v7rb5cibyzx8vak29pdrk8nx9hycsjs4w0jgms08qk49jl6v7sq",
"registry+https://github.com/rust-lang/crates.io-index#winnow@0.5.40": "0xk8maai7gyxda673mmw3pj1hdizy5fpi7287vaywykkk19sk4zm",
+ "registry+https://github.com/rust-lang/crates.io-index#winnow@0.7.3": "1c9bmhpdwbdmll6b4l6skabz0296dchnmnxw84hh2y3ggyllwzqf",
"registry+https://github.com/rust-lang/crates.io-index#winreg@0.50.0": "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj",
+ "registry+https://github.com/rust-lang/crates.io-index#wit-bindgen-rt@0.33.0": "0g4lwfp9x6a2i1hgjn8k14nr4fsnpd5izxhc75zpi2s5cvcg6s1j",
"registry+https://github.com/rust-lang/crates.io-index#write16@1.0.0": "0dnryvrrbrnl7vvf5vb1zkmwldhjkf2n5znliviam7bm4900z2fi",
"registry+https://github.com/rust-lang/crates.io-index#writeable@0.5.5": "0lawr6y0bwqfyayf3z8zmqlhpnzhdx0ahs54isacbhyjwa7g778y",
+ "registry+https://github.com/rust-lang/crates.io-index#xml-rs@0.8.25": "1i73ajf6scni5bi1a51r19xykgrambdx5fkks0fyg5jqqbml1ff5",
"registry+https://github.com/rust-lang/crates.io-index#yansi-term@0.1.2": "1w8vjlvxba6yvidqdvxddx3crl6z66h39qxj8xi6aqayw2nk0p7y",
- "registry+https://github.com/rust-lang/crates.io-index#yansi@1.0.1": "0jdh55jyv0dpd38ij4qh60zglbw9aa8wafqai6m0wa7xaxk3mrfg",
"registry+https://github.com/rust-lang/crates.io-index#yoke-derive@0.7.5": "0m4i4a7gy826bfvnqa9wy6sp90qf0as3wps3wb0smjaamn68g013",
"registry+https://github.com/rust-lang/crates.io-index#yoke@0.7.5": "0h3znzrdmll0a7sglzf9ji0p5iqml11wrj1dypaf6ad6kbpnl3hj",
"registry+https://github.com/rust-lang/crates.io-index#zerocopy-derive@0.7.35": "0gnf2ap2y92nwdalzz3x7142f2b83sni66l39vxp2ijd6j080kzs",
diff --git a/flake.lock b/flake.lock
index 7fc0bd8..faf7ce0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
{
"nodes": {
+ "crane": {
+ "locked": {
+ "lastModified": 1739936662,
+ "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
+ "owner": "ipetkov",
+ "repo": "crane",
+ "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ipetkov",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -20,16 +35,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1704732714,
- "narHash": "sha256-ABqK/HggMYA/jMUXgYyqVAcQ8QjeMyr1jcXfTpSHmps=",
+ "lastModified": 1740339700,
+ "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6723fa4e4f1a30d42a633bef5eb01caeb281adc3",
+ "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-23.11",
+ "ref": "nixos-24.11",
"type": "indirect"
}
},
@@ -50,6 +65,7 @@
},
"root": {
"inputs": {
+ "crane": "crane",
"nixpkgs": "nixpkgs",
"typeshare": "typeshare",
"unstable": "unstable"
diff --git a/flake.nix b/flake.nix
index 90b1d89..970fa21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,13 @@
description = "Lumenescent Dreams Tools";
inputs = {
- nixpkgs.url = "nixpkgs/nixos-23.11";
+ nixpkgs.url = "nixpkgs/nixos-24.11";
unstable.url = "nixpkgs/nixos-unstable";
typeshare.url = "github:1Password/typeshare";
+ crane.url = "github:ipetkov/crane";
};
- outputs = { self, nixpkgs, unstable, typeshare, ... }:
+ outputs = { self, nixpkgs, unstable, typeshare, crane, ... }:
let
version = builtins.string 0 8 self.lastModifiedDate;
supportedSystems = [ "x86_64-linux" ];
@@ -56,6 +57,8 @@
packages."x86_64-linux" =
let
pkgs = import nixpkgs { system = "x86_64-linux"; };
+ craneLib = crane.mkLib pkgs;
+ src = craneLib.cleanCargoSource ./.;
gtkNativeInputs = [
pkgs.pkg-config
@@ -88,6 +91,11 @@
dashboard = cargo_nix.workspaceMembers.dashboard.build;
# file-service = cargo_nix.workspaceMembers.file-service.build;
fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build;
+ l10n-db = craneLib.buildPackage {
+ pname = "l10n-db";
+ cargoExtraArgs = "-p l10n-db";
+ src = ./.;
+ };
otg-gtk = cargo_nix.workspaceMembers.otg-gtk.build;
all = pkgs.symlinkJoin {
@@ -98,6 +106,7 @@
dashboard
# file-service
fitnesstrax
+ l10n-db
otg-gtk
];
};
diff --git a/l10n-db/src/bin/main.rs b/l10n-db/src/bin/l10n-db.rs
similarity index 100%
rename from l10n-db/src/bin/main.rs
rename to l10n-db/src/bin/l10n-db.rs
From 47e90cc6f946859f79de7d7e87e6043bae3dfc2e Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sun, 10 Nov 2024 19:04:38 -0500
Subject: [PATCH 17/34] Set up an app for the adafruit TFT
---
Cargo.lock | 1030 ++++++++++++++++++++++++--------
Cargo.toml | 10 +-
pico-st7789/.cargo/config.toml | 11 +
pico-st7789/Cargo.toml | 11 +
pico-st7789/src/main.rs | 225 +++++++
5 files changed, 1050 insertions(+), 237 deletions(-)
create mode 100644 pico-st7789/.cargo/config.toml
create mode 100644 pico-st7789/Cargo.toml
create mode 100644 pico-st7789/src/main.rs
diff --git a/Cargo.lock b/Cargo.lock
index b4bc05f..bb828ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -121,9 +121,15 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.95"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "async-channel"
@@ -223,7 +229,7 @@ dependencies = [
"futures-lite",
"gloo-timers",
"kv-log-macro",
- "log 0.4.25",
+ "log 0.4.26",
"memchr",
"once_cell",
"pin-project-lite",
@@ -240,13 +246,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.85"
+version = "0.1.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -309,12 +315,21 @@ dependencies = [
"addr2line",
"cfg-if",
"libc",
- "miniz_oxide 0.8.3",
+ "miniz_oxide 0.8.5",
"object",
"rustc-demangle",
"windows-targets 0.52.6",
]
+[[package]]
+name = "bare-metal"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
+dependencies = [
+ "rustc_version 0.2.3",
+]
+
[[package]]
name = "base64"
version = "0.9.3"
@@ -353,7 +368,7 @@ dependencies = [
"bitflags 2.8.0",
"cexpr",
"clang-sys",
- "itertools",
+ "itertools 0.12.1",
"lazy_static",
"lazycell",
"proc-macro2",
@@ -361,7 +376,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -385,6 +400,18 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+[[package]]
+name = "bitfield"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
+
+[[package]]
+name = "bitfield"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -424,15 +451,15 @@ dependencies = [
[[package]]
name = "build_html"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225eb82ce9e70dcc0cfa6e404d0f353326b6e163bf500ec4711cec317d11935c"
+checksum = "01b01f54cbdd56298a506b086691594ded3b68dcbc9437adc87c616a35e7fc89"
[[package]]
name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
[[package]]
name = "bytemuck"
@@ -448,9 +475,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
[[package]]
name = "cairo-rs"
@@ -460,7 +487,7 @@ checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
dependencies = [
"bitflags 2.8.0",
"cairo-sys-rs",
- "glib",
+ "glib 0.18.5",
"libc",
"once_cell",
"thiserror 1.0.69",
@@ -472,16 +499,16 @@ version = "0.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
dependencies = [
- "glib-sys",
+ "glib-sys 0.18.1",
"libc",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
name = "cc"
-version = "1.2.10"
+version = "1.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
dependencies = [
"shlex",
]
@@ -505,6 +532,16 @@ dependencies = [
"target-lexicon",
]
+[[package]]
+name = "cfg-expr"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -515,14 +552,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
name = "changeset"
version = "0.1.0"
dependencies = [
- "uuid 1.12.0",
+ "uuid 1.15.1",
]
[[package]]
name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -530,7 +567,7 @@ dependencies = [
"num-traits",
"serde 1.0.218",
"wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
]
[[package]]
@@ -569,9 +606,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.30"
+version = "4.5.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
dependencies = [
"clap_builder",
"clap_derive",
@@ -579,9 +616,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.30"
+version = "4.5.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
dependencies = [
"anstream",
"anstyle",
@@ -598,7 +635,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -725,10 +762,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
-name = "cpufeatures"
-version = "0.2.16"
+name = "cortex-m"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9"
+dependencies = [
+ "bare-metal",
+ "bitfield 0.13.2",
+ "embedded-hal 0.2.7",
+ "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.98",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
dependencies = [
"libc",
]
@@ -742,6 +811,15 @@ dependencies = [
"crc-catalog",
]
+[[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 = "crc-catalog"
version = "2.4.0"
@@ -757,6 +835,12 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
[[package]]
name = "crossbeam-deque"
version = "0.8.6"
@@ -793,9 +877,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
[[package]]
name = "crunchy"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
[[package]]
name = "crypto-common"
@@ -814,8 +898,8 @@ dependencies = [
"async-std",
"cairo-rs",
"cyberpunk",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"gtk4",
"serde 1.0.218",
"serde_yml",
@@ -826,8 +910,8 @@ name = "cyberpunk"
version = "0.1.0"
dependencies = [
"cairo-rs",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"gtk4",
]
@@ -838,8 +922,8 @@ dependencies = [
"async-std",
"cairo-rs",
"cyberpunk",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"gtk4",
]
@@ -855,8 +939,8 @@ dependencies = [
"futures",
"gdk4",
"geo-types",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"glib-build-tools 0.18.0",
"gtk4",
"lazy_static",
@@ -871,9 +955,15 @@ dependencies = [
[[package]]
name = "data-encoding"
-version = "2.7.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+
+[[package]]
+name = "debug-helper"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
[[package]]
name = "deflate"
@@ -949,7 +1039,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -960,13 +1050,63 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
[[package]]
name = "either"
-version = "1.13.0"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
dependencies = [
"serde 1.0.218",
]
+[[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 = "embedded-hal"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
+
+[[package]]
+name = "embedded-hal-async"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884"
+dependencies = [
+ "embedded-hal 1.0.0",
+]
+
+[[package]]
+name = "embedded-hal-nb"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fba4268c14288c828995299e59b12babdbe170f6c6d73731af1b4648142e8605"
+dependencies = [
+ "embedded-hal 1.0.0",
+ "nb 1.1.0",
+]
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
[[package]]
name = "emseries"
version = "0.6.0"
@@ -999,16 +1139,16 @@ checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
dependencies = [
"humantime",
"is-terminal",
- "log 0.4.25",
+ "log 0.4.26",
"regex",
"termcolor",
]
[[package]]
name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
@@ -1067,7 +1207,7 @@ dependencies = [
"bit_field",
"half",
"lebe",
- "miniz_oxide 0.8.3",
+ "miniz_oxide 0.8.5",
"rayon-core",
"smallvec",
"zune-inflate",
@@ -1095,7 +1235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
- "rustc_version",
+ "rustc_version 0.4.1",
]
[[package]]
@@ -1114,7 +1254,7 @@ dependencies = [
"hex-string",
"http 0.2.12",
"image 0.23.14",
- "log 0.4.25",
+ "log 0.4.26",
"logger",
"mime 0.3.17",
"mime_guess 2.0.5",
@@ -1141,8 +1281,8 @@ dependencies = [
"emseries",
"ft-core",
"gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"glib-build-tools 0.18.0",
"gtk4",
"libadwaita",
@@ -1152,9 +1292,9 @@ dependencies = [
[[package]]
name = "fixed"
-version = "1.28.0"
+version = "1.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a"
+checksum = "707070ccf8c4173548210893a0186e29c266901b71ed20cd9e2ca0193dfe95c3"
dependencies = [
"az",
"bytemuck",
@@ -1164,12 +1304,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.35"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
dependencies = [
"crc32fast",
- "miniz_oxide 0.8.3",
+ "miniz_oxide 0.8.5",
]
[[package]]
@@ -1273,6 +1413,45 @@ dependencies = [
"percent-encoding 2.3.1",
]
+[[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.98",
+]
+
+[[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.98",
+]
+
[[package]]
name = "ft-core"
version = "0.1.0"
@@ -1292,6 +1471,15 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+[[package]]
+name = "fugit"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17186ad64927d5ac8f02c1e77ccefa08ccd9eaa314d5a4772278aa204a22f7e7"
+dependencies = [
+ "gcd",
+]
+
[[package]]
name = "futures"
version = "0.3.31"
@@ -1372,7 +1560,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -1405,6 +1593,12 @@ dependencies = [
"slab",
]
+[[package]]
+name = "gcd"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a"
+
[[package]]
name = "gdk-pixbuf"
version = "0.18.5"
@@ -1412,8 +1606,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
dependencies = [
"gdk-pixbuf-sys",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"libc",
"once_cell",
]
@@ -1424,11 +1618,11 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"libc",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
@@ -1440,10 +1634,10 @@ dependencies = [
"cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"libc",
- "pango",
+ "pango 0.18.3",
]
[[package]]
@@ -1454,13 +1648,13 @@ checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"libc",
- "pango-sys",
+ "pango-sys 0.18.0",
"pkg-config",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
@@ -1545,8 +1739,8 @@ dependencies = [
"futures-core",
"futures-io",
"futures-util",
- "gio-sys",
- "glib",
+ "gio-sys 0.18.1",
+ "glib 0.18.5",
"libc",
"once_cell",
"pin-project-lite",
@@ -1554,19 +1748,49 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "gio"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f00c70f8029d84ea7572dd0e1aaa79e5329667b4c17f329d79ffb1e6277487"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys 0.20.9",
+ "glib 0.20.9",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
[[package]]
name = "gio-sys"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
dependencies = [
- "glib-sys",
- "gobject-sys",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"libc",
- "system-deps",
+ "system-deps 6.2.2",
"winapi",
]
+[[package]]
+name = "gio-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "160eb5250a26998c3e1b54e6a3d4ea15c6c7762a6062a19a7b63eff6e2b33f9e"
+dependencies = [
+ "glib-sys 0.20.9",
+ "gobject-sys 0.20.9",
+ "libc",
+ "system-deps 7.0.3",
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "glib"
version = "0.18.5"
@@ -1579,10 +1803,10 @@ dependencies = [
"futures-executor",
"futures-task",
"futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-macros 0.18.5",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"libc",
"memchr",
"once_cell",
@@ -1590,6 +1814,27 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "glib"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
+dependencies = [
+ "bitflags 2.8.0",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys 0.20.9",
+ "glib-macros 0.20.7",
+ "glib-sys 0.20.9",
+ "gobject-sys 0.20.9",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
[[package]]
name = "glib-build-tools"
version = "0.16.3"
@@ -1619,7 +1864,20 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
]
[[package]]
@@ -1629,7 +1887,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
dependencies = [
"libc",
- "system-deps",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8928869a44cfdd1fccb17d6746e4ff82c8f82e41ce705aa026a52ca8dc3aefb"
+dependencies = [
+ "libc",
+ "system-deps 7.0.3",
]
[[package]]
@@ -1658,8 +1926,8 @@ dependencies = [
"config-derive",
"futures",
"gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"glib-build-tools 0.16.3",
"gtk4",
"libadwaita",
@@ -1685,9 +1953,20 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
dependencies = [
- "glib-sys",
+ "glib-sys 0.18.1",
"libc",
- "system-deps",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c773a3cb38a419ad9c26c81d177d96b4b08980e8bdbbf32dace883e96e96e7e3"
+dependencies = [
+ "glib-sys 0.20.9",
+ "libc",
+ "system-deps 7.0.3",
]
[[package]]
@@ -1696,7 +1975,7 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401"
dependencies = [
- "glib",
+ "glib 0.18.5",
"graphene-sys",
"libc",
]
@@ -1707,10 +1986,10 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59"
dependencies = [
- "glib-sys",
+ "glib-sys 0.18.1",
"libc",
"pkg-config",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
@@ -1730,11 +2009,11 @@ checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e"
dependencies = [
"cairo-rs",
"gdk4",
- "glib",
+ "glib 0.18.5",
"graphene-rs",
"gsk4-sys",
"libc",
- "pango",
+ "pango 0.18.3",
]
[[package]]
@@ -1745,12 +2024,12 @@ checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
- "glib-sys",
- "gobject-sys",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"graphene-sys",
"libc",
- "pango-sys",
- "system-deps",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
]
[[package]]
@@ -1764,14 +2043,14 @@ dependencies = [
"futures-channel",
"gdk-pixbuf",
"gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"graphene-rs",
"gsk4",
"gtk4-macros",
"gtk4-sys",
"libc",
- "pango",
+ "pango 0.18.3",
]
[[package]]
@@ -1797,14 +2076,14 @@ dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"graphene-sys",
"gsk4-sys",
"libc",
- "pango-sys",
- "system-deps",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
]
[[package]]
@@ -1836,6 +2115,15 @@ dependencies = [
"crunchy",
]
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "hashbrown"
version = "0.15.2"
@@ -1880,6 +2168,16 @@ dependencies = [
"http 0.2.12",
]
+[[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 = "heck"
version = "0.4.1"
@@ -1916,8 +2214,8 @@ version = "0.1.0"
dependencies = [
"cairo-rs",
"coordinates",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"glib-build-tools 0.18.0",
"gtk4",
"image 0.24.9",
@@ -1991,9 +2289,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.5"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
[[package]]
name = "httpdate"
@@ -2090,8 +2388,8 @@ dependencies = [
name = "icon-test"
version = "0.1.0"
dependencies = [
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"gtk4",
"libadwaita",
]
@@ -2212,7 +2510,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -2292,9 +2590,9 @@ checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3"
[[package]]
name = "indexmap"
-version = "2.7.0"
+version = "2.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
dependencies = [
"equivalent",
"hashbrown",
@@ -2321,9 +2619,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.10.1"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
[[package]]
name = "iron"
@@ -2343,13 +2641,13 @@ dependencies = [
[[package]]
name = "is-terminal"
-version = "0.4.13"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
dependencies = [
"hermit-abi 0.4.0",
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -2358,6 +2656,15 @@ version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itertools"
version = "0.12.1"
@@ -2407,7 +2714,7 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
dependencies = [
- "log 0.4.25",
+ "log 0.4.26",
]
[[package]]
@@ -2460,12 +2767,12 @@ checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c"
dependencies = [
"gdk-pixbuf",
"gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"gtk4",
"libadwaita-sys",
"libc",
- "pango",
+ "pango 0.18.3",
]
[[package]]
@@ -2475,20 +2782,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a"
dependencies = [
"gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"gtk4-sys",
"libc",
- "pango-sys",
- "system-deps",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
]
[[package]]
name = "libc"
-version = "0.2.169"
+version = "0.2.170"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
[[package]]
name = "libloading"
@@ -2520,7 +2827,7 @@ dependencies = [
"libspa-sys",
"nix",
"nom",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
@@ -2531,7 +2838,7 @@ checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
dependencies = [
"bindgen",
"cc",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
@@ -2571,9 +2878,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]]
name = "litemap"
-version = "0.7.4"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
[[package]]
name = "lock_api"
@@ -2591,14 +2898,14 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
dependencies = [
- "log 0.4.25",
+ "log 0.4.26",
]
[[package]]
name = "log"
-version = "0.4.25"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
dependencies = [
"value-bag",
]
@@ -2720,9 +3027,9 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
dependencies = [
"adler2",
"simd-adler32",
@@ -2756,7 +3063,7 @@ dependencies = [
"futures-util",
"http 0.2.12",
"httparse",
- "log 0.4.25",
+ "log 0.4.26",
"memchr",
"mime 0.3.17",
"spin",
@@ -2775,12 +3082,12 @@ dependencies = [
[[package]]
name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
dependencies = [
"libc",
- "log 0.4.25",
+ "log 0.4.26",
"openssl",
"openssl-probe",
"openssl-sys",
@@ -2790,6 +3097,21 @@ dependencies = [
"tempfile",
]
+[[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 = "nix"
version = "0.27.1"
@@ -2899,6 +3221,26 @@ dependencies = [
"libc",
]
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[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 = "object"
version = "0.36.7"
@@ -2910,15 +3252,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.20.2"
+version = "1.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
[[package]]
name = "openssl"
-version = "0.10.68"
+version = "0.10.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
"bitflags 2.8.0",
"cfg-if",
@@ -2937,20 +3279,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
dependencies = [
"cc",
"libc",
@@ -2983,14 +3325,14 @@ dependencies = [
"async-channel 2.3.1",
"async-std",
"cairo-rs",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"glib-build-tools 0.17.10",
"gtk4",
"image 0.24.9",
"libadwaita",
"otg-core",
- "pango",
+ "pango 0.20.9",
"sgf",
"tokio",
"uuid 0.8.2",
@@ -3002,11 +3344,23 @@ version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
dependencies = [
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"libc",
"once_cell",
- "pango-sys",
+ "pango-sys 0.18.0",
+]
+
+[[package]]
+name = "pango"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1f5dc1b8cf9bc08bfc0843a04ee0fa2e78f1e1fa4b126844a383af4f25f0ec"
+dependencies = [
+ "gio 0.20.9",
+ "glib 0.20.9",
+ "libc",
+ "pango-sys 0.20.9",
]
[[package]]
@@ -3015,12 +3369,30 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
dependencies = [
- "glib-sys",
- "gobject-sys",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
"libc",
- "system-deps",
+ "system-deps 6.2.2",
]
+[[package]]
+name = "pango-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dbb9b751673bd8fe49eb78620547973a1e719ed431372122b20abd12445bab5"
+dependencies = [
+ "glib-sys 0.20.9",
+ "gobject-sys 0.20.9",
+ "libc",
+ "system-deps 7.0.3",
+]
+
+[[package]]
+name = "panic-halt"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a513e167849a384b7f9b746e517604398518590a9142f4846a32e3c2a4de7b11"
+
[[package]]
name = "parking"
version = "2.2.1"
@@ -3059,6 +3431,12 @@ dependencies = [
"regex",
]
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
[[package]]
name = "pem-rfc7468"
version = "0.7.0"
@@ -3157,24 +3535,35 @@ dependencies = [
"siphasher 1.0.1",
]
+[[package]]
+name = "pico-st7789"
+version = "0.1.0"
+dependencies = [
+ "cortex-m-rt",
+ "embedded-hal 1.0.0",
+ "fugit",
+ "panic-halt",
+ "rp-pico",
+]
+
[[package]]
name = "pin-project"
-version = "1.1.8"
+version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
+checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.8"
+version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
+checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -3189,6 +3578,17 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pio"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e09694b50f89f302ed531c1f2a7569f0be5867aee4ab4f8f729bbeec0078e3"
+dependencies = [
+ "arrayvec",
+ "num_enum",
+ "paste",
+]
+
[[package]]
name = "piper"
version = "0.2.4"
@@ -3225,7 +3625,7 @@ checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
dependencies = [
"bindgen",
"libspa-sys",
- "system-deps",
+ "system-deps 6.2.2",
]
[[package]]
@@ -3286,7 +3686,7 @@ dependencies = [
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.8.3",
+ "miniz_oxide 0.8.5",
]
[[package]]
@@ -3304,6 +3704,12 @@ dependencies = [
"windows-sys 0.59.0",
]
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
[[package]]
name = "powerfmt"
version = "0.2.0"
@@ -3326,7 +3732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
dependencies = [
"env_logger",
- "log 0.4.25",
+ "log 0.4.26",
]
[[package]]
@@ -3345,7 +3751,16 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
dependencies = [
- "toml_edit 0.20.2",
+ "toml_edit 0.20.7",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit 0.22.24",
]
[[package]]
@@ -3624,9 +4039,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
dependencies = [
"bitflags 2.8.0",
]
@@ -3687,7 +4102,7 @@ dependencies = [
"hyper-tls",
"ipnet",
"js-sys",
- "log 0.4.25",
+ "log 0.4.26",
"mime 0.3.17",
"native-tls",
"once_cell",
@@ -3716,6 +4131,81 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "rp-pico"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9342d3ac7011ac688300979e9b52a81f0add1d05feb02868cf94bfee0705b28"
+dependencies = [
+ "cortex-m-rt",
+ "fugit",
+ "rp2040-boot2",
+ "rp2040-hal",
+ "usb-device",
+]
+
+[[package]]
+name = "rp2040-boot2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c92f344f63f950ee36cf4080050e4dce850839b9175da38f9d2ffb69b4dbb21"
+dependencies = [
+ "crc-any",
+]
+
+[[package]]
+name = "rp2040-hal"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d11e711940087f2cdff8aeae9f4b902e2014c06a00b39a1092686b81ec973d6f"
+dependencies = [
+ "bitfield 0.14.0",
+ "cortex-m",
+ "critical-section",
+ "embedded-dma",
+ "embedded-hal 0.2.7",
+ "embedded-hal 1.0.0",
+ "embedded-hal-async",
+ "embedded-hal-nb",
+ "embedded-io",
+ "frunk",
+ "fugit",
+ "itertools 0.10.5",
+ "nb 1.1.0",
+ "paste",
+ "pio",
+ "rand_core 0.6.4",
+ "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.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83cbcd3f7a0ca7bbe61dc4eb7e202842bee4e27b769a7bf3a4a72fa399d6e404"
+dependencies = [
+ "cortex-m",
+ "cortex-m-rt",
+ "critical-section",
+ "vcell",
+]
+
[[package]]
name = "rsa"
version = "0.9.7"
@@ -3748,20 +4238,29 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
[[package]]
name = "rustc_version"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
- "semver",
+ "semver 1.0.25",
]
[[package]]
name = "rustix"
-version = "0.38.43"
+version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
"bitflags 2.8.0",
"errno",
@@ -3799,9 +4298,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
[[package]]
name = "safemem"
@@ -3841,7 +4340,7 @@ name = "screenplay"
version = "0.1.0"
dependencies = [
"async-std",
- "glib",
+ "glib 0.18.5",
"gtk4",
]
@@ -3885,9 +4384,24 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
[[package]]
name = "semver"
-version = "1.0.24"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
@@ -3912,7 +4426,7 @@ checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4041,12 +4555,12 @@ dependencies = [
"async-std",
"cairo-rs",
"fixed",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
"gtk4",
"libadwaita",
"lights-core",
- "pango",
+ "pango 0.20.9",
]
[[package]]
@@ -4072,9 +4586,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
dependencies = [
"serde 1.0.218",
]
@@ -4145,7 +4659,7 @@ dependencies = [
"hashbrown",
"hashlink",
"indexmap",
- "log 0.4.25",
+ "log 0.4.26",
"memchr",
"once_cell",
"percent-encoding 2.3.1",
@@ -4170,7 +4684,7 @@ dependencies = [
"quote",
"sqlx-core",
"sqlx-macros-core",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4193,7 +4707,7 @@ dependencies = [
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
- "syn 2.0.96",
+ "syn 2.0.98",
"tempfile",
"tokio",
"url 2.5.4",
@@ -4223,7 +4737,7 @@ dependencies = [
"hkdf",
"hmac",
"itoa",
- "log 0.4.25",
+ "log 0.4.26",
"md-5",
"memchr",
"once_cell",
@@ -4262,7 +4776,7 @@ dependencies = [
"hmac",
"home",
"itoa",
- "log 0.4.25",
+ "log 0.4.26",
"md-5",
"memchr",
"once_cell",
@@ -4292,7 +4806,7 @@ dependencies = [
"futures-intrusive",
"futures-util",
"libsqlite3-sys",
- "log 0.4.25",
+ "log 0.4.26",
"percent-encoding 2.3.1",
"serde 1.0.218",
"serde_urlencoded",
@@ -4343,9 +4857,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.96"
+version = "2.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
dependencies = [
"proc-macro2",
"quote",
@@ -4366,7 +4880,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4396,7 +4910,20 @@ version = "6.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
dependencies = [
- "cfg-expr",
+ "cfg-expr 0.15.8",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
+dependencies = [
+ "cfg-expr 0.17.2",
"heck 0.5.0",
"pkg-config",
"toml",
@@ -4468,7 +4995,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4479,7 +5006,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4606,7 +5133,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4637,7 +5164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
dependencies = [
"futures-util",
- "log 0.4.25",
+ "log 0.4.26",
"tokio",
"tungstenite",
]
@@ -4689,9 +5216,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.20.2"
+version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
dependencies = [
"indexmap",
"toml_datetime",
@@ -4723,7 +5250,7 @@ version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
dependencies = [
- "log 0.4.25",
+ "log 0.4.26",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
@@ -4737,7 +5264,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4751,9 +5278,9 @@ dependencies = [
[[package]]
name = "traitobject"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+checksum = "04a79e25382e2e852e8da874249358d382ebaf259d0d34e75d8db16a7efabbc7"
[[package]]
name = "tree"
@@ -4776,7 +5303,7 @@ dependencies = [
"data-encoding",
"http 1.2.0",
"httparse",
- "log 0.4.25",
+ "log 0.4.26",
"rand 0.8.5",
"sha1",
"thiserror 1.0.69",
@@ -4810,9 +5337,9 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
[[package]]
name = "typeshare"
@@ -4833,7 +5360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a615d6c2764852a2e88a4f16e9ce1ea49bb776b5872956309e170d63a042a34f"
dependencies = [
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
@@ -4883,9 +5410,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
[[package]]
name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
[[package]]
name = "unicode-normalization"
@@ -4945,6 +5472,16 @@ dependencies = [
"percent-encoding 2.3.1",
]
+[[package]]
+name = "usb-device"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98816b1accafbb09085168b90f27e93d790b4bfa19d883466b5e53315b5f06a6"
+dependencies = [
+ "heapless",
+ "portable-atomic",
+]
+
[[package]]
name = "utf-8"
version = "0.7.6"
@@ -4991,11 +5528,11 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.12.0"
+version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.1",
]
[[package]]
@@ -5004,6 +5541,12 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
+[[package]]
+name = "vcell"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
+
[[package]]
name = "vcpkg"
version = "0.2.15"
@@ -5029,10 +5572,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
-name = "wait-timeout"
-version = "0.2.0"
+name = "void"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+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 = "wait-timeout"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
dependencies = [
"libc",
]
@@ -5058,7 +5616,7 @@ dependencies = [
"headers",
"http 0.2.12",
"hyper 0.14.32",
- "log 0.4.25",
+ "log 0.4.26",
"mime 0.3.17",
"mime_guess 2.0.5",
"multer",
@@ -5121,10 +5679,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
dependencies = [
"bumpalo",
- "log 0.4.25",
+ "log 0.4.26",
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
"wasm-bindgen-shared",
]
@@ -5159,7 +5717,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5239,6 +5797,12 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-link"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
[[package]]
name = "windows-sys"
version = "0.48.0"
@@ -5471,7 +6035,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
"synstructure",
]
@@ -5493,27 +6057,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
"synstructure",
]
@@ -5542,7 +6106,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.96",
+ "syn 2.0.98",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d982233..cb38613 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,28 +9,30 @@ members = [
"config",
"config-derive",
"coordinates",
- "cyberpunk",
"cyber-slides",
+ "cyberpunk",
"cyberpunk-splash",
"dashboard",
"emseries",
"file-service",
- "fitnesstrax/core",
"fitnesstrax/app",
+ "fitnesstrax/core",
"fluent-ergonomics",
"geo-types",
"gm-control-panel",
+ "gm-dash/server",
"hex-grid",
"icon-test",
+ "l10n-db",
"memorycache",
"nom-training",
"otg/core",
"otg/gtk",
+ "pico-st7789",
"result-extended",
"screenplay",
"sgf",
"timezone-testing",
"tree",
"visions/server",
- "gm-dash/server"
-, "l10n-db"]
+]
diff --git a/pico-st7789/.cargo/config.toml b/pico-st7789/.cargo/config.toml
new file mode 100644
index 0000000..9585789
--- /dev/null
+++ b/pico-st7789/.cargo/config.toml
@@ -0,0 +1,11 @@
+[build]
+target = "thumbv6m-none-eabi"
+
+[target.thumbv6m-none-eabi]
+rustflags = [
+ "-C", "link-arg=--nmagic",
+ "-C", "link-arg=-Tlink.x",
+ "-C", "no-vectorize-loops",
+]
+
+runner = "elf2uf2-rs -d"
diff --git a/pico-st7789/Cargo.toml b/pico-st7789/Cargo.toml
new file mode 100644
index 0000000..6d8012e
--- /dev/null
+++ b/pico-st7789/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "pico-st7789"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+cortex-m-rt = "0.7.3"
+embedded-hal = "1.0.0"
+fugit = "0.3.7"
+panic-halt = "1.0.0"
+rp-pico = "0.9.0"
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
new file mode 100644
index 0000000..85068f2
--- /dev/null
+++ b/pico-st7789/src/main.rs
@@ -0,0 +1,225 @@
+#![no_main]
+#![no_std]
+
+use embedded_hal::{delay::DelayNs, digital::OutputPin, spi::SpiBus};
+use fugit::RateExtU32;
+use panic_halt as _;
+use rp_pico::{
+ entry,
+ hal::{
+ clocks::init_clocks_and_plls,
+ gpio::{FunctionSio, Pin, PinId, PullDown, SioOutput},
+ spi::{Enabled, Spi, SpiDevice, ValidSpiPinout},
+ Clock, Sio, Timer, Watchdog,
+ },
+ pac, Pins,
+};
+
+const XOSC_CRYSTAL_FREQ: u32 = 12_000_000; // MHz, https://forums.raspberrypi.com/viewtopic.php?t=356764
+
+struct Step {
+ param_cnt: usize,
+ command: u8,
+ params: [u8; 4],
+ delay: Option<u32>,
+}
+
+impl Step {
+ fn send_command<D, Pinout, P>(
+ &self,
+ spi: &mut Spi<Enabled, D, Pinout, 8>,
+ data_command: &mut Pin<P, FunctionSio<SioOutput>, PullDown>,
+ ) where
+ D: SpiDevice,
+ Pinout: ValidSpiPinout<D>,
+ P: PinId,
+ {
+ let _ = data_command.set_low();
+ let _ = spi.write(&[self.command]);
+ let _ = data_command.set_high();
+ let _ = spi.write(&self.params[0..self.param_cnt]);
+ }
+}
+
+const NOP: u8 = 0x00;
+
+const SWRESET: Step = Step {
+ param_cnt: 0,
+ command: 0x01,
+ params: [0, 0, 0, 0],
+ delay: Some(150),
+};
+const SLPOUT: Step = Step {
+ param_cnt: 0,
+ command: 0x11,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const COLMOD: u8 = 0x3a;
+const MADCTL: Step = Step {
+ param_cnt: 0,
+ command: 0x36,
+ params: [0, 0, 0, 0],
+ delay: None,
+};
+const CASET: u8 = 0x2a;
+const RASET: u8 = 0x2b;
+const INVON: Step = Step {
+ param_cnt: 0,
+ command: 0x21,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const NORON: Step = Step {
+ param_cnt: 0,
+ command: 0x13,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const DISPON: Step = Step {
+ param_cnt: 0,
+ command: 0x29,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const RAMWR: u8 = 0x2c;
+
+// Adafruit setup instructions
+// SWRESET (0x01), 150ms delay
+// SLPOUT (0x11), 10ms delay
+// COLMOD (0x3a) 0x55 (65K RGB, 16bit/pixel), 10ms delay
+// MADCTL (0x36) 0x00,
+// memory data access control, RGB
+// CASET 0x00, 0, 0, 170,
+// column address set, 4 parameters
+// 0x00, 0x00 indicates xstart is 0
+// 0x00, 170 indicates xend is 170
+// RASET 0x00, 0, 320 >> 8, 320 & 0xFF,
+// row address set, 4 parameters
+// 0x00, 0x00 indicates ystart is 0
+// 3230 >> 8, 320 & 0xff indicates that 320 is the last y address
+// INVON, 10ms delay
+// invert the display
+// NORON, 10ms delay
+// normal display mode
+// DISPON, 10ms delay
+// turn the display on
+
+const SETUP_PROGRAM: [Step; 9] = [
+ SWRESET,
+ SLPOUT,
+ Step {
+ param_cnt: 1,
+ command: COLMOD,
+ params: [0x55, 0, 0, 0],
+ delay: Some(10),
+ },
+ MADCTL,
+ Step {
+ param_cnt: 4,
+ command: CASET,
+ params: [0, 0, 0, 170],
+ delay: None,
+ },
+ Step {
+ param_cnt: 4,
+ command: RASET,
+ params: [0, 0, (340 as u16 >> 8) as u8, (320 as u16 & 0xff) as u8],
+ delay: None,
+ },
+ INVON,
+ NORON,
+ DISPON,
+];
+
+#[entry]
+unsafe fn main() -> ! {
+ // rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
+ let mut peripherals = pac::Peripherals::take().unwrap();
+
+ // SIO inidcates "Single Cycle IO". I don't know what this means, but it could mean that this
+ // is a class of IO operations that can be run in a single clock cycle, such as switching a
+ // GPIO pin on or off.
+ let sio = Sio::new(peripherals.SIO);
+
+ // Many of the following systems require a watchdog. I do not know what this does, either, but
+ // it may be some failsafe software that will reset operations if the watchdog detects a lack
+ // of activity.
+ let mut watchdog = Watchdog::new(peripherals.WATCHDOG);
+
+ // Here we grab the GPIO pins in bank 0.
+ let pins = Pins::new(
+ peripherals.IO_BANK0,
+ peripherals.PADS_BANK0,
+ sio.gpio_bank0,
+ &mut peripherals.RESETS,
+ );
+
+ // Initialize an abstraction of the clock system with a batch of standard hardware clocks.
+ let clocks = init_clocks_and_plls(
+ XOSC_CRYSTAL_FREQ,
+ peripherals.XOSC,
+ peripherals.CLOCKS,
+ peripherals.PLL_SYS,
+ peripherals.PLL_USB,
+ &mut peripherals.RESETS,
+ &mut watchdog,
+ )
+ .ok()
+ .unwrap();
+
+ // An abstraction for a timer which we can use to delay the code.
+ let mut timer = Timer::new(peripherals.TIMER, &mut peripherals.RESETS, &clocks);
+
+ // Grab the clock and data pins for SPI1. For Clock pins and for Data pins, there are only two
+ // pins each on the Pico which can function for SPI1.
+ let spi_clk = pins.gpio2.into_function();
+ let spi_sdo = pins.gpio3.into_function();
+ // let spi_sdi = pins.gpio4.into_function();
+ // Chip select 1 means the chip is not enabled
+ let mut board_select = pins.gpio13.into_function();
+ let mut data_command = pins.gpio14.into_function();
+ let mut reset = pins.gpio15.into_function();
+
+ let _ = reset.set_low();
+ let _ = board_select.set_high();
+ let _ = data_command.set_high();
+
+ // Now, create the SPI function abstraction for SPI1 with spi_clk and spi_sdo.
+ let mut spi = Spi::<_, _, _, 8>::new(peripherals.SPI0, (spi_sdo, spi_clk)).init(
+ &mut peripherals.RESETS,
+ // The SPI system uses the peripheral clock
+ clocks.peripheral_clock.freq(),
+ // Transmit data at a rate of 1Mbit.
+ 1_u32.MHz(),
+ // Run with SPI Mode 1. This means that the clock line should start high and that data will
+ // be sampled starting at the first falling edge.
+ embedded_hal::spi::MODE_1,
+ );
+
+ let _ = reset.set_high();
+ timer.delay_ms(10);
+ let _ = board_select.set_low();
+ timer.delay_ms(10);
+ for step in SETUP_PROGRAM {
+ step.send_command(&mut spi, &mut data_command);
+ if let Some(delay) = step.delay {
+ timer.delay_ms(delay);
+ }
+ }
+
+ let _ = data_command.set_low();
+ let _ = spi.write(&[RAMWR]);
+ let _ = data_command.set_high();
+ let mut bitmap: [u8; 86700] = [0; 86700];
+ for i in 0..28900 {
+ bitmap[i] = 0x55;
+ }
+ let _ = spi.write(&bitmap);
+ let _ = data_command.set_low();
+ let _ = spi.write(&[NOP]);
+ let _ = board_select.set_high();
+
+
+ loop {}
+}
From fb0e914edf68b82fbece9afbc5638ac0f2f4ea23 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 11 Nov 2024 09:33:45 -0500
Subject: [PATCH 18/34] This gets the screen working, though not correctly
---
pico-st7789/src/main.rs | 60 ++++++++++++++++++++++++-----------------
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 85068f2..aab31b7 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -17,6 +17,10 @@ use rp_pico::{
const XOSC_CRYSTAL_FREQ: u32 = 12_000_000; // MHz, https://forums.raspberrypi.com/viewtopic.php?t=356764
+const ROWS: usize = 320;
+const COLUMNS: usize = 240;
+const FRAMEBUF: usize = ROWS * COLUMNS * 3;
+
struct Step {
param_cnt: usize,
command: u8,
@@ -36,8 +40,10 @@ impl Step {
{
let _ = data_command.set_low();
let _ = spi.write(&[self.command]);
- let _ = data_command.set_high();
- let _ = spi.write(&self.params[0..self.param_cnt]);
+ if self.param_cnt > 0 {
+ let _ = data_command.set_high();
+ let _ = spi.write(&self.params[0..self.param_cnt]);
+ }
}
}
@@ -57,9 +63,9 @@ const SLPOUT: Step = Step {
};
const COLMOD: u8 = 0x3a;
const MADCTL: Step = Step {
- param_cnt: 0,
+ param_cnt: 1,
command: 0x36,
- params: [0, 0, 0, 0],
+ params: [0x08, 0, 0, 0],
delay: None,
};
const CASET: u8 = 0x2a;
@@ -111,20 +117,20 @@ const SETUP_PROGRAM: [Step; 9] = [
Step {
param_cnt: 1,
command: COLMOD,
- params: [0x55, 0, 0, 0],
+ params: [0x66, 0, 0, 0],
delay: Some(10),
},
MADCTL,
Step {
param_cnt: 4,
command: CASET,
- params: [0, 0, 0, 170],
+ params: [0, 0, 0, 240],
delay: None,
},
Step {
param_cnt: 4,
command: RASET,
- params: [0, 0, (340 as u16 >> 8) as u8, (320 as u16 & 0xff) as u8],
+ params: [0, 0, (320 >> 8) as u8, (320 & 0xff) as u8],
delay: None,
},
INVON,
@@ -178,8 +184,8 @@ unsafe fn main() -> ! {
// let spi_sdi = pins.gpio4.into_function();
// Chip select 1 means the chip is not enabled
let mut board_select = pins.gpio13.into_function();
- let mut data_command = pins.gpio14.into_function();
- let mut reset = pins.gpio15.into_function();
+ let mut data_command = pins.gpio15.into_function();
+ let mut reset = pins.gpio14.into_function();
let _ = reset.set_low();
let _ = board_select.set_high();
@@ -191,10 +197,10 @@ unsafe fn main() -> ! {
// The SPI system uses the peripheral clock
clocks.peripheral_clock.freq(),
// Transmit data at a rate of 1Mbit.
- 1_u32.MHz(),
+ 32_u32.MHz(),
// Run with SPI Mode 1. This means that the clock line should start high and that data will
// be sampled starting at the first falling edge.
- embedded_hal::spi::MODE_1,
+ embedded_hal::spi::MODE_3,
);
let _ = reset.set_high();
@@ -208,18 +214,24 @@ unsafe fn main() -> ! {
}
}
- let _ = data_command.set_low();
- let _ = spi.write(&[RAMWR]);
- let _ = data_command.set_high();
- let mut bitmap: [u8; 86700] = [0; 86700];
- for i in 0..28900 {
- bitmap[i] = 0x55;
+ timer.delay_ms(1000);
+
+ let mut bitmap: [u8; FRAMEBUF] = [0; FRAMEBUF];
+
+ let mut i = 0;
+ loop {
+ let _ = board_select.set_low();
+ let _ = data_command.set_low();
+ let _ = spi.write(&[RAMWR]);
+ let _ = data_command.set_high();
+ let _ = spi.write(&bitmap);
+ let _ = board_select.set_high();
+
+ let color = i << 2;
+ bitmap = [color; FRAMEBUF];
+
+ i = if i >= 64 { 0 } else { i + 1 };
+
+ timer.delay_ms(10);
}
- let _ = spi.write(&bitmap);
- let _ = data_command.set_low();
- let _ = spi.write(&[NOP]);
- let _ = board_select.set_high();
-
-
- loop {}
}
From 54dd0049150f55d0f7c2c7c5bdf1e69d5c4f3028 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 26 Feb 2025 23:59:10 -0500
Subject: [PATCH 19/34] Tweak the hell out of the code until it shows a small
square in the center of the screen
---
pico-st7789/src/main.rs | 38 +++++++++++++++++++++++++++-----------
rust-toolchain | 2 +-
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index aab31b7..705929d 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -18,7 +18,7 @@ use rp_pico::{
const XOSC_CRYSTAL_FREQ: u32 = 12_000_000; // MHz, https://forums.raspberrypi.com/viewtopic.php?t=356764
const ROWS: usize = 320;
-const COLUMNS: usize = 240;
+const COLUMNS: usize = 170;
const FRAMEBUF: usize = ROWS * COLUMNS * 3;
struct Step {
@@ -65,7 +65,7 @@ const COLMOD: u8 = 0x3a;
const MADCTL: Step = Step {
param_cnt: 1,
command: 0x36,
- params: [0x08, 0, 0, 0],
+ params: [0x00, 0, 0, 0],
delay: None,
};
const CASET: u8 = 0x2a;
@@ -111,7 +111,7 @@ const RAMWR: u8 = 0x2c;
// DISPON, 10ms delay
// turn the display on
-const SETUP_PROGRAM: [Step; 9] = [
+const SETUP_PROGRAM: [Step; 8] = [
SWRESET,
SLPOUT,
Step {
@@ -124,15 +124,17 @@ const SETUP_PROGRAM: [Step; 9] = [
Step {
param_cnt: 4,
command: CASET,
- params: [0, 0, 0, 240],
+ params: [0, 35, 0, 204],
delay: None,
},
+ /*
Step {
param_cnt: 4,
command: RASET,
params: [0, 0, (320 >> 8) as u8, (320 & 0xff) as u8],
delay: None,
},
+ */
INVON,
NORON,
DISPON,
@@ -177,6 +179,8 @@ unsafe fn main() -> ! {
// An abstraction for a timer which we can use to delay the code.
let mut timer = Timer::new(peripherals.TIMER, &mut peripherals.RESETS, &clocks);
+ let mut led = pins.gpio16.into_function();
+
// Grab the clock and data pins for SPI1. For Clock pins and for Data pins, there are only two
// pins each on the Pico which can function for SPI1.
let spi_clk = pins.gpio2.into_function();
@@ -216,22 +220,34 @@ unsafe fn main() -> ! {
timer.delay_ms(1000);
- let mut bitmap: [u8; FRAMEBUF] = [0; FRAMEBUF];
+ let mut framebuf: [u8; FRAMEBUF] = [0; FRAMEBUF];
- let mut i = 0;
+ let mut strength = 0;
loop {
+ led.set_high();
let _ = board_select.set_low();
let _ = data_command.set_low();
let _ = spi.write(&[RAMWR]);
let _ = data_command.set_high();
- let _ = spi.write(&bitmap);
+ let _ = spi.write(&framebuf);
let _ = board_select.set_high();
- let color = i << 2;
- bitmap = [color; FRAMEBUF];
-
- i = if i >= 64 { 0 } else { i + 1 };
+ for x in 80..90 {
+ for y in 155..165 {
+ write_pixel(&mut framebuf, x, y, (0, 0, 63));
+ }
+ }
timer.delay_ms(10);
+ led.set_low();
+
+ timer.delay_ms(1000);
}
}
+
+fn write_pixel(framebuf: &mut[u8], x: usize, y: usize, color: (u8, u8, u8)) {
+ framebuf[(y * COLUMNS + x) * 3 + 0] = color.0 << 2;
+ framebuf[(y * COLUMNS + x) * 3 + 1] = color.1 << 2;
+ framebuf[(y * COLUMNS + x) * 3 + 2] = color.2 << 2;
+}
+
diff --git a/rust-toolchain b/rust-toolchain
index b96bf13..f5d4290 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,4 @@
[toolchain]
-channel = "1.81.0"
+channel = "1.85.0"
targets = [ "wasm32-unknown-unknown", "thumbv6m-none-eabi" ]
components = [ "rustfmt", "rust-analyzer", "clippy" ]
From f004aa3514f84917b3a543f1270f2f39372b13c3 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Thu, 27 Feb 2025 00:18:32 -0500
Subject: [PATCH 20/34] Use the onboard LED and try to transmit at 2MB
---
pico-st7789/src/main.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 705929d..acc1e3e 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -179,7 +179,7 @@ unsafe fn main() -> ! {
// An abstraction for a timer which we can use to delay the code.
let mut timer = Timer::new(peripherals.TIMER, &mut peripherals.RESETS, &clocks);
- let mut led = pins.gpio16.into_function();
+ let mut led = pins.led.into_function();
// Grab the clock and data pins for SPI1. For Clock pins and for Data pins, there are only two
// pins each on the Pico which can function for SPI1.
@@ -201,7 +201,7 @@ unsafe fn main() -> ! {
// The SPI system uses the peripheral clock
clocks.peripheral_clock.freq(),
// Transmit data at a rate of 1Mbit.
- 32_u32.MHz(),
+ 2_u32.MHz(),
// Run with SPI Mode 1. This means that the clock line should start high and that data will
// be sampled starting at the first falling edge.
embedded_hal::spi::MODE_3,
From a69a864dca08ae2b95df9063df7e1bb509f82ebc Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Thu, 27 Feb 2025 08:50:57 -0500
Subject: [PATCH 21/34] Rename framebuf
---
pico-st7789/src/main.rs | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index acc1e3e..61534c4 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -21,6 +21,13 @@ const ROWS: usize = 320;
const COLUMNS: usize = 170;
const FRAMEBUF: usize = ROWS * COLUMNS * 3;
+/*
+struct Frame {
+ columns: usize,
+ buf: [u8; FRAMEBUF],
+}
+*/
+
struct Step {
param_cnt: usize,
command: u8,
@@ -220,7 +227,13 @@ unsafe fn main() -> ! {
timer.delay_ms(1000);
- let mut framebuf: [u8; FRAMEBUF] = [0; FRAMEBUF];
+ let mut frame: [u8; FRAMEBUF] = [0; FRAMEBUF];
+ /*
+ let mut frame = Frame {
+ columns: COLUMNS,
+ buf: [0; FRAMEBUF],
+ };
+ */
let mut strength = 0;
loop {
@@ -229,12 +242,12 @@ unsafe fn main() -> ! {
let _ = data_command.set_low();
let _ = spi.write(&[RAMWR]);
let _ = data_command.set_high();
- let _ = spi.write(&framebuf);
+ let _ = spi.write(&frame);
let _ = board_select.set_high();
for x in 80..90 {
for y in 155..165 {
- write_pixel(&mut framebuf, x, y, (0, 0, 63));
+ write_pixel(&mut frame, x, y, (0, 0, 63));
}
}
@@ -245,9 +258,8 @@ unsafe fn main() -> ! {
}
}
-fn write_pixel(framebuf: &mut[u8], x: usize, y: usize, color: (u8, u8, u8)) {
+fn write_pixel(framebuf: &mut [u8], x: usize, y: usize, color: (u8, u8, u8)) {
framebuf[(y * COLUMNS + x) * 3 + 0] = color.0 << 2;
framebuf[(y * COLUMNS + x) * 3 + 1] = color.1 << 2;
framebuf[(y * COLUMNS + x) * 3 + 2] = color.2 << 2;
}
-
From 45dc19c32943be553b30badcc8f3c2518f769627 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Thu, 27 Feb 2025 08:57:16 -0500
Subject: [PATCH 22/34] Move board control into a self-contained object
---
pico-st7789/src/main.rs | 145 +++-------------------------
pico-st7789/src/st7789.rs | 196 ++++++++++++++++++++++++++++++++++++++
2 files changed, 210 insertions(+), 131 deletions(-)
create mode 100644 pico-st7789/src/st7789.rs
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 61534c4..532810c 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -15,6 +15,10 @@ use rp_pico::{
pac, Pins,
};
+mod st7789;
+use st7789::{ST7789Display, SETUP_PROGRAM};
+pub use st7789::Step;
+
const XOSC_CRYSTAL_FREQ: u32 = 12_000_000; // MHz, https://forums.raspberrypi.com/viewtopic.php?t=356764
const ROWS: usize = 320;
@@ -28,125 +32,6 @@ struct Frame {
}
*/
-struct Step {
- param_cnt: usize,
- command: u8,
- params: [u8; 4],
- delay: Option<u32>,
-}
-
-impl Step {
- fn send_command<D, Pinout, P>(
- &self,
- spi: &mut Spi<Enabled, D, Pinout, 8>,
- data_command: &mut Pin<P, FunctionSio<SioOutput>, PullDown>,
- ) where
- D: SpiDevice,
- Pinout: ValidSpiPinout<D>,
- P: PinId,
- {
- let _ = data_command.set_low();
- let _ = spi.write(&[self.command]);
- if self.param_cnt > 0 {
- let _ = data_command.set_high();
- let _ = spi.write(&self.params[0..self.param_cnt]);
- }
- }
-}
-
-const NOP: u8 = 0x00;
-
-const SWRESET: Step = Step {
- param_cnt: 0,
- command: 0x01,
- params: [0, 0, 0, 0],
- delay: Some(150),
-};
-const SLPOUT: Step = Step {
- param_cnt: 0,
- command: 0x11,
- params: [0, 0, 0, 0],
- delay: Some(10),
-};
-const COLMOD: u8 = 0x3a;
-const MADCTL: Step = Step {
- param_cnt: 1,
- command: 0x36,
- params: [0x00, 0, 0, 0],
- delay: None,
-};
-const CASET: u8 = 0x2a;
-const RASET: u8 = 0x2b;
-const INVON: Step = Step {
- param_cnt: 0,
- command: 0x21,
- params: [0, 0, 0, 0],
- delay: Some(10),
-};
-const NORON: Step = Step {
- param_cnt: 0,
- command: 0x13,
- params: [0, 0, 0, 0],
- delay: Some(10),
-};
-const DISPON: Step = Step {
- param_cnt: 0,
- command: 0x29,
- params: [0, 0, 0, 0],
- delay: Some(10),
-};
-const RAMWR: u8 = 0x2c;
-
-// Adafruit setup instructions
-// SWRESET (0x01), 150ms delay
-// SLPOUT (0x11), 10ms delay
-// COLMOD (0x3a) 0x55 (65K RGB, 16bit/pixel), 10ms delay
-// MADCTL (0x36) 0x00,
-// memory data access control, RGB
-// CASET 0x00, 0, 0, 170,
-// column address set, 4 parameters
-// 0x00, 0x00 indicates xstart is 0
-// 0x00, 170 indicates xend is 170
-// RASET 0x00, 0, 320 >> 8, 320 & 0xFF,
-// row address set, 4 parameters
-// 0x00, 0x00 indicates ystart is 0
-// 3230 >> 8, 320 & 0xff indicates that 320 is the last y address
-// INVON, 10ms delay
-// invert the display
-// NORON, 10ms delay
-// normal display mode
-// DISPON, 10ms delay
-// turn the display on
-
-const SETUP_PROGRAM: [Step; 8] = [
- SWRESET,
- SLPOUT,
- Step {
- param_cnt: 1,
- command: COLMOD,
- params: [0x66, 0, 0, 0],
- delay: Some(10),
- },
- MADCTL,
- Step {
- param_cnt: 4,
- command: CASET,
- params: [0, 35, 0, 204],
- delay: None,
- },
- /*
- Step {
- param_cnt: 4,
- command: RASET,
- params: [0, 0, (320 >> 8) as u8, (320 & 0xff) as u8],
- delay: None,
- },
- */
- INVON,
- NORON,
- DISPON,
-];
-
#[entry]
unsafe fn main() -> ! {
// rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
@@ -214,36 +99,34 @@ unsafe fn main() -> ! {
embedded_hal::spi::MODE_3,
);
+ let mut display = ST7789Display::new(board_select, data_command, spi);
+
let _ = reset.set_high();
timer.delay_ms(10);
- let _ = board_select.set_low();
- timer.delay_ms(10);
for step in SETUP_PROGRAM {
- step.send_command(&mut spi, &mut data_command);
- if let Some(delay) = step.delay {
- timer.delay_ms(delay);
- }
+ let mut display = display.acquire();
+ display.send_command(&step, &mut timer);
}
timer.delay_ms(1000);
let mut frame: [u8; FRAMEBUF] = [0; FRAMEBUF];
- /*
- let mut frame = Frame {
- columns: COLUMNS,
- buf: [0; FRAMEBUF],
- };
- */
let mut strength = 0;
loop {
led.set_high();
+ /*
let _ = board_select.set_low();
let _ = data_command.set_low();
let _ = spi.write(&[RAMWR]);
let _ = data_command.set_high();
let _ = spi.write(&frame);
let _ = board_select.set_high();
+ */
+ {
+ let display = display.acquire();
+ display.send_buf(&frame);
+ }
for x in 80..90 {
for y in 155..165 {
diff --git a/pico-st7789/src/st7789.rs b/pico-st7789/src/st7789.rs
new file mode 100644
index 0000000..4e19441
--- /dev/null
+++ b/pico-st7789/src/st7789.rs
@@ -0,0 +1,196 @@
+use embedded_hal::{delay::DelayNs, digital::OutputPin, spi::SpiBus};
+use rp_pico::hal::{
+ gpio::{FunctionSio, Pin, PinId, PullDown, SioOutput},
+ spi::{Enabled, SpiDevice, ValidSpiPinout},
+ Spi, Timer,
+};
+
+pub struct Step {
+ param_cnt: usize,
+ command: u8,
+ params: [u8; 4],
+ delay: Option<u32>,
+}
+
+impl Step {
+ pub fn send_command<D, Pinout, P>(
+ &self,
+ spi: &mut Spi<Enabled, D, Pinout, 8>,
+ data_command: &mut Pin<P, FunctionSio<SioOutput>, PullDown>,
+ ) where
+ D: SpiDevice,
+ Pinout: ValidSpiPinout<D>,
+ P: PinId,
+ {
+ let _ = data_command.set_low();
+ let _ = spi.write(&[self.command]);
+ if self.param_cnt > 0 {
+ let _ = data_command.set_high();
+ let _ = spi.write(&self.params[0..self.param_cnt]);
+ }
+ }
+}
+
+const NOP: u8 = 0x00;
+
+const SWRESET: Step = Step {
+ param_cnt: 0,
+ command: 0x01,
+ params: [0, 0, 0, 0],
+ delay: Some(150),
+};
+const SLPOUT: Step = Step {
+ param_cnt: 0,
+ command: 0x11,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const COLMOD: u8 = 0x3a;
+const MADCTL: Step = Step {
+ param_cnt: 1,
+ command: 0x36,
+ params: [0x00, 0, 0, 0],
+ delay: None,
+};
+const CASET: u8 = 0x2a;
+const RASET: u8 = 0x2b;
+const INVON: Step = Step {
+ param_cnt: 0,
+ command: 0x21,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const NORON: Step = Step {
+ param_cnt: 0,
+ command: 0x13,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const DISPON: Step = Step {
+ param_cnt: 0,
+ command: 0x29,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
+const RAMWR: u8 = 0x2c;
+
+// Adafruit setup instructions
+// SWRESET (0x01), 150ms delay
+// SLPOUT (0x11), 10ms delay
+// COLMOD (0x3a) 0x55 (65K RGB, 16bit/pixel), 10ms delay
+// MADCTL (0x36) 0x00,
+// memory data access control, RGB
+// CASET 0x00, 0, 0, 170,
+// column address set, 4 parameters
+// 0x00, 0x00 indicates xstart is 0
+// 0x00, 170 indicates xend is 170
+// RASET 0x00, 0, 320 >> 8, 320 & 0xFF,
+// row address set, 4 parameters
+// 0x00, 0x00 indicates ystart is 0
+// 3230 >> 8, 320 & 0xff indicates that 320 is the last y address
+// INVON, 10ms delay
+// invert the display
+// NORON, 10ms delay
+// normal display mode
+// DISPON, 10ms delay
+// turn the display on
+
+pub const SETUP_PROGRAM: [Step; 8] = [
+ SWRESET,
+ SLPOUT,
+ Step {
+ param_cnt: 1,
+ command: COLMOD,
+ params: [0x66, 0, 0, 0],
+ delay: Some(10),
+ },
+ MADCTL,
+ Step {
+ param_cnt: 4,
+ command: CASET,
+ params: [0, 35, 0, 204],
+ delay: None,
+ },
+ /*
+ Step {
+ param_cnt: 4,
+ command: RASET,
+ params: [0, 0, (320 >> 8) as u8, (320 & 0xff) as u8],
+ delay: None,
+ },
+ */
+ INVON,
+ NORON,
+ DISPON,
+];
+
+pub struct ST7789Display<
+ BoardSelectId: PinId,
+ DataCommandId: PinId,
+ D: SpiDevice,
+ Pinout: ValidSpiPinout<D>,
+> {
+ inner: ST7789DisplayEnabled<BoardSelectId, DataCommandId, D, Pinout>,
+}
+
+impl<BoardSelectId: PinId, DataCommandId: PinId, D: SpiDevice, Pinout: ValidSpiPinout<D>>
+ ST7789Display<BoardSelectId, DataCommandId, D, Pinout>
+{
+ pub fn new(
+ board_select: Pin<BoardSelectId, FunctionSio<SioOutput>, PullDown>,
+ data_command: Pin<DataCommandId, FunctionSio<SioOutput>, PullDown>,
+ spi: Spi<Enabled, D, Pinout, 8>,
+ ) -> Self {
+ Self {
+ inner: ST7789DisplayEnabled {
+ board_select,
+ data_command,
+ spi,
+ },
+ }
+ }
+
+ pub fn acquire(
+ &mut self,
+ ) -> &mut ST7789DisplayEnabled<BoardSelectId, DataCommandId, D, Pinout> {
+ self.inner.board_select.set_low();
+ &mut self.inner
+ }
+}
+
+pub struct ST7789DisplayEnabled<
+ BoardSelectId: PinId,
+ DataCommandId: PinId,
+ D: SpiDevice,
+ Pinout: ValidSpiPinout<D>,
+> {
+ board_select: Pin<BoardSelectId, FunctionSio<SioOutput>, PullDown>,
+ data_command: Pin<DataCommandId, FunctionSio<SioOutput>, PullDown>,
+ spi: Spi<Enabled, D, Pinout, 8>,
+}
+
+impl<BoardSelectId: PinId, DataCommandId: PinId, D: SpiDevice, Pinout: ValidSpiPinout<D>>
+ ST7789DisplayEnabled<BoardSelectId, DataCommandId, D, Pinout>
+{
+ pub fn send_command(&mut self, step: &Step, timer: &mut Timer) {
+ step.send_command(&mut self.spi, &mut self.data_command);
+ if let Some(delay) = step.delay {
+ timer.delay_ms(delay);
+ }
+ }
+
+ pub fn send_buf(&mut self, frame: &[u8]) {
+ let _ = self.data_command.set_low();
+ let _ = self.spi.write(&[RAMWR]);
+ let _ = self.data_command.set_high();
+ let _ = self.spi.write(&frame);
+ }
+}
+
+impl<BoardSelectId: PinId, DataCommandId: PinId, D: SpiDevice, Pinout: ValidSpiPinout<D>> Drop
+ for ST7789DisplayEnabled<BoardSelectId, DataCommandId, D, Pinout>
+{
+ fn drop(&mut self) {
+ self.board_select.set_high();
+ }
+}
From 21c6f30a7d84768e508b1b9d7df48f5ac6c78d72 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Thu, 27 Feb 2025 09:46:46 -0500
Subject: [PATCH 23/34] Add an (unused) DISPOFF step
---
pico-st7789/src/main.rs | 10 +---------
pico-st7789/src/st7789.rs | 8 ++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 532810c..cdb6130 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -93,7 +93,7 @@ unsafe fn main() -> ! {
// The SPI system uses the peripheral clock
clocks.peripheral_clock.freq(),
// Transmit data at a rate of 1Mbit.
- 2_u32.MHz(),
+ 1_u32.MHz(),
// Run with SPI Mode 1. This means that the clock line should start high and that data will
// be sampled starting at the first falling edge.
embedded_hal::spi::MODE_3,
@@ -115,14 +115,6 @@ unsafe fn main() -> ! {
let mut strength = 0;
loop {
led.set_high();
- /*
- let _ = board_select.set_low();
- let _ = data_command.set_low();
- let _ = spi.write(&[RAMWR]);
- let _ = data_command.set_high();
- let _ = spi.write(&frame);
- let _ = board_select.set_high();
- */
{
let display = display.acquire();
display.send_buf(&frame);
diff --git a/pico-st7789/src/st7789.rs b/pico-st7789/src/st7789.rs
index 4e19441..c2bb0e2 100644
--- a/pico-st7789/src/st7789.rs
+++ b/pico-st7789/src/st7789.rs
@@ -66,6 +66,12 @@ const NORON: Step = Step {
params: [0, 0, 0, 0],
delay: Some(10),
};
+const DISPOFF: Step = Step {
+ param_cnt: 0,
+ command: 0x28,
+ params: [0, 0, 0, 0],
+ delay: Some(10),
+};
const DISPON: Step = Step {
param_cnt: 0,
command: 0x29,
@@ -180,10 +186,12 @@ impl<BoardSelectId: PinId, DataCommandId: PinId, D: SpiDevice, Pinout: ValidSpiP
}
pub fn send_buf(&mut self, frame: &[u8]) {
+ // let _ = DISPOFF.send_command(&mut self.spi, &mut self.data_command);
let _ = self.data_command.set_low();
let _ = self.spi.write(&[RAMWR]);
let _ = self.data_command.set_high();
let _ = self.spi.write(&frame);
+ // let _ = DISPON.send_command(&mut self.spi, &mut self.data_command);
}
}
From 85e5d0bb5e99acbfe2b2f9716dc0e7fb6a1ec9cd Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 3 Mar 2025 10:24:50 -0500
Subject: [PATCH 24/34] Worked out a font and a canvas
I'm adding a 16-segment-based font here, and have encoded the numbers 0-10.
I've also worked out a way to make a Canvas structure not crash the pico.
---
Cargo.lock | 52 ++++-
pico-st7789/Cargo.toml | 1 +
pico-st7789/src/drawing.rs | 125 ++++++++++++
pico-st7789/src/font.rs | 398 +++++++++++++++++++++++++++++++++++++
pico-st7789/src/main.rs | 88 +++++---
5 files changed, 634 insertions(+), 30 deletions(-)
create mode 100644 pico-st7789/src/drawing.rs
create mode 100644 pico-st7789/src/font.rs
diff --git a/Cargo.lock b/Cargo.lock
index bb828ca..1772741 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "addr2line"
@@ -693,6 +693,12 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "const-default"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
+
[[package]]
name = "const-oid"
version = "0.9.6"
@@ -1057,6 +1063,18 @@ dependencies = [
"serde 1.0.218",
]
+[[package]]
+name = "embedded-alloc"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f2de9133f68db0d4627ad69db767726c99ff8585272716708227008d3f1bddd"
+dependencies = [
+ "const-default",
+ "critical-section",
+ "linked_list_allocator",
+ "rlsf",
+]
+
[[package]]
name = "embedded-dma"
version = "0.2.0"
@@ -2870,6 +2888,12 @@ dependencies = [
"fixed",
]
+[[package]]
+name = "linked_list_allocator"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
+
[[package]]
name = "linux-raw-sys"
version = "0.4.15"
@@ -3540,6 +3564,7 @@ name = "pico-st7789"
version = "0.1.0"
dependencies = [
"cortex-m-rt",
+ "embedded-alloc",
"embedded-hal 1.0.0",
"fugit",
"panic-halt",
@@ -4131,6 +4156,18 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "rlsf"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222fb240c3286247ecdee6fa5341e7cdad0ffdf8e7e401d9937f2d58482a20bf"
+dependencies = [
+ "cfg-if",
+ "const-default",
+ "libc",
+ "svgbobdoc",
+]
+
[[package]]
name = "rp-pico"
version = "0.9.0"
@@ -4844,6 +4881,19 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+[[package]]
+name = "svgbobdoc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50"
+dependencies = [
+ "base64 0.9.3",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-width",
+]
+
[[package]]
name = "syn"
version = "1.0.109"
diff --git a/pico-st7789/Cargo.toml b/pico-st7789/Cargo.toml
index 6d8012e..001c708 100644
--- a/pico-st7789/Cargo.toml
+++ b/pico-st7789/Cargo.toml
@@ -5,6 +5,7 @@ edition = "2021"
[dependencies]
cortex-m-rt = "0.7.3"
+embedded-alloc = "0.6.0"
embedded-hal = "1.0.0"
fugit = "0.3.7"
panic-halt = "1.0.0"
diff --git a/pico-st7789/src/drawing.rs b/pico-st7789/src/drawing.rs
new file mode 100644
index 0000000..e02e868
--- /dev/null
+++ b/pico-st7789/src/drawing.rs
@@ -0,0 +1,125 @@
+// a a a
+// f b
+// f b
+// f b
+// g g g
+// e c
+// e c
+// e c
+// d d d
+
+use alloc::{boxed::Box, vec::Vec};
+
+pub struct Canvas<'a> {
+ pub buf: &'a mut [u8],
+ pub width: usize,
+}
+
+impl<'a> Canvas<'a> {
+ pub fn new(buf: &'a mut [u8], columns: usize) -> Self {
+ Self {
+ buf,
+ width: columns,
+ }
+ }
+
+ pub fn set_pixel(&mut self, x: usize, y: usize, color: (u8, u8, u8)) {
+ self.buf[(y * self.width + x) * 3 + 0] = color.0 << 2;
+ self.buf[(y * self.width + x) * 3 + 1] = color.1 << 2;
+ self.buf[(y * self.width + x) * 3 + 2] = color.2 << 2;
+ }
+}
+
+/*
+pub const DIGIT_WIDTH: usize = 5;
+pub const DIGIT_HEIGHT: usize = 9;
+
+pub const ZERO_SEVEN_SEGMENT: [bool; 7] = [true, true, true, true, true, true, false];
+
+pub const ONE_SEVEN_SEGMENT: [bool; 7] = [false, true, true, false, false, false, false];
+
+pub const TWO_SEVEN_SEGMENT: [bool; 7] = [true, true, false, true, true, false, true];
+
+pub const THREE_SEVEN_SEGMENT: [bool; 7] = [true, true, true, true, false, false, true];
+
+pub const FOUR_SEVEN_SEGMENT: [bool; 7] = [false, true, true, false, false, true, true];
+
+pub const FIVE_SEVEN_SEGMENT: [bool; 7] = [true, false, true, true, false, true, true];
+
+pub const SIX_SEVEN_SEGMENT: [bool; 7] = [true, false, true, true, true, true, true];
+
+pub const SEVEN_SEVEN_SEGMENT: [bool; 7] = [true, true, true, false, false, false, false];
+
+pub const EIGHT_SEVEN_SEGMENT: [bool; 7] = [true, true, true, true, true, true, true];
+
+pub const NINE_SEVEN_SEGMENT: [bool; 7] = [true, true, true, false, false, true, true];
+
+pub const SEVEN_SEGMENT_FONT: [[bool; 7]; 10] = [
+ ZERO_SEVEN_SEGMENT,
+ ONE_SEVEN_SEGMENT,
+ TWO_SEVEN_SEGMENT,
+ THREE_SEVEN_SEGMENT,
+ FOUR_SEVEN_SEGMENT,
+ FIVE_SEVEN_SEGMENT,
+ SIX_SEVEN_SEGMENT,
+ SEVEN_SEVEN_SEGMENT,
+ EIGHT_SEVEN_SEGMENT,
+ NINE_SEVEN_SEGMENT,
+];
+*/
+
+/*
+pub fn draw_pixel(frame: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8)) {
+ frame.buf[(y * frame.width + x) * 3 + 0] = color.0 << 2;
+ frame.buf[(y * frame.width + x) * 3 + 1] = color.1 << 2;
+ frame.buf[(y * frame.width + x) * 3 + 2] = color.2 << 2;
+}
+*/
+
+/*
+pub fn draw_seven_segment(
+ digit: u8,
+ frame: &mut [u8],
+ width: usize,
+ x: usize,
+ y: usize,
+ color: (u8, u8, u8),
+) {
+ let segments = SEVEN_SEGMENT_FONT[digit as usize];
+ if segments[0] {
+ write_pixel(frame, x + 1, y, color);
+ write_pixel(frame, x + 2, y, color);
+ write_pixel(frame, x + 3, y, color);
+ }
+ if segments[1] {
+ write_pixel(frame, x + 4, y + 1, color);
+ write_pixel(frame, x + 4, y + 2, color);
+ write_pixel(frame, x + 4, y + 3, color);
+ }
+ if segments[2] {
+ write_pixel(frame, x + 4, y + 5, color);
+ write_pixel(frame, x + 4, y + 6, color);
+ write_pixel(frame, x + 4, y + 7, color);
+ }
+ if segments[3] {
+ write_pixel(frame, x + 1, y + 8, color);
+ write_pixel(frame, x + 2, y + 8, color);
+ write_pixel(frame, x + 3, y + 8, color);
+ }
+ if segments[4] {
+ write_pixel(frame, x, y + 5, color);
+ write_pixel(frame, x, y + 6, color);
+ write_pixel(frame, x, y + 7, color);
+ }
+ if segments[5] {
+ write_pixel(frame, x, y + 1, color);
+ write_pixel(frame, x, y + 2, color);
+ write_pixel(frame, x, y + 3, color);
+ }
+ if segments[6] {
+ write_pixel(frame, x + 1, y + 4, color);
+ write_pixel(frame, x + 2, y + 4, color);
+ write_pixel(frame, x + 3, y + 4, color);
+ }
+}
+*/
diff --git a/pico-st7789/src/font.rs b/pico-st7789/src/font.rs
new file mode 100644
index 0000000..a2f4c3e
--- /dev/null
+++ b/pico-st7789/src/font.rs
@@ -0,0 +1,398 @@
+use alloc::collections::btree_map::BTreeMap;
+
+use crate::drawing::Canvas;
+
+pub trait Font<A> {
+ fn glyph(&self, c: char) -> &A;
+}
+
+pub trait Glyph {
+ fn draw(&self, canvas: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8));
+}
+
+// Sixteen Segments
+//
+// a1 a2
+// f h i jb
+// f i j b
+// f hij b
+// g1 g2
+// e klm c
+// e k l m c
+// ek l mc
+// d1 d2
+
+pub struct SixteenSegmentGlyph {
+ a1: bool,
+ a2: bool,
+ b: bool,
+ c: bool,
+ d1: bool,
+ d2: bool,
+ e: bool,
+ f: bool,
+ g1: bool,
+ g2: bool,
+ h: bool,
+ i: bool,
+ j: bool,
+ k: bool,
+ l: bool,
+ m: bool,
+}
+
+pub struct SixteenSegmentFont(BTreeMap<char, SixteenSegmentGlyph>);
+
+impl SixteenSegmentFont {
+ pub fn new() -> Self {
+ let mut font = BTreeMap::new();
+ font.insert(
+ '*',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: true,
+ i: true,
+ j: true,
+ k: true,
+ l: true,
+ m: true,
+ },
+ );
+ font.insert(
+ '0',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: true,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '1',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '2',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: false,
+ d1: true,
+ d2: true,
+ e: true,
+ f: false,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '3',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: false,
+ f: false,
+ g1: false,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '4',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: false,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '5',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: true,
+ d2: true,
+ e: false,
+ f: true,
+ g1: true,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: true,
+ },
+ );
+ font.insert(
+ '6',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '7',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '8',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '9',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: false,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+
+ Self(font)
+ }
+}
+
+impl Font<SixteenSegmentGlyph> for SixteenSegmentFont {
+ fn glyph(&self, c: char) -> &SixteenSegmentGlyph {
+ self.0.get(&c).unwrap()
+ }
+}
+
+impl Glyph for SixteenSegmentGlyph {
+ fn draw(&self, canvas: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8)) {
+ if self.a1 {
+ canvas.set_pixel(x + 1, y, color);
+ canvas.set_pixel(x + 2, y, color);
+ canvas.set_pixel(x + 3, y, color);
+ }
+ if self.a2 {
+ canvas.set_pixel(x + 5, y, color);
+ canvas.set_pixel(x + 6, y, color);
+ canvas.set_pixel(x + 7, y, color);
+ }
+ if self.b {
+ canvas.set_pixel(x + 8, y + 1, color);
+ canvas.set_pixel(x + 8, y + 2, color);
+ canvas.set_pixel(x + 8, y + 3, color);
+ canvas.set_pixel(x + 8, y + 4, color);
+ canvas.set_pixel(x + 8, y + 5, color);
+ }
+ if self.c {
+ canvas.set_pixel(x + 8, y + 7, color);
+ canvas.set_pixel(x + 8, y + 8, color);
+ canvas.set_pixel(x + 8, y + 9, color);
+ canvas.set_pixel(x + 8, y + 10, color);
+ canvas.set_pixel(x + 8, y + 11, color);
+ }
+
+ if self.d1 {
+ canvas.set_pixel(x + 1, y + 12, color);
+ canvas.set_pixel(x + 2, y + 12, color);
+ canvas.set_pixel(x + 3, y + 12, color);
+ }
+ if self.d2 {
+ canvas.set_pixel(x + 5, y + 12, color);
+ canvas.set_pixel(x + 6, y + 12, color);
+ canvas.set_pixel(x + 7, y + 12, color);
+ }
+
+ if self.e {
+ canvas.set_pixel(x, y + 7, color);
+ canvas.set_pixel(x, y + 8, color);
+ canvas.set_pixel(x, y + 9, color);
+ canvas.set_pixel(x, y + 10, color);
+ canvas.set_pixel(x, y + 11, color);
+ }
+ if self.f {
+ canvas.set_pixel(x, y + 1, color);
+ canvas.set_pixel(x, y + 2, color);
+ canvas.set_pixel(x, y + 3, color);
+ canvas.set_pixel(x, y + 4, color);
+ canvas.set_pixel(x, y + 5, color);
+ }
+
+ if self.g1 {
+ canvas.set_pixel(x + 1, y + 6, color);
+ canvas.set_pixel(x + 2, y + 6, color);
+ canvas.set_pixel(x + 3, y + 6, color);
+ }
+ if self.g2 {
+ canvas.set_pixel(x + 5, y + 6, color);
+ canvas.set_pixel(x + 6, y + 6, color);
+ canvas.set_pixel(x + 7, y + 6, color);
+ }
+
+ if self.h {
+ canvas.set_pixel(x + 1, y + 1, color);
+ canvas.set_pixel(x + 1, y + 2, color);
+ canvas.set_pixel(x + 2, y + 3, color);
+ canvas.set_pixel(x + 3, y + 4, color);
+ canvas.set_pixel(x + 3, y + 5, color);
+ }
+ if self.i {
+ canvas.set_pixel(x + 4, y + 1, color);
+ canvas.set_pixel(x + 4, y + 2, color);
+ canvas.set_pixel(x + 4, y + 3, color);
+ canvas.set_pixel(x + 4, y + 4, color);
+ canvas.set_pixel(x + 4, y + 5, color);
+ }
+ if self.j {
+ canvas.set_pixel(x + 7, y + 1, color);
+ canvas.set_pixel(x + 7, y + 2, color);
+ canvas.set_pixel(x + 6, y + 3, color);
+ canvas.set_pixel(x + 5, y + 4, color);
+ canvas.set_pixel(x + 5, y + 5, color);
+ }
+ if self.k {
+ canvas.set_pixel(x + 3, y + 7, color);
+ canvas.set_pixel(x + 3, y + 8, color);
+ canvas.set_pixel(x + 2, y + 9, color);
+ canvas.set_pixel(x + 1, y + 10, color);
+ canvas.set_pixel(x + 1, y + 11, color);
+ }
+ if self.l {
+ canvas.set_pixel(x + 4, y + 7, color);
+ canvas.set_pixel(x + 4, y + 8, color);
+ canvas.set_pixel(x + 4, y + 9, color);
+ canvas.set_pixel(x + 4, y + 10, color);
+ canvas.set_pixel(x + 4, y + 11, color);
+ }
+ if self.m {
+ canvas.set_pixel(x + 5, y + 7, color);
+ canvas.set_pixel(x + 5, y + 8, color);
+ canvas.set_pixel(x + 6, y + 9, color);
+ canvas.set_pixel(x + 7, y + 10, color);
+ canvas.set_pixel(x + 7, y + 11, color);
+ }
+ }
+}
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index cdb6130..33deb64 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -1,23 +1,26 @@
#![no_main]
#![no_std]
-use embedded_hal::{delay::DelayNs, digital::OutputPin, spi::SpiBus};
+extern crate alloc;
+
+use embedded_alloc::LlffHeap as Heap;
+use embedded_hal::{delay::DelayNs, digital::OutputPin};
use fugit::RateExtU32;
use panic_halt as _;
use rp_pico::{
entry,
- hal::{
- clocks::init_clocks_and_plls,
- gpio::{FunctionSio, Pin, PinId, PullDown, SioOutput},
- spi::{Enabled, Spi, SpiDevice, ValidSpiPinout},
- Clock, Sio, Timer, Watchdog,
- },
+ hal::{clocks::init_clocks_and_plls, spi::Spi, Clock, Sio, Timer, Watchdog},
pac, Pins,
};
+mod drawing;
+use drawing::{Canvas};
+
+mod font;
+use font::{Font, Glyph, SixteenSegmentFont};
+
mod st7789;
use st7789::{ST7789Display, SETUP_PROGRAM};
-pub use st7789::Step;
const XOSC_CRYSTAL_FREQ: u32 = 12_000_000; // MHz, https://forums.raspberrypi.com/viewtopic.php?t=356764
@@ -25,15 +28,21 @@ const ROWS: usize = 320;
const COLUMNS: usize = 170;
const FRAMEBUF: usize = ROWS * COLUMNS * 3;
-/*
-struct Frame {
- columns: usize,
- buf: [u8; FRAMEBUF],
-}
-*/
+#[global_allocator]
+static HEAP: Heap = Heap::empty();
+
#[entry]
unsafe fn main() -> ! {
+ {
+ use core::mem::MaybeUninit;
+ const HEAP_SIZE: usize = 1024;
+ static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
+ unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
+ }
+
+ let font_sixteen = SixteenSegmentFont::new();
+
// rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
let mut peripherals = pac::Peripherals::take().unwrap();
@@ -92,8 +101,8 @@ unsafe fn main() -> ! {
&mut peripherals.RESETS,
// The SPI system uses the peripheral clock
clocks.peripheral_clock.freq(),
- // Transmit data at a rate of 1Mbit.
- 1_u32.MHz(),
+ // Transmit data at a rate of 32Mbit.
+ 32_u32.MHz(),
// Run with SPI Mode 1. This means that the clock line should start high and that data will
// be sampled starting at the first falling edge.
embedded_hal::spi::MODE_3,
@@ -110,31 +119,52 @@ unsafe fn main() -> ! {
timer.delay_ms(1000);
- let mut frame: [u8; FRAMEBUF] = [0; FRAMEBUF];
+ let mut framebuf = [0; FRAMEBUF];
+ let mut canvas = Canvas::new(&mut framebuf, COLUMNS);
- let mut strength = 0;
loop {
- led.set_high();
{
let display = display.acquire();
- display.send_buf(&frame);
+ let _ = led.set_high();
+ timer.delay_ms(100);
+ display.send_buf(&canvas.buf);
+ let _ = led.set_low();
}
+ /*
+ draw_seven_segment(0, &mut frame, 0, 0, (255, 255, 255));
+ draw_seven_segment(1, &mut frame, 7, 0, (255, 255, 255));
+ draw_seven_segment(2, &mut frame, 14, 0, (255, 255, 255));
+ draw_seven_segment(3, &mut frame, 21, 0, (255, 255, 255));
+ draw_seven_segment(4, &mut frame, 28, 0, (255, 255, 255));
+ draw_seven_segment(5, &mut frame, 35, 0, (255, 255, 255));
+ draw_seven_segment(6, &mut frame, 42, 0, (255, 255, 255));
+ draw_seven_segment(7, &mut frame, 49, 0, (255, 255, 255));
+ draw_seven_segment(8, &mut frame, 56, 0, (255, 255, 255));
+ draw_seven_segment(9, &mut frame, 63, 0, (255, 255, 255));
+ */
+
+ font_sixteen.glyph('*').draw(&mut canvas, 0, 10, (255, 255, 255));
+ font_sixteen.glyph('0').draw(&mut canvas, 11, 10, (255, 255, 255));
+ font_sixteen.glyph('1').draw(&mut canvas, 22, 10, (255, 255, 255));
+ font_sixteen.glyph('2').draw(&mut canvas, 33, 10, (255, 255, 255));
+ font_sixteen.glyph('3').draw(&mut canvas, 44, 10, (255, 255, 255));
+ font_sixteen.glyph('4').draw(&mut canvas, 55, 10, (255, 255, 255));
+ font_sixteen.glyph('5').draw(&mut canvas, 66, 10, (255, 255, 255));
+ font_sixteen.glyph('6').draw(&mut canvas, 77, 10, (255, 255, 255));
+ font_sixteen.glyph('7').draw(&mut canvas, 88, 10, (255, 255, 255));
+ font_sixteen.glyph('8').draw(&mut canvas, 99, 10, (255, 255, 255));
+ font_sixteen.glyph('9').draw(&mut canvas, 110, 10, (255, 255, 255));
+
+ /*
for x in 80..90 {
for y in 155..165 {
- write_pixel(&mut frame, x, y, (0, 0, 63));
+ draw_pixel(&mut frame, x, y, (0, 0, 63));
}
}
-
- timer.delay_ms(10);
- led.set_low();
+ */
timer.delay_ms(1000);
}
}
-fn write_pixel(framebuf: &mut [u8], x: usize, y: usize, color: (u8, u8, u8)) {
- framebuf[(y * COLUMNS + x) * 3 + 0] = color.0 << 2;
- framebuf[(y * COLUMNS + x) * 3 + 1] = color.1 << 2;
- framebuf[(y * COLUMNS + x) * 3 + 2] = color.2 << 2;
-}
From aea858dd1738da36510ff2f681555dea3029064c Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Mon, 3 Mar 2025 23:18:28 -0500
Subject: [PATCH 25/34] Do a static buffer allocation for the Canvas
---
pico-st7789/src/drawing.rs | 14 ++++++++------
pico-st7789/src/main.rs | 5 ++++-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/pico-st7789/src/drawing.rs b/pico-st7789/src/drawing.rs
index e02e868..d8e780f 100644
--- a/pico-st7789/src/drawing.rs
+++ b/pico-st7789/src/drawing.rs
@@ -10,16 +10,18 @@
use alloc::{boxed::Box, vec::Vec};
-pub struct Canvas<'a> {
- pub buf: &'a mut [u8],
+static mut BUF: [u8; 163200] = [0; 163200];
+
+pub struct Canvas {
+ pub buf: &'static mut [u8; 163200],
pub width: usize,
}
-impl<'a> Canvas<'a> {
- pub fn new(buf: &'a mut [u8], columns: usize) -> Self {
+impl Canvas {
+ pub fn new() -> Self {
Self {
- buf,
- width: columns,
+ buf: unsafe { &mut BUF },
+ width: 170,
}
}
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 33deb64..90d3789 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -119,15 +119,18 @@ unsafe fn main() -> ! {
timer.delay_ms(1000);
+ /*
let mut framebuf = [0; FRAMEBUF];
let mut canvas = Canvas::new(&mut framebuf, COLUMNS);
+ */
+ let mut canvas = Canvas::new();
loop {
{
let display = display.acquire();
let _ = led.set_high();
timer.delay_ms(100);
- display.send_buf(&canvas.buf);
+ display.send_buf(canvas.buf);
let _ = led.set_low();
}
From 132c85e99d21f8c06bdfb414a140c8173f5f42ac Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 5 Mar 2025 00:50:17 -0500
Subject: [PATCH 26/34] Fix a bunch of the letters. Add a dot.
---
pico-st7789/src/drawing.rs | 295 +++++++++++++++--
pico-st7789/src/font.rs | 657 ++++++++++++++++++++++++++++++++++++-
pico-st7789/src/main.rs | 51 ++-
3 files changed, 944 insertions(+), 59 deletions(-)
diff --git a/pico-st7789/src/drawing.rs b/pico-st7789/src/drawing.rs
index d8e780f..8917586 100644
--- a/pico-st7789/src/drawing.rs
+++ b/pico-st7789/src/drawing.rs
@@ -8,7 +8,7 @@
// e c
// d d d
-use alloc::{boxed::Box, vec::Vec};
+use alloc::collections::btree_map::BTreeMap;
static mut BUF: [u8; 163200] = [0; 163200];
@@ -32,7 +32,6 @@ impl Canvas {
}
}
-/*
pub const DIGIT_WIDTH: usize = 5;
pub const DIGIT_HEIGHT: usize = 9;
@@ -68,17 +67,13 @@ pub const SEVEN_SEGMENT_FONT: [[bool; 7]; 10] = [
EIGHT_SEVEN_SEGMENT,
NINE_SEVEN_SEGMENT,
];
-*/
-/*
-pub fn draw_pixel(frame: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8)) {
- frame.buf[(y * frame.width + x) * 3 + 0] = color.0 << 2;
- frame.buf[(y * frame.width + x) * 3 + 1] = color.1 << 2;
- frame.buf[(y * frame.width + x) * 3 + 2] = color.2 << 2;
+pub fn write_pixel(framebuf: &mut [u8], width: usize, x: usize, y: usize, color: (u8, u8, u8)) {
+ framebuf[(y * width + x) * 3 + 0] = color.0 << 2;
+ framebuf[(y * width + x) * 3 + 1] = color.1 << 2;
+ framebuf[(y * width + x) * 3 + 2] = color.2 << 2;
}
-*/
-/*
pub fn draw_seven_segment(
digit: u8,
frame: &mut [u8],
@@ -89,39 +84,275 @@ pub fn draw_seven_segment(
) {
let segments = SEVEN_SEGMENT_FONT[digit as usize];
if segments[0] {
- write_pixel(frame, x + 1, y, color);
- write_pixel(frame, x + 2, y, color);
- write_pixel(frame, x + 3, y, color);
+ write_pixel(frame, width, x + 1, y, color);
+ write_pixel(frame, width, x + 2, y, color);
+ write_pixel(frame, width, x + 3, y, color);
}
if segments[1] {
- write_pixel(frame, x + 4, y + 1, color);
- write_pixel(frame, x + 4, y + 2, color);
- write_pixel(frame, x + 4, y + 3, color);
+ write_pixel(frame, width, x + 4, y + 1, color);
+ write_pixel(frame, width, x + 4, y + 2, color);
+ write_pixel(frame, width, x + 4, y + 3, color);
}
if segments[2] {
- write_pixel(frame, x + 4, y + 5, color);
- write_pixel(frame, x + 4, y + 6, color);
- write_pixel(frame, x + 4, y + 7, color);
+ write_pixel(frame, width, x + 4, y + 5, color);
+ write_pixel(frame, width, x + 4, y + 6, color);
+ write_pixel(frame, width, x + 4, y + 7, color);
}
if segments[3] {
- write_pixel(frame, x + 1, y + 8, color);
- write_pixel(frame, x + 2, y + 8, color);
- write_pixel(frame, x + 3, y + 8, color);
+ write_pixel(frame, width, x + 1, y + 8, color);
+ write_pixel(frame, width, x + 2, y + 8, color);
+ write_pixel(frame, width, x + 3, y + 8, color);
}
if segments[4] {
- write_pixel(frame, x, y + 5, color);
- write_pixel(frame, x, y + 6, color);
- write_pixel(frame, x, y + 7, color);
+ write_pixel(frame, width, x, y + 5, color);
+ write_pixel(frame, width, x, y + 6, color);
+ write_pixel(frame, width, x, y + 7, color);
}
if segments[5] {
- write_pixel(frame, x, y + 1, color);
- write_pixel(frame, x, y + 2, color);
- write_pixel(frame, x, y + 3, color);
+ write_pixel(frame, width, x, y + 1, color);
+ write_pixel(frame, width, x, y + 2, color);
+ write_pixel(frame, width, x, y + 3, color);
}
if segments[6] {
- write_pixel(frame, x + 1, y + 4, color);
- write_pixel(frame, x + 2, y + 4, color);
- write_pixel(frame, x + 3, y + 4, color);
+ write_pixel(frame, width, x + 1, y + 4, color);
+ write_pixel(frame, width, x + 2, y + 4, color);
+ write_pixel(frame, width, x + 3, y + 4, color);
+ }
+}
+
+// Sixteen Segments
+//
+// a1 a2
+// f h i jb
+// f i j b
+// f hij b
+// g1 g2
+// e klm c
+// e k l m c
+// ek l mc
+// d1 d2
+
+pub struct SixteenSegment {
+ a1: bool,
+ a2: bool,
+ b: bool,
+ c: bool,
+ d1: bool,
+ d2: bool,
+ e: bool,
+ f: bool,
+ g1: bool,
+ g2: bool,
+ h: bool,
+ i: bool,
+ j: bool,
+ k: bool,
+ l: bool,
+ m: bool,
+}
+
+pub fn sixteen_segment_font() -> BTreeMap<char, SixteenSegment> {
+ let mut font = BTreeMap::new();
+ font.insert(
+ '*',
+ SixteenSegment {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: true,
+ i: true,
+ j: true,
+ k: true,
+ l: true,
+ m: true,
+ },
+ );
+ font.insert(
+ '0',
+ SixteenSegment {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '1',
+ SixteenSegment {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+ font.insert(
+ '2',
+ SixteenSegment {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: false,
+ l: false,
+ m: false,
+ },
+ );
+
+ font
+}
+
+pub fn draw_sixteen_segment(
+ c: char,
+ font: &BTreeMap<char, SixteenSegment>,
+ frame: &mut [u8],
+ width: usize,
+ x: usize,
+ y: usize,
+ color: (u8, u8, u8),
+) {
+ let segments = font.get(&c).unwrap();
+ if segments.a1 {
+ write_pixel(frame, width, x + 1, y, color);
+ write_pixel(frame, width, x + 2, y, color);
+ write_pixel(frame, width, x + 3, y, color);
+ }
+ if segments.a2 {
+ write_pixel(frame, width, x + 5, y, color);
+ write_pixel(frame, width, x + 6, y, color);
+ write_pixel(frame, width, x + 7, y, color);
+ }
+ if segments.b {
+ write_pixel(frame, width, x + 8, y + 1, color);
+ write_pixel(frame, width, x + 8, y + 2, color);
+ write_pixel(frame, width, x + 8, y + 3, color);
+ write_pixel(frame, width, x + 8, y + 4, color);
+ write_pixel(frame, width, x + 8, y + 5, color);
+ }
+ if segments.c {
+ write_pixel(frame, width, x + 8, y + 7, color);
+ write_pixel(frame, width, x + 8, y + 8, color);
+ write_pixel(frame, width, x + 8, y + 9, color);
+ write_pixel(frame, width, x + 8, y + 10, color);
+ write_pixel(frame, width, x + 8, y + 11, color);
+ }
+
+ if segments.d1 {
+ write_pixel(frame, width, x + 1, y + 12, color);
+ write_pixel(frame, width, x + 2, y + 12, color);
+ write_pixel(frame, width, x + 3, y + 12, color);
+ }
+ if segments.d2 {
+ write_pixel(frame, width, x + 5, y + 12, color);
+ write_pixel(frame, width, x + 6, y + 12, color);
+ write_pixel(frame, width, x + 7, y + 12, color);
+ }
+
+ if segments.e {
+ write_pixel(frame, width, x, y + 7, color);
+ write_pixel(frame, width, x, y + 8, color);
+ write_pixel(frame, width, x, y + 9, color);
+ write_pixel(frame, width, x, y + 10, color);
+ write_pixel(frame, width, x, y + 11, color);
+ }
+ if segments.f {
+ write_pixel(frame, width, x, y + 1, color);
+ write_pixel(frame, width, x, y + 2, color);
+ write_pixel(frame, width, x, y + 3, color);
+ write_pixel(frame, width, x, y + 4, color);
+ write_pixel(frame, width, x, y + 5, color);
+ }
+
+ if segments.g1 {
+ write_pixel(frame, width, x + 1, y + 6, color);
+ write_pixel(frame, width, x + 2, y + 6, color);
+ write_pixel(frame, width, x + 3, y + 6, color);
+ }
+ if segments.g2 {
+ write_pixel(frame, width, x + 5, y + 6, color);
+ write_pixel(frame, width, x + 6, y + 6, color);
+ write_pixel(frame, width, x + 7, y + 6, color);
+ }
+
+ if segments.h {
+ write_pixel(frame, width, x + 1, y + 1, color);
+ write_pixel(frame, width, x + 1, y + 2, color);
+ write_pixel(frame, width, x + 2, y + 3, color);
+ write_pixel(frame, width, x + 3, y + 4, color);
+ write_pixel(frame, width, x + 3, y + 5, color);
+ }
+ if segments.i {
+ write_pixel(frame, width, x + 4, y + 1, color);
+ write_pixel(frame, width, x + 4, y + 2, color);
+ write_pixel(frame, width, x + 4, y + 3, color);
+ write_pixel(frame, width, x + 4, y + 4, color);
+ write_pixel(frame, width, x + 4, y + 5, color);
+ }
+ if segments.j {
+ write_pixel(frame, width, x + 7, y + 1, color);
+ write_pixel(frame, width, x + 7, y + 2, color);
+ write_pixel(frame, width, x + 6, y + 3, color);
+ write_pixel(frame, width, x + 5, y + 4, color);
+ write_pixel(frame, width, x + 5, y + 5, color);
+ }
+ if segments.k {
+ write_pixel(frame, width, x + 3, y + 7, color);
+ write_pixel(frame, width, x + 3, y + 8, color);
+ write_pixel(frame, width, x + 2, y + 9, color);
+ write_pixel(frame, width, x + 1, y + 10, color);
+ write_pixel(frame, width, x + 1, y + 11, color);
+ }
+ if segments.l {
+ write_pixel(frame, width, x + 4, y + 7, color);
+ write_pixel(frame, width, x + 4, y + 8, color);
+ write_pixel(frame, width, x + 4, y + 9, color);
+ write_pixel(frame, width, x + 4, y + 10, color);
+ write_pixel(frame, width, x + 4, y + 11, color);
+ }
+ if segments.m {
+ write_pixel(frame, width, x + 5, y + 7, color);
+ write_pixel(frame, width, x + 5, y + 8, color);
+ write_pixel(frame, width, x + 6, y + 9, color);
+ write_pixel(frame, width, x + 7, y + 10, color);
+ write_pixel(frame, width, x + 7, y + 11, color);
}
}
-*/
diff --git a/pico-st7789/src/font.rs b/pico-st7789/src/font.rs
index a2f4c3e..d7b3d5a 100644
--- a/pico-st7789/src/font.rs
+++ b/pico-st7789/src/font.rs
@@ -39,6 +39,7 @@ pub struct SixteenSegmentGlyph {
k: bool,
l: bool,
m: bool,
+ dot: bool,
}
pub struct SixteenSegmentFont(BTreeMap<char, SixteenSegmentGlyph>);
@@ -47,24 +48,69 @@ impl SixteenSegmentFont {
pub fn new() -> Self {
let mut font = BTreeMap::new();
font.insert(
- '*',
+ ' ',
SixteenSegmentGlyph {
- a1: true,
- a2: true,
+ a1: false,
+ a2: false,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ '!',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
b: true,
c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: true,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: true,
+ },
+ );
+ font.insert(
+ '"',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: false,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
i: true,
- j: true,
- k: true,
- l: true,
- m: true,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
},
);
font.insert(
@@ -86,6 +132,7 @@ impl SixteenSegmentFont {
k: true,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -107,6 +154,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -128,6 +176,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -149,6 +198,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -170,6 +220,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -191,6 +242,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: true,
+ dot: false,
},
);
font.insert(
@@ -212,6 +264,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -233,6 +286,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -254,6 +308,7 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
},
);
font.insert(
@@ -275,9 +330,581 @@ impl SixteenSegmentFont {
k: false,
l: false,
m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'A',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'B',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: false,
+ f: false,
+ g1: false,
+ g2: true,
+ h: false,
+ i: true,
+ j: false,
+ k: false,
+ l: true,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'C',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'D',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: true,
+ j: false,
+ k: false,
+ l: true,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'E',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: true,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'F',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: true,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'G',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'H',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'I',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: true,
+ d2: true,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: true,
+ j: false,
+ k: false,
+ l: true,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'J',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'K',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: true,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: false,
+ l: false,
+ m: true,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'L',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: false,
+ c: false,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'M',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: true,
+ i: false,
+ j: true,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'N',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: true,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: true,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'O',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'P',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: false,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'Q',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: true,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'R',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: true,
+ c: false,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: true,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'S',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: true,
+ d1: true,
+ d2: true,
+ e: false,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'T',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: true,
+ j: false,
+ k: false,
+ l: true,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'U',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'V',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: true,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'W',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: false,
+ d2: false,
+ e: true,
+ f: true,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: false,
+ k: true,
+ l: false,
+ m: true,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'X',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: false,
+ c: false,
+ d1: false,
+ d2: false,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: true,
+ i: false,
+ j: true,
+ k: true,
+ l: false,
+ m: true,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'Y',
+ SixteenSegmentGlyph {
+ a1: false,
+ a2: false,
+ b: true,
+ c: true,
+ d1: true,
+ d2: true,
+ e: false,
+ f: true,
+ g1: true,
+ g2: true,
+ h: false,
+ i: false,
+ j: false,
+ k: false,
+ l: false,
+ m: false,
+ dot: false,
+ },
+ );
+ font.insert(
+ 'Z',
+ SixteenSegmentGlyph {
+ a1: true,
+ a2: true,
+ b: false,
+ c: false,
+ d1: true,
+ d2: true,
+ e: false,
+ f: false,
+ g1: false,
+ g2: false,
+ h: false,
+ i: false,
+ j: true,
+ k: true,
+ l: false,
+ m: false,
+ dot: false,
},
);
-
Self(font)
}
}
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 90d3789..2a11a68 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -36,7 +36,7 @@ static HEAP: Heap = Heap::empty();
unsafe fn main() -> ! {
{
use core::mem::MaybeUninit;
- const HEAP_SIZE: usize = 1024;
+ const HEAP_SIZE: usize = 16 * 1024;
static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
}
@@ -147,18 +147,45 @@ unsafe fn main() -> ! {
draw_seven_segment(9, &mut frame, 63, 0, (255, 255, 255));
*/
- font_sixteen.glyph('*').draw(&mut canvas, 0, 10, (255, 255, 255));
- font_sixteen.glyph('0').draw(&mut canvas, 11, 10, (255, 255, 255));
- font_sixteen.glyph('1').draw(&mut canvas, 22, 10, (255, 255, 255));
- font_sixteen.glyph('2').draw(&mut canvas, 33, 10, (255, 255, 255));
- font_sixteen.glyph('3').draw(&mut canvas, 44, 10, (255, 255, 255));
- font_sixteen.glyph('4').draw(&mut canvas, 55, 10, (255, 255, 255));
- font_sixteen.glyph('5').draw(&mut canvas, 66, 10, (255, 255, 255));
- font_sixteen.glyph('6').draw(&mut canvas, 77, 10, (255, 255, 255));
- font_sixteen.glyph('7').draw(&mut canvas, 88, 10, (255, 255, 255));
- font_sixteen.glyph('8').draw(&mut canvas, 99, 10, (255, 255, 255));
- font_sixteen.glyph('9').draw(&mut canvas, 110, 10, (255, 255, 255));
+ font_sixteen.glyph(' ').draw(&mut canvas, 0, 0, (255, 255, 255));
+ font_sixteen.glyph('0').draw(&mut canvas, 11, 0, (255, 255, 255));
+ font_sixteen.glyph('1').draw(&mut canvas, 22, 0, (255, 255, 255));
+ font_sixteen.glyph('2').draw(&mut canvas, 33, 0, (255, 255, 255));
+ font_sixteen.glyph('3').draw(&mut canvas, 44, 0, (255, 255, 255));
+ font_sixteen.glyph('4').draw(&mut canvas, 55, 0, (255, 255, 255));
+ font_sixteen.glyph('5').draw(&mut canvas, 66, 0, (255, 255, 255));
+ font_sixteen.glyph('6').draw(&mut canvas, 77, 0, (255, 255, 255));
+ font_sixteen.glyph('7').draw(&mut canvas, 88, 0, (255, 255, 255));
+ font_sixteen.glyph('8').draw(&mut canvas, 99, 0, (255, 255, 255));
+ font_sixteen.glyph('9').draw(&mut canvas, 110, 0, (255, 255, 255));
+ font_sixteen.glyph('A').draw(&mut canvas, 0, 20, (255, 255, 255));
+ font_sixteen.glyph('B').draw(&mut canvas, 11, 20, (255, 255, 255));
+ font_sixteen.glyph('C').draw(&mut canvas, 22, 20, (255, 255, 255));
+ font_sixteen.glyph('D').draw(&mut canvas, 33, 20, (255, 255, 255));
+ font_sixteen.glyph('E').draw(&mut canvas, 44, 20, (255, 255, 255));
+ font_sixteen.glyph('F').draw(&mut canvas, 55, 20, (255, 255, 255));
+ font_sixteen.glyph('G').draw(&mut canvas, 66, 20, (255, 255, 255));
+ font_sixteen.glyph('H').draw(&mut canvas, 77, 20, (255, 255, 255));
+ font_sixteen.glyph('I').draw(&mut canvas, 88, 20, (255, 255, 255));
+ font_sixteen.glyph('J').draw(&mut canvas, 99, 20, (255, 255, 255));
+ font_sixteen.glyph('K').draw(&mut canvas, 110, 20, (255, 255, 255));
+ font_sixteen.glyph('L').draw(&mut canvas, 121, 20, (255, 255, 255));
+ font_sixteen.glyph('M').draw(&mut canvas, 132, 20, (255, 255, 255));
+ font_sixteen.glyph('N').draw(&mut canvas, 143, 20, (255, 255, 255));
+ font_sixteen.glyph('O').draw(&mut canvas, 154, 20, (255, 255, 255));
+
+ font_sixteen.glyph('P').draw(&mut canvas, 0, 40, (255, 255, 255));
+ font_sixteen.glyph('Q').draw(&mut canvas, 11, 40, (255, 255, 255));
+ font_sixteen.glyph('R').draw(&mut canvas, 22, 40, (255, 255, 255));
+ font_sixteen.glyph('S').draw(&mut canvas, 33, 40, (255, 255, 255));
+ font_sixteen.glyph('T').draw(&mut canvas, 44, 40, (255, 255, 255));
+ font_sixteen.glyph('U').draw(&mut canvas, 55, 40, (255, 255, 255));
+ font_sixteen.glyph('V').draw(&mut canvas, 66, 40, (255, 255, 255));
+ font_sixteen.glyph('W').draw(&mut canvas, 77, 40, (255, 255, 255));
+ font_sixteen.glyph('X').draw(&mut canvas, 88, 40, (255, 255, 255));
+ font_sixteen.glyph('Y').draw(&mut canvas, 99, 40, (255, 255, 255));
+ font_sixteen.glyph('Z').draw(&mut canvas, 110, 40, (255, 255, 255));
/*
for x in 80..90 {
for y in 155..165 {
From 155d2ba18edb9ee875c0412bad9f281183371d94 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 5 Mar 2025 09:25:15 -0500
Subject: [PATCH 27/34] Use bitflags to represent the font
---
Cargo.lock | 35 +-
pico-st7789/Cargo.toml | 1 +
pico-st7789/src/font.rs | 1052 +++++++++++----------------------------
pico-st7789/src/main.rs | 29 +-
4 files changed, 324 insertions(+), 793 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 1772741..d871276 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -365,7 +365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
"annotate-snippets",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cexpr",
"clang-sys",
"itertools 0.12.1",
@@ -420,9 +420,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
dependencies = [
"serde 1.0.218",
]
@@ -485,7 +485,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cairo-sys-rs",
"glib 0.18.5",
"libc",
@@ -1815,7 +1815,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"futures-channel",
"futures-core",
"futures-executor",
@@ -1838,7 +1838,7 @@ version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"futures-channel",
"futures-core",
"futures-executor",
@@ -2837,7 +2837,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cc",
"convert_case",
"cookie-factory",
@@ -3142,7 +3142,7 @@ version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cfg-if",
"libc",
]
@@ -3286,7 +3286,7 @@ version = "0.10.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cfg-if",
"foreign-types",
"libc",
@@ -3563,6 +3563,7 @@ dependencies = [
name = "pico-st7789"
version = "0.1.0"
dependencies = [
+ "bitflags 2.9.0",
"cortex-m-rt",
"embedded-alloc",
"embedded-hal 1.0.0",
@@ -3632,7 +3633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
dependencies = [
"anyhow",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"libc",
"libspa",
"libspa-sys",
@@ -3829,7 +3830,7 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
dependencies = [
"bit-set",
"bit-vec",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"lazy_static",
"num-traits",
"rand 0.8.5",
@@ -4068,7 +4069,7 @@ version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
]
[[package]]
@@ -4299,7 +4300,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"errno",
"libc",
"linux-raw-sys",
@@ -4387,7 +4388,7 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -4758,7 +4759,7 @@ checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233"
dependencies = [
"atoi",
"base64 0.22.1",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"byteorder",
"bytes",
"crc",
@@ -4800,7 +4801,7 @@ checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613"
dependencies = [
"atoi",
"base64 0.22.1",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"byteorder",
"crc",
"dotenvy",
@@ -6035,7 +6036,7 @@ version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
]
[[package]]
diff --git a/pico-st7789/Cargo.toml b/pico-st7789/Cargo.toml
index 001c708..ff98242 100644
--- a/pico-st7789/Cargo.toml
+++ b/pico-st7789/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
+bitflags = "2.9.0"
cortex-m-rt = "0.7.3"
embedded-alloc = "0.6.0"
embedded-hal = "1.0.0"
diff --git a/pico-st7789/src/font.rs b/pico-st7789/src/font.rs
index d7b3d5a..d4f8b88 100644
--- a/pico-st7789/src/font.rs
+++ b/pico-st7789/src/font.rs
@@ -1,4 +1,5 @@
use alloc::collections::btree_map::BTreeMap;
+use bitflags::bitflags;
use crate::drawing::Canvas;
@@ -22,6 +23,7 @@ pub trait Glyph {
// ek l mc
// d1 d2
+/*
pub struct SixteenSegmentGlyph {
a1: bool,
a2: bool,
@@ -41,869 +43,393 @@ pub struct SixteenSegmentGlyph {
m: bool,
dot: bool,
}
+*/
+
+bitflags! {
+ pub struct SixteenSegmentGlyph: u32 {
+ const NONE = 0;
+ const A1 = 0x0001;
+ const A2 = 0x0001 << 1;
+ const B = 0x0001 << 2;
+ const C = 0x0001 << 3;
+ const D1 = 0x0001 << 4;
+ const D2 = 0x0001 << 5;
+ const E = 0x0001 << 6;
+ const F = 0x0001 << 7;
+ const G1 = 0x0001 << 8;
+ const G2 = 0x0001 << 9;
+ const H = 0x0001 << 10;
+ const I = 0x0001 << 11;
+ const J = 0x0001 << 12;
+ const K = 0x0001 << 13;
+ const L = 0x0001 << 14;
+ const M = 0x0001 << 15;
+ const DOT = 0x0001 << 16;
+ }
+}
+
+/*
+impl Default for SixteenSegmentGlyph {
+ fn default() -> Self {
+ 0_u32
+ }
+}
+*/
pub struct SixteenSegmentFont(BTreeMap<char, SixteenSegmentGlyph>);
impl SixteenSegmentFont {
pub fn new() -> Self {
let mut font = BTreeMap::new();
- font.insert(
- ' ',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
- );
+ font.insert(' ', SixteenSegmentGlyph::NONE);
font.insert(
'!',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: true,
- },
- );
- font.insert(
- '"',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: false,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: true,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B | SixteenSegmentGlyph::C | SixteenSegmentGlyph::DOT,
);
+ font.insert('"', SixteenSegmentGlyph::B | SixteenSegmentGlyph::I);
font.insert(
'0',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: true,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::K,
);
font.insert(
'1',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B | SixteenSegmentGlyph::C | SixteenSegmentGlyph::J,
);
font.insert(
'2',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: false,
- d1: true,
- d2: true,
- e: true,
- f: false,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'3',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: false,
- f: false,
- g1: false,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'4',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: false,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'5',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: true,
- d2: true,
- e: false,
- f: true,
- g1: true,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::M,
);
font.insert(
'6',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'7',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C,
);
font.insert(
'8',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'9',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: false,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'A',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'B',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: false,
- f: false,
- g1: false,
- g2: true,
- h: false,
- i: true,
- j: false,
- k: false,
- l: true,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::G2
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
);
font.insert(
'C',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F,
);
font.insert(
'D',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: true,
- j: false,
- k: false,
- l: true,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
);
font.insert(
'E',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: true,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1,
);
font.insert(
'F',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: true,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1,
);
font.insert(
'G',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'H',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'I',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: true,
- d2: true,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: true,
- j: false,
- k: false,
- l: true,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
);
font.insert(
'J',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E,
);
font.insert(
'K',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: true,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: false,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::M,
);
font.insert(
'L',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: false,
- c: false,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F,
);
font.insert(
'M',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: true,
- i: false,
- j: true,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::H
+ | SixteenSegmentGlyph::J,
);
font.insert(
'N',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: true,
- i: false,
- j: false,
- k: false,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::H
+ | SixteenSegmentGlyph::M,
);
font.insert(
'O',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F,
);
font.insert(
'P',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: false,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'Q',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::M,
);
font.insert(
'R',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: true,
- c: false,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2
+ | SixteenSegmentGlyph::M,
);
font.insert(
'S',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: true,
- d1: true,
- d2: true,
- e: false,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'T',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: true,
- j: false,
- k: false,
- l: true,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
);
font.insert(
'U',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F,
);
font.insert(
'V',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: true,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::K,
);
font.insert(
'W',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: true,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::K
+ | SixteenSegmentGlyph::M,
);
font.insert(
'X',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: true,
- i: false,
- j: true,
- k: true,
- l: false,
- m: true,
- dot: false,
- },
+ SixteenSegmentGlyph::H
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::K
+ | SixteenSegmentGlyph::M,
);
font.insert(
'Y',
- SixteenSegmentGlyph {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: false,
- f: true,
- g1: true,
- g2: true,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
);
font.insert(
'Z',
- SixteenSegmentGlyph {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: true,
- d2: true,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: true,
- l: false,
- m: false,
- dot: false,
- },
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::K,
);
Self(font)
}
@@ -917,24 +443,24 @@ impl Font<SixteenSegmentGlyph> for SixteenSegmentFont {
impl Glyph for SixteenSegmentGlyph {
fn draw(&self, canvas: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8)) {
- if self.a1 {
+ if self.contains(SixteenSegmentGlyph::A1) {
canvas.set_pixel(x + 1, y, color);
canvas.set_pixel(x + 2, y, color);
canvas.set_pixel(x + 3, y, color);
}
- if self.a2 {
+ if self.contains(SixteenSegmentGlyph::A2) {
canvas.set_pixel(x + 5, y, color);
canvas.set_pixel(x + 6, y, color);
canvas.set_pixel(x + 7, y, color);
}
- if self.b {
+ if self.contains(SixteenSegmentGlyph::B) {
canvas.set_pixel(x + 8, y + 1, color);
canvas.set_pixel(x + 8, y + 2, color);
canvas.set_pixel(x + 8, y + 3, color);
canvas.set_pixel(x + 8, y + 4, color);
canvas.set_pixel(x + 8, y + 5, color);
}
- if self.c {
+ if self.contains(SixteenSegmentGlyph::C) {
canvas.set_pixel(x + 8, y + 7, color);
canvas.set_pixel(x + 8, y + 8, color);
canvas.set_pixel(x + 8, y + 9, color);
@@ -942,25 +468,25 @@ impl Glyph for SixteenSegmentGlyph {
canvas.set_pixel(x + 8, y + 11, color);
}
- if self.d1 {
+ if self.contains(SixteenSegmentGlyph::D1) {
canvas.set_pixel(x + 1, y + 12, color);
canvas.set_pixel(x + 2, y + 12, color);
canvas.set_pixel(x + 3, y + 12, color);
}
- if self.d2 {
+ if self.contains(SixteenSegmentGlyph::D2) {
canvas.set_pixel(x + 5, y + 12, color);
canvas.set_pixel(x + 6, y + 12, color);
canvas.set_pixel(x + 7, y + 12, color);
}
- if self.e {
+ if self.contains(SixteenSegmentGlyph::E) {
canvas.set_pixel(x, y + 7, color);
canvas.set_pixel(x, y + 8, color);
canvas.set_pixel(x, y + 9, color);
canvas.set_pixel(x, y + 10, color);
canvas.set_pixel(x, y + 11, color);
}
- if self.f {
+ if self.contains(SixteenSegmentGlyph::F) {
canvas.set_pixel(x, y + 1, color);
canvas.set_pixel(x, y + 2, color);
canvas.set_pixel(x, y + 3, color);
@@ -968,53 +494,53 @@ impl Glyph for SixteenSegmentGlyph {
canvas.set_pixel(x, y + 5, color);
}
- if self.g1 {
+ if self.contains(SixteenSegmentGlyph::G1) {
canvas.set_pixel(x + 1, y + 6, color);
canvas.set_pixel(x + 2, y + 6, color);
canvas.set_pixel(x + 3, y + 6, color);
}
- if self.g2 {
+ if self.contains(SixteenSegmentGlyph::G2) {
canvas.set_pixel(x + 5, y + 6, color);
canvas.set_pixel(x + 6, y + 6, color);
canvas.set_pixel(x + 7, y + 6, color);
}
- if self.h {
+ if self.contains(SixteenSegmentGlyph::H) {
canvas.set_pixel(x + 1, y + 1, color);
canvas.set_pixel(x + 1, y + 2, color);
canvas.set_pixel(x + 2, y + 3, color);
canvas.set_pixel(x + 3, y + 4, color);
canvas.set_pixel(x + 3, y + 5, color);
}
- if self.i {
+ if self.contains(SixteenSegmentGlyph::I) {
canvas.set_pixel(x + 4, y + 1, color);
canvas.set_pixel(x + 4, y + 2, color);
canvas.set_pixel(x + 4, y + 3, color);
canvas.set_pixel(x + 4, y + 4, color);
canvas.set_pixel(x + 4, y + 5, color);
}
- if self.j {
+ if self.contains(SixteenSegmentGlyph::J) {
canvas.set_pixel(x + 7, y + 1, color);
canvas.set_pixel(x + 7, y + 2, color);
canvas.set_pixel(x + 6, y + 3, color);
canvas.set_pixel(x + 5, y + 4, color);
canvas.set_pixel(x + 5, y + 5, color);
}
- if self.k {
+ if self.contains(SixteenSegmentGlyph::K) {
canvas.set_pixel(x + 3, y + 7, color);
canvas.set_pixel(x + 3, y + 8, color);
canvas.set_pixel(x + 2, y + 9, color);
canvas.set_pixel(x + 1, y + 10, color);
canvas.set_pixel(x + 1, y + 11, color);
}
- if self.l {
+ if self.contains(SixteenSegmentGlyph::L) {
canvas.set_pixel(x + 4, y + 7, color);
canvas.set_pixel(x + 4, y + 8, color);
canvas.set_pixel(x + 4, y + 9, color);
canvas.set_pixel(x + 4, y + 10, color);
canvas.set_pixel(x + 4, y + 11, color);
}
- if self.m {
+ if self.contains(SixteenSegmentGlyph::M) {
canvas.set_pixel(x + 5, y + 7, color);
canvas.set_pixel(x + 5, y + 8, color);
canvas.set_pixel(x + 6, y + 9, color);
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 2a11a68..d0bdad6 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -14,7 +14,7 @@ use rp_pico::{
};
mod drawing;
-use drawing::{Canvas};
+use drawing::Canvas;
mod font;
use font::{Font, Glyph, SixteenSegmentFont};
@@ -31,12 +31,11 @@ const FRAMEBUF: usize = ROWS * COLUMNS * 3;
#[global_allocator]
static HEAP: Heap = Heap::empty();
-
#[entry]
unsafe fn main() -> ! {
{
use core::mem::MaybeUninit;
- const HEAP_SIZE: usize = 16 * 1024;
+ const HEAP_SIZE: usize = 1024;
static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
}
@@ -126,13 +125,6 @@ unsafe fn main() -> ! {
let mut canvas = Canvas::new();
loop {
- {
- let display = display.acquire();
- let _ = led.set_high();
- timer.delay_ms(100);
- display.send_buf(canvas.buf);
- let _ = led.set_low();
- }
/*
draw_seven_segment(0, &mut frame, 0, 0, (255, 255, 255));
@@ -147,8 +139,12 @@ unsafe fn main() -> ! {
draw_seven_segment(9, &mut frame, 63, 0, (255, 255, 255));
*/
- font_sixteen.glyph(' ').draw(&mut canvas, 0, 0, (255, 255, 255));
- font_sixteen.glyph('0').draw(&mut canvas, 11, 0, (255, 255, 255));
+ font_sixteen
+ .glyph(' ')
+ .draw(&mut canvas, 0, 0, (255, 255, 255));
+ font_sixteen
+ .glyph('0')
+ .draw(&mut canvas, 11, 0, (255, 255, 255));
font_sixteen.glyph('1').draw(&mut canvas, 22, 0, (255, 255, 255));
font_sixteen.glyph('2').draw(&mut canvas, 33, 0, (255, 255, 255));
font_sixteen.glyph('3').draw(&mut canvas, 44, 0, (255, 255, 255));
@@ -186,6 +182,14 @@ unsafe fn main() -> ! {
font_sixteen.glyph('X').draw(&mut canvas, 88, 40, (255, 255, 255));
font_sixteen.glyph('Y').draw(&mut canvas, 99, 40, (255, 255, 255));
font_sixteen.glyph('Z').draw(&mut canvas, 110, 40, (255, 255, 255));
+
+ {
+ let display = display.acquire();
+ let _ = led.set_high();
+ timer.delay_ms(100);
+ display.send_buf(canvas.buf);
+ let _ = led.set_low();
+ }
/*
for x in 80..90 {
for y in 155..165 {
@@ -197,4 +201,3 @@ unsafe fn main() -> ! {
timer.delay_ms(1000);
}
}
-
From 8288fdbb6b7a50a87dc966e23b016889b4ba5ea5 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 5 Mar 2025 09:47:00 -0500
Subject: [PATCH 28/34] Refactor the canvas and font
---
pico-st7789/src/{drawing.rs => canvas.rs} | 36 ++--
pico-st7789/src/font/mod.rs | 13 ++
.../src/{font.rs => font/sixteen_segment.rs} | 43 +----
pico-st7789/src/main.rs | 178 ++++++++++++++----
4 files changed, 174 insertions(+), 96 deletions(-)
rename pico-st7789/src/{drawing.rs => canvas.rs} (94%)
create mode 100644 pico-st7789/src/font/mod.rs
rename pico-st7789/src/{font.rs => font/sixteen_segment.rs} (96%)
diff --git a/pico-st7789/src/drawing.rs b/pico-st7789/src/canvas.rs
similarity index 94%
rename from pico-st7789/src/drawing.rs
rename to pico-st7789/src/canvas.rs
index 8917586..e7d6f30 100644
--- a/pico-st7789/src/drawing.rs
+++ b/pico-st7789/src/canvas.rs
@@ -10,28 +10,31 @@
use alloc::collections::btree_map::BTreeMap;
-static mut BUF: [u8; 163200] = [0; 163200];
+/*
+*/
-pub struct Canvas {
- pub buf: &'static mut [u8; 163200],
- pub width: usize,
-}
+pub struct RGB { pub r: u8, pub g: u8, pub b: u8 }
-impl Canvas {
- pub fn new() -> Self {
- Self {
- buf: unsafe { &mut BUF },
- width: 170,
+pub trait Canvas {
+ fn set_pixel(&mut self, x: usize, y: usize, color: &RGB);
+
+ fn square(&mut self, x1: usize, y1: usize, x2: usize, y2: usize, color: &RGB) {
+ for x in x1..x2+1 {
+ self.set_pixel(x, y1, color);
+ }
+ for x in x1..x2+1 {
+ self.set_pixel(x, y2, color);
+ }
+ for y in y1..y2+1 {
+ self.set_pixel(x1, y, color);
+ }
+ for y in y1..y2+1 {
+ self.set_pixel(x2, y, color);
}
}
-
- pub fn set_pixel(&mut self, x: usize, y: usize, color: (u8, u8, u8)) {
- self.buf[(y * self.width + x) * 3 + 0] = color.0 << 2;
- self.buf[(y * self.width + x) * 3 + 1] = color.1 << 2;
- self.buf[(y * self.width + x) * 3 + 2] = color.2 << 2;
- }
}
+/*
pub const DIGIT_WIDTH: usize = 5;
pub const DIGIT_HEIGHT: usize = 9;
@@ -356,3 +359,4 @@ pub fn draw_sixteen_segment(
write_pixel(frame, width, x + 7, y + 11, color);
}
}
+*/
diff --git a/pico-st7789/src/font/mod.rs b/pico-st7789/src/font/mod.rs
new file mode 100644
index 0000000..126176d
--- /dev/null
+++ b/pico-st7789/src/font/mod.rs
@@ -0,0 +1,13 @@
+use crate::canvas::{Canvas, RGB};
+
+mod sixteen_segment;
+pub use sixteen_segment::SixteenSegmentFont;
+
+pub trait Font<A> {
+ fn glyph(&self, c: char) -> &A;
+}
+
+pub trait Glyph {
+ fn draw(&self, canvas: &mut impl Canvas, x: usize, y: usize, color: &RGB);
+}
+
diff --git a/pico-st7789/src/font.rs b/pico-st7789/src/font/sixteen_segment.rs
similarity index 96%
rename from pico-st7789/src/font.rs
rename to pico-st7789/src/font/sixteen_segment.rs
index d4f8b88..44061ce 100644
--- a/pico-st7789/src/font.rs
+++ b/pico-st7789/src/font/sixteen_segment.rs
@@ -1,15 +1,9 @@
use alloc::collections::btree_map::BTreeMap;
use bitflags::bitflags;
-use crate::drawing::Canvas;
+use crate::canvas::{Canvas, RGB};
-pub trait Font<A> {
- fn glyph(&self, c: char) -> &A;
-}
-
-pub trait Glyph {
- fn draw(&self, canvas: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8));
-}
+use super::{Font, Glyph};
// Sixteen Segments
//
@@ -23,28 +17,6 @@ pub trait Glyph {
// ek l mc
// d1 d2
-/*
-pub struct SixteenSegmentGlyph {
- a1: bool,
- a2: bool,
- b: bool,
- c: bool,
- d1: bool,
- d2: bool,
- e: bool,
- f: bool,
- g1: bool,
- g2: bool,
- h: bool,
- i: bool,
- j: bool,
- k: bool,
- l: bool,
- m: bool,
- dot: bool,
-}
-*/
-
bitflags! {
pub struct SixteenSegmentGlyph: u32 {
const NONE = 0;
@@ -68,14 +40,6 @@ bitflags! {
}
}
-/*
-impl Default for SixteenSegmentGlyph {
- fn default() -> Self {
- 0_u32
- }
-}
-*/
-
pub struct SixteenSegmentFont(BTreeMap<char, SixteenSegmentGlyph>);
impl SixteenSegmentFont {
@@ -442,7 +406,7 @@ impl Font<SixteenSegmentGlyph> for SixteenSegmentFont {
}
impl Glyph for SixteenSegmentGlyph {
- fn draw(&self, canvas: &mut Canvas, x: usize, y: usize, color: (u8, u8, u8)) {
+ fn draw(&self, canvas: &mut impl Canvas, x: usize, y: usize, color: &RGB) {
if self.contains(SixteenSegmentGlyph::A1) {
canvas.set_pixel(x + 1, y, color);
canvas.set_pixel(x + 2, y, color);
@@ -549,3 +513,4 @@ impl Glyph for SixteenSegmentGlyph {
}
}
}
+
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index d0bdad6..e404ba7 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -13,8 +13,8 @@ use rp_pico::{
pac, Pins,
};
-mod drawing;
-use drawing::Canvas;
+mod canvas;
+use canvas::{Canvas, RGB};
mod font;
use font::{Font, Glyph, SixteenSegmentFont};
@@ -31,6 +31,30 @@ const FRAMEBUF: usize = ROWS * COLUMNS * 3;
#[global_allocator]
static HEAP: Heap = Heap::empty();
+static mut BUF: [u8; 163200] = [0; 163200];
+
+pub struct FrameBuf {
+ pub buf: &'static mut [u8; 163200],
+ pub width: usize,
+}
+
+impl FrameBuf {
+ pub fn new() -> Self {
+ Self {
+ buf: unsafe { &mut BUF },
+ width: 170,
+ }
+ }
+}
+
+impl Canvas for FrameBuf {
+ fn set_pixel(&mut self, x: usize, y: usize, color: &RGB) {
+ self.buf[(y * self.width + x) * 3 + 0] = color.r << 2;
+ self.buf[(y * self.width + x) * 3 + 1] = color.g << 2;
+ self.buf[(y * self.width + x) * 3 + 2] = color.b << 2;
+ }
+}
+
#[entry]
unsafe fn main() -> ! {
{
@@ -122,10 +146,10 @@ unsafe fn main() -> ! {
let mut framebuf = [0; FRAMEBUF];
let mut canvas = Canvas::new(&mut framebuf, COLUMNS);
*/
- let mut canvas = Canvas::new();
+ let mut canvas = FrameBuf::new();
+ let white = RGB { r: 63, g: 63, b: 63 };
loop {
-
/*
draw_seven_segment(0, &mut frame, 0, 0, (255, 255, 255));
draw_seven_segment(1, &mut frame, 7, 0, (255, 255, 255));
@@ -141,47 +165,119 @@ unsafe fn main() -> ! {
font_sixteen
.glyph(' ')
- .draw(&mut canvas, 0, 0, (255, 255, 255));
+ .draw(&mut canvas, 0, 0, &white);
font_sixteen
.glyph('0')
- .draw(&mut canvas, 11, 0, (255, 255, 255));
- font_sixteen.glyph('1').draw(&mut canvas, 22, 0, (255, 255, 255));
- font_sixteen.glyph('2').draw(&mut canvas, 33, 0, (255, 255, 255));
- font_sixteen.glyph('3').draw(&mut canvas, 44, 0, (255, 255, 255));
- font_sixteen.glyph('4').draw(&mut canvas, 55, 0, (255, 255, 255));
- font_sixteen.glyph('5').draw(&mut canvas, 66, 0, (255, 255, 255));
- font_sixteen.glyph('6').draw(&mut canvas, 77, 0, (255, 255, 255));
- font_sixteen.glyph('7').draw(&mut canvas, 88, 0, (255, 255, 255));
- font_sixteen.glyph('8').draw(&mut canvas, 99, 0, (255, 255, 255));
- font_sixteen.glyph('9').draw(&mut canvas, 110, 0, (255, 255, 255));
+ .draw(&mut canvas, 11, 0, &white);
+ font_sixteen
+ .glyph('1')
+ .draw(&mut canvas, 22, 0, &white);
+ font_sixteen
+ .glyph('2')
+ .draw(&mut canvas, 33, 0, &white);
+ font_sixteen
+ .glyph('3')
+ .draw(&mut canvas, 44, 0, &white);
+ font_sixteen
+ .glyph('4')
+ .draw(&mut canvas, 55, 0, &white);
+ font_sixteen
+ .glyph('5')
+ .draw(&mut canvas, 66, 0, &white);
+ font_sixteen
+ .glyph('6')
+ .draw(&mut canvas, 77, 0, &white);
+ font_sixteen
+ .glyph('7')
+ .draw(&mut canvas, 88, 0, &white);
+ font_sixteen
+ .glyph('8')
+ .draw(&mut canvas, 99, 0, &white);
+ font_sixteen
+ .glyph('9')
+ .draw(&mut canvas, 110, 0, &white);
- font_sixteen.glyph('A').draw(&mut canvas, 0, 20, (255, 255, 255));
- font_sixteen.glyph('B').draw(&mut canvas, 11, 20, (255, 255, 255));
- font_sixteen.glyph('C').draw(&mut canvas, 22, 20, (255, 255, 255));
- font_sixteen.glyph('D').draw(&mut canvas, 33, 20, (255, 255, 255));
- font_sixteen.glyph('E').draw(&mut canvas, 44, 20, (255, 255, 255));
- font_sixteen.glyph('F').draw(&mut canvas, 55, 20, (255, 255, 255));
- font_sixteen.glyph('G').draw(&mut canvas, 66, 20, (255, 255, 255));
- font_sixteen.glyph('H').draw(&mut canvas, 77, 20, (255, 255, 255));
- font_sixteen.glyph('I').draw(&mut canvas, 88, 20, (255, 255, 255));
- font_sixteen.glyph('J').draw(&mut canvas, 99, 20, (255, 255, 255));
- font_sixteen.glyph('K').draw(&mut canvas, 110, 20, (255, 255, 255));
- font_sixteen.glyph('L').draw(&mut canvas, 121, 20, (255, 255, 255));
- font_sixteen.glyph('M').draw(&mut canvas, 132, 20, (255, 255, 255));
- font_sixteen.glyph('N').draw(&mut canvas, 143, 20, (255, 255, 255));
- font_sixteen.glyph('O').draw(&mut canvas, 154, 20, (255, 255, 255));
+ font_sixteen
+ .glyph('A')
+ .draw(&mut canvas, 0, 20, &white);
+ font_sixteen
+ .glyph('B')
+ .draw(&mut canvas, 11, 20, &white);
+ font_sixteen
+ .glyph('C')
+ .draw(&mut canvas, 22, 20, &white);
+ font_sixteen
+ .glyph('D')
+ .draw(&mut canvas, 33, 20, &white);
+ font_sixteen
+ .glyph('E')
+ .draw(&mut canvas, 44, 20, &white);
+ font_sixteen
+ .glyph('F')
+ .draw(&mut canvas, 55, 20, &white);
+ font_sixteen
+ .glyph('G')
+ .draw(&mut canvas, 66, 20, &white);
+ font_sixteen
+ .glyph('H')
+ .draw(&mut canvas, 77, 20, &white);
+ font_sixteen
+ .glyph('I')
+ .draw(&mut canvas, 88, 20, &white);
+ font_sixteen
+ .glyph('J')
+ .draw(&mut canvas, 99, 20, &white);
+ font_sixteen
+ .glyph('K')
+ .draw(&mut canvas, 110, 20, &white);
+ font_sixteen
+ .glyph('L')
+ .draw(&mut canvas, 121, 20, &white);
+ font_sixteen
+ .glyph('M')
+ .draw(&mut canvas, 132, 20, &white);
+ font_sixteen
+ .glyph('N')
+ .draw(&mut canvas, 143, 20, &white);
+ font_sixteen
+ .glyph('O')
+ .draw(&mut canvas, 154, 20, &white);
- font_sixteen.glyph('P').draw(&mut canvas, 0, 40, (255, 255, 255));
- font_sixteen.glyph('Q').draw(&mut canvas, 11, 40, (255, 255, 255));
- font_sixteen.glyph('R').draw(&mut canvas, 22, 40, (255, 255, 255));
- font_sixteen.glyph('S').draw(&mut canvas, 33, 40, (255, 255, 255));
- font_sixteen.glyph('T').draw(&mut canvas, 44, 40, (255, 255, 255));
- font_sixteen.glyph('U').draw(&mut canvas, 55, 40, (255, 255, 255));
- font_sixteen.glyph('V').draw(&mut canvas, 66, 40, (255, 255, 255));
- font_sixteen.glyph('W').draw(&mut canvas, 77, 40, (255, 255, 255));
- font_sixteen.glyph('X').draw(&mut canvas, 88, 40, (255, 255, 255));
- font_sixteen.glyph('Y').draw(&mut canvas, 99, 40, (255, 255, 255));
- font_sixteen.glyph('Z').draw(&mut canvas, 110, 40, (255, 255, 255));
+ font_sixteen
+ .glyph('P')
+ .draw(&mut canvas, 0, 40, &white);
+ font_sixteen
+ .glyph('Q')
+ .draw(&mut canvas, 11, 40, &white);
+ font_sixteen
+ .glyph('R')
+ .draw(&mut canvas, 22, 40, &white);
+ font_sixteen
+ .glyph('S')
+ .draw(&mut canvas, 33, 40, &white);
+ font_sixteen
+ .glyph('T')
+ .draw(&mut canvas, 44, 40, &white);
+ font_sixteen
+ .glyph('U')
+ .draw(&mut canvas, 55, 40, &white);
+ font_sixteen
+ .glyph('V')
+ .draw(&mut canvas, 66, 40, &white);
+ font_sixteen
+ .glyph('W')
+ .draw(&mut canvas, 77, 40, &white);
+ font_sixteen
+ .glyph('X')
+ .draw(&mut canvas, 88, 40, &white);
+ font_sixteen
+ .glyph('Y')
+ .draw(&mut canvas, 99, 40, &white);
+ font_sixteen
+ .glyph('Z')
+ .draw(&mut canvas, 110, 40, &white);
+
+ canvas.square(10, 70, 160, 310, &white);
{
let display = display.acquire();
From b444326c1c418e05217dc57761aed0c0b70d9d7a Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 5 Mar 2025 09:48:33 -0500
Subject: [PATCH 29/34] Add a link to the sixteen-segment font source
---
pico-st7789/src/font/sixteen_segment.rs | 1 +
1 file changed, 1 insertion(+)
diff --git a/pico-st7789/src/font/sixteen_segment.rs b/pico-st7789/src/font/sixteen_segment.rs
index 44061ce..fe021ff 100644
--- a/pico-st7789/src/font/sixteen_segment.rs
+++ b/pico-st7789/src/font/sixteen_segment.rs
@@ -6,6 +6,7 @@ use crate::canvas::{Canvas, RGB};
use super::{Font, Glyph};
// Sixteen Segments
+// https://www.partsnotincluded.com/segmented-led-display-ascii-library/
//
// a1 a2
// f h i jb
From bc9e24c0c95c78d62d4c358f790a268e34e05f08 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 5 Mar 2025 09:58:42 -0500
Subject: [PATCH 30/34] Remove dead code
---
pico-st7789/src/canvas.rs | 237 --------------------------------------
1 file changed, 237 deletions(-)
diff --git a/pico-st7789/src/canvas.rs b/pico-st7789/src/canvas.rs
index e7d6f30..cb2d05b 100644
--- a/pico-st7789/src/canvas.rs
+++ b/pico-st7789/src/canvas.rs
@@ -122,241 +122,4 @@ pub fn draw_seven_segment(
write_pixel(frame, width, x + 3, y + 4, color);
}
}
-
-// Sixteen Segments
-//
-// a1 a2
-// f h i jb
-// f i j b
-// f hij b
-// g1 g2
-// e klm c
-// e k l m c
-// ek l mc
-// d1 d2
-
-pub struct SixteenSegment {
- a1: bool,
- a2: bool,
- b: bool,
- c: bool,
- d1: bool,
- d2: bool,
- e: bool,
- f: bool,
- g1: bool,
- g2: bool,
- h: bool,
- i: bool,
- j: bool,
- k: bool,
- l: bool,
- m: bool,
-}
-
-pub fn sixteen_segment_font() -> BTreeMap<char, SixteenSegment> {
- let mut font = BTreeMap::new();
- font.insert(
- '*',
- SixteenSegment {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: true,
- g2: true,
- h: true,
- i: true,
- j: true,
- k: true,
- l: true,
- m: true,
- },
- );
- font.insert(
- '0',
- SixteenSegment {
- a1: true,
- a2: true,
- b: true,
- c: true,
- d1: true,
- d2: true,
- e: true,
- f: true,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: false,
- k: false,
- l: false,
- m: false,
- },
- );
- font.insert(
- '1',
- SixteenSegment {
- a1: false,
- a2: false,
- b: true,
- c: true,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: false,
- l: false,
- m: false,
- },
- );
- font.insert(
- '2',
- SixteenSegment {
- a1: true,
- a2: true,
- b: false,
- c: false,
- d1: false,
- d2: false,
- e: false,
- f: false,
- g1: false,
- g2: false,
- h: false,
- i: false,
- j: true,
- k: false,
- l: false,
- m: false,
- },
- );
-
- font
-}
-
-pub fn draw_sixteen_segment(
- c: char,
- font: &BTreeMap<char, SixteenSegment>,
- frame: &mut [u8],
- width: usize,
- x: usize,
- y: usize,
- color: (u8, u8, u8),
-) {
- let segments = font.get(&c).unwrap();
- if segments.a1 {
- write_pixel(frame, width, x + 1, y, color);
- write_pixel(frame, width, x + 2, y, color);
- write_pixel(frame, width, x + 3, y, color);
- }
- if segments.a2 {
- write_pixel(frame, width, x + 5, y, color);
- write_pixel(frame, width, x + 6, y, color);
- write_pixel(frame, width, x + 7, y, color);
- }
- if segments.b {
- write_pixel(frame, width, x + 8, y + 1, color);
- write_pixel(frame, width, x + 8, y + 2, color);
- write_pixel(frame, width, x + 8, y + 3, color);
- write_pixel(frame, width, x + 8, y + 4, color);
- write_pixel(frame, width, x + 8, y + 5, color);
- }
- if segments.c {
- write_pixel(frame, width, x + 8, y + 7, color);
- write_pixel(frame, width, x + 8, y + 8, color);
- write_pixel(frame, width, x + 8, y + 9, color);
- write_pixel(frame, width, x + 8, y + 10, color);
- write_pixel(frame, width, x + 8, y + 11, color);
- }
-
- if segments.d1 {
- write_pixel(frame, width, x + 1, y + 12, color);
- write_pixel(frame, width, x + 2, y + 12, color);
- write_pixel(frame, width, x + 3, y + 12, color);
- }
- if segments.d2 {
- write_pixel(frame, width, x + 5, y + 12, color);
- write_pixel(frame, width, x + 6, y + 12, color);
- write_pixel(frame, width, x + 7, y + 12, color);
- }
-
- if segments.e {
- write_pixel(frame, width, x, y + 7, color);
- write_pixel(frame, width, x, y + 8, color);
- write_pixel(frame, width, x, y + 9, color);
- write_pixel(frame, width, x, y + 10, color);
- write_pixel(frame, width, x, y + 11, color);
- }
- if segments.f {
- write_pixel(frame, width, x, y + 1, color);
- write_pixel(frame, width, x, y + 2, color);
- write_pixel(frame, width, x, y + 3, color);
- write_pixel(frame, width, x, y + 4, color);
- write_pixel(frame, width, x, y + 5, color);
- }
-
- if segments.g1 {
- write_pixel(frame, width, x + 1, y + 6, color);
- write_pixel(frame, width, x + 2, y + 6, color);
- write_pixel(frame, width, x + 3, y + 6, color);
- }
- if segments.g2 {
- write_pixel(frame, width, x + 5, y + 6, color);
- write_pixel(frame, width, x + 6, y + 6, color);
- write_pixel(frame, width, x + 7, y + 6, color);
- }
-
- if segments.h {
- write_pixel(frame, width, x + 1, y + 1, color);
- write_pixel(frame, width, x + 1, y + 2, color);
- write_pixel(frame, width, x + 2, y + 3, color);
- write_pixel(frame, width, x + 3, y + 4, color);
- write_pixel(frame, width, x + 3, y + 5, color);
- }
- if segments.i {
- write_pixel(frame, width, x + 4, y + 1, color);
- write_pixel(frame, width, x + 4, y + 2, color);
- write_pixel(frame, width, x + 4, y + 3, color);
- write_pixel(frame, width, x + 4, y + 4, color);
- write_pixel(frame, width, x + 4, y + 5, color);
- }
- if segments.j {
- write_pixel(frame, width, x + 7, y + 1, color);
- write_pixel(frame, width, x + 7, y + 2, color);
- write_pixel(frame, width, x + 6, y + 3, color);
- write_pixel(frame, width, x + 5, y + 4, color);
- write_pixel(frame, width, x + 5, y + 5, color);
- }
- if segments.k {
- write_pixel(frame, width, x + 3, y + 7, color);
- write_pixel(frame, width, x + 3, y + 8, color);
- write_pixel(frame, width, x + 2, y + 9, color);
- write_pixel(frame, width, x + 1, y + 10, color);
- write_pixel(frame, width, x + 1, y + 11, color);
- }
- if segments.l {
- write_pixel(frame, width, x + 4, y + 7, color);
- write_pixel(frame, width, x + 4, y + 8, color);
- write_pixel(frame, width, x + 4, y + 9, color);
- write_pixel(frame, width, x + 4, y + 10, color);
- write_pixel(frame, width, x + 4, y + 11, color);
- }
- if segments.m {
- write_pixel(frame, width, x + 5, y + 7, color);
- write_pixel(frame, width, x + 5, y + 8, color);
- write_pixel(frame, width, x + 6, y + 9, color);
- write_pixel(frame, width, x + 7, y + 10, color);
- write_pixel(frame, width, x + 7, y + 11, color);
- }
-}
*/
From 958d18b9a8ddc904cc99a39b1fb3a2aa7c60468c Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Fri, 7 Mar 2025 18:48:56 -0500
Subject: [PATCH 31/34] Set up the seven segment font
---
pico-st7789/src/canvas.rs | 94 -----------
pico-st7789/src/font/mod.rs | 4 +
pico-st7789/src/font/seven_segment.rs | 211 ++++++++++++++++++++++++
pico-st7789/src/font/sixteen_segment.rs | 4 +
pico-st7789/src/main.rs | 130 ++++++++++-----
5 files changed, 311 insertions(+), 132 deletions(-)
create mode 100644 pico-st7789/src/font/seven_segment.rs
diff --git a/pico-st7789/src/canvas.rs b/pico-st7789/src/canvas.rs
index cb2d05b..b154ebf 100644
--- a/pico-st7789/src/canvas.rs
+++ b/pico-st7789/src/canvas.rs
@@ -8,11 +8,6 @@
// e c
// d d d
-use alloc::collections::btree_map::BTreeMap;
-
-/*
-*/
-
pub struct RGB { pub r: u8, pub g: u8, pub b: u8 }
pub trait Canvas {
@@ -34,92 +29,3 @@ pub trait Canvas {
}
}
-/*
-pub const DIGIT_WIDTH: usize = 5;
-pub const DIGIT_HEIGHT: usize = 9;
-
-pub const ZERO_SEVEN_SEGMENT: [bool; 7] = [true, true, true, true, true, true, false];
-
-pub const ONE_SEVEN_SEGMENT: [bool; 7] = [false, true, true, false, false, false, false];
-
-pub const TWO_SEVEN_SEGMENT: [bool; 7] = [true, true, false, true, true, false, true];
-
-pub const THREE_SEVEN_SEGMENT: [bool; 7] = [true, true, true, true, false, false, true];
-
-pub const FOUR_SEVEN_SEGMENT: [bool; 7] = [false, true, true, false, false, true, true];
-
-pub const FIVE_SEVEN_SEGMENT: [bool; 7] = [true, false, true, true, false, true, true];
-
-pub const SIX_SEVEN_SEGMENT: [bool; 7] = [true, false, true, true, true, true, true];
-
-pub const SEVEN_SEVEN_SEGMENT: [bool; 7] = [true, true, true, false, false, false, false];
-
-pub const EIGHT_SEVEN_SEGMENT: [bool; 7] = [true, true, true, true, true, true, true];
-
-pub const NINE_SEVEN_SEGMENT: [bool; 7] = [true, true, true, false, false, true, true];
-
-pub const SEVEN_SEGMENT_FONT: [[bool; 7]; 10] = [
- ZERO_SEVEN_SEGMENT,
- ONE_SEVEN_SEGMENT,
- TWO_SEVEN_SEGMENT,
- THREE_SEVEN_SEGMENT,
- FOUR_SEVEN_SEGMENT,
- FIVE_SEVEN_SEGMENT,
- SIX_SEVEN_SEGMENT,
- SEVEN_SEVEN_SEGMENT,
- EIGHT_SEVEN_SEGMENT,
- NINE_SEVEN_SEGMENT,
-];
-
-pub fn write_pixel(framebuf: &mut [u8], width: usize, x: usize, y: usize, color: (u8, u8, u8)) {
- framebuf[(y * width + x) * 3 + 0] = color.0 << 2;
- framebuf[(y * width + x) * 3 + 1] = color.1 << 2;
- framebuf[(y * width + x) * 3 + 2] = color.2 << 2;
-}
-
-pub fn draw_seven_segment(
- digit: u8,
- frame: &mut [u8],
- width: usize,
- x: usize,
- y: usize,
- color: (u8, u8, u8),
-) {
- let segments = SEVEN_SEGMENT_FONT[digit as usize];
- if segments[0] {
- write_pixel(frame, width, x + 1, y, color);
- write_pixel(frame, width, x + 2, y, color);
- write_pixel(frame, width, x + 3, y, color);
- }
- if segments[1] {
- write_pixel(frame, width, x + 4, y + 1, color);
- write_pixel(frame, width, x + 4, y + 2, color);
- write_pixel(frame, width, x + 4, y + 3, color);
- }
- if segments[2] {
- write_pixel(frame, width, x + 4, y + 5, color);
- write_pixel(frame, width, x + 4, y + 6, color);
- write_pixel(frame, width, x + 4, y + 7, color);
- }
- if segments[3] {
- write_pixel(frame, width, x + 1, y + 8, color);
- write_pixel(frame, width, x + 2, y + 8, color);
- write_pixel(frame, width, x + 3, y + 8, color);
- }
- if segments[4] {
- write_pixel(frame, width, x, y + 5, color);
- write_pixel(frame, width, x, y + 6, color);
- write_pixel(frame, width, x, y + 7, color);
- }
- if segments[5] {
- write_pixel(frame, width, x, y + 1, color);
- write_pixel(frame, width, x, y + 2, color);
- write_pixel(frame, width, x, y + 3, color);
- }
- if segments[6] {
- write_pixel(frame, width, x + 1, y + 4, color);
- write_pixel(frame, width, x + 2, y + 4, color);
- write_pixel(frame, width, x + 3, y + 4, color);
- }
-}
-*/
diff --git a/pico-st7789/src/font/mod.rs b/pico-st7789/src/font/mod.rs
index 126176d..3886765 100644
--- a/pico-st7789/src/font/mod.rs
+++ b/pico-st7789/src/font/mod.rs
@@ -1,5 +1,8 @@
use crate::canvas::{Canvas, RGB};
+mod seven_segment;
+pub use seven_segment::SevenSegmentFont;
+
mod sixteen_segment;
pub use sixteen_segment::SixteenSegmentFont;
@@ -9,5 +12,6 @@ pub trait Font<A> {
pub trait Glyph {
fn draw(&self, canvas: &mut impl Canvas, x: usize, y: usize, color: &RGB);
+ fn extents(&self) -> (usize, usize);
}
diff --git a/pico-st7789/src/font/seven_segment.rs b/pico-st7789/src/font/seven_segment.rs
new file mode 100644
index 0000000..94dd8cd
--- /dev/null
+++ b/pico-st7789/src/font/seven_segment.rs
@@ -0,0 +1,211 @@
+use alloc::collections::btree_map::BTreeMap;
+use bitflags::bitflags;
+
+use crate::canvas::{Canvas, RGB};
+
+use super::{Font, Glyph};
+
+// Seven Segments
+//
+// a a a
+// f b
+// f b
+// f b
+// g g g
+// e c
+// e c
+// e c
+// d d d
+
+bitflags! {
+ pub struct SevenSegmentGlyph: u8 {
+ const NONE = 0;
+ const A = 0x01;
+ const B = 0x01 << 1;
+ const C = 0x01 << 2;
+ const D = 0x01 << 3;
+ const E = 0x01 << 4;
+ const F = 0x01 << 5;
+ const G = 0x01 << 6;
+ const DOT = 0x01 << 7;
+ }
+}
+
+pub struct SevenSegmentFont(BTreeMap<char, SevenSegmentGlyph>);
+
+impl SevenSegmentFont {
+ pub fn new() -> Self {
+ let mut font = BTreeMap::new();
+ font.insert(' ', SevenSegmentGlyph::NONE);
+ font.insert(
+ '0',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F,
+ );
+ font.insert('1', SevenSegmentGlyph::B | SevenSegmentGlyph::C);
+ font.insert(
+ '2',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::B
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ '3',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::G
+ | SevenSegmentGlyph::D,
+ );
+ font.insert(
+ '4',
+ SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ '5',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ '6',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::D,
+ );
+ font.insert(
+ '7',
+ SevenSegmentGlyph::A | SevenSegmentGlyph::B | SevenSegmentGlyph::C,
+ );
+ font.insert(
+ '8',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ '9',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ 'A',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ 'B',
+ SevenSegmentGlyph::C
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ 'C',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F,
+ );
+ font.insert(
+ 'D',
+ SevenSegmentGlyph::B
+ | SevenSegmentGlyph::C
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ 'E',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::D
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ font.insert(
+ 'F',
+ SevenSegmentGlyph::A
+ | SevenSegmentGlyph::E
+ | SevenSegmentGlyph::F
+ | SevenSegmentGlyph::G,
+ );
+ Self(font)
+ }
+}
+
+impl Font<SevenSegmentGlyph> for SevenSegmentFont {
+ fn glyph(&self, c: char) -> &SevenSegmentGlyph {
+ self.0.get(&c).unwrap()
+ }
+}
+
+impl Glyph for SevenSegmentGlyph {
+ fn draw(&self, canvas: &mut impl Canvas, x: usize, y: usize, color: &RGB) {
+ if self.contains(SevenSegmentGlyph::A) {
+ canvas.set_pixel(x + 1, y, color);
+ canvas.set_pixel(x + 2, y, color);
+ canvas.set_pixel(x + 3, y, color);
+ }
+ if self.contains(SevenSegmentGlyph::B) {
+ canvas.set_pixel(x + 4, y + 1, color);
+ canvas.set_pixel(x + 4, y + 2, color);
+ canvas.set_pixel(x + 4, y + 3, color);
+ }
+ if self.contains(SevenSegmentGlyph::C) {
+ canvas.set_pixel(x + 4, y + 5, color);
+ canvas.set_pixel(x + 4, y + 6, color);
+ canvas.set_pixel(x + 4, y + 7, color);
+ }
+ if self.contains(SevenSegmentGlyph::D) {
+ canvas.set_pixel(x + 1, y + 8, color);
+ canvas.set_pixel(x + 2, y + 8, color);
+ canvas.set_pixel(x + 3, y + 8, color);
+ }
+ if self.contains(SevenSegmentGlyph::E) {
+ canvas.set_pixel(x, y + 5, color);
+ canvas.set_pixel(x, y + 6, color);
+ canvas.set_pixel(x, y + 7, color);
+ }
+ if self.contains(SevenSegmentGlyph::F) {
+ canvas.set_pixel(x, y + 1, color);
+ canvas.set_pixel(x, y + 2, color);
+ canvas.set_pixel(x, y + 3, color);
+ }
+ if self.contains(SevenSegmentGlyph::G) {
+ canvas.set_pixel(x + 1, y + 4, color);
+ canvas.set_pixel(x + 2, y + 4, color);
+ canvas.set_pixel(x + 3, y + 4, color);
+ }
+ }
+
+ fn extents(&self) -> (usize, usize) {
+ (5, 8)
+ }
+}
diff --git a/pico-st7789/src/font/sixteen_segment.rs b/pico-st7789/src/font/sixteen_segment.rs
index fe021ff..62e1285 100644
--- a/pico-st7789/src/font/sixteen_segment.rs
+++ b/pico-st7789/src/font/sixteen_segment.rs
@@ -513,5 +513,9 @@ impl Glyph for SixteenSegmentGlyph {
canvas.set_pixel(x + 7, y + 11, color);
}
}
+
+ fn extents(&self) -> (usize, usize) {
+ (8, 12)
+ }
}
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index e404ba7..68b0554 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -17,7 +17,7 @@ mod canvas;
use canvas::{Canvas, RGB};
mod font;
-use font::{Font, Glyph, SixteenSegmentFont};
+use font::{Font, Glyph, SevenSegmentFont, SixteenSegmentFont};
mod st7789;
use st7789::{ST7789Display, SETUP_PROGRAM};
@@ -64,6 +64,7 @@ unsafe fn main() -> ! {
unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
}
+ let font_seven = SevenSegmentFont::new();
let font_sixteen = SixteenSegmentFont::new();
// rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
@@ -163,119 +164,172 @@ unsafe fn main() -> ! {
draw_seven_segment(9, &mut frame, 63, 0, (255, 255, 255));
*/
- font_sixteen
+ font_seven
.glyph(' ')
.draw(&mut canvas, 0, 0, &white);
- font_sixteen
+ font_seven
.glyph('0')
.draw(&mut canvas, 11, 0, &white);
- font_sixteen
+ font_seven
.glyph('1')
.draw(&mut canvas, 22, 0, &white);
- font_sixteen
+ font_seven
.glyph('2')
.draw(&mut canvas, 33, 0, &white);
- font_sixteen
+ font_seven
.glyph('3')
.draw(&mut canvas, 44, 0, &white);
- font_sixteen
+ font_seven
.glyph('4')
.draw(&mut canvas, 55, 0, &white);
- font_sixteen
+ font_seven
.glyph('5')
.draw(&mut canvas, 66, 0, &white);
- font_sixteen
+ font_seven
.glyph('6')
.draw(&mut canvas, 77, 0, &white);
- font_sixteen
+ font_seven
.glyph('7')
.draw(&mut canvas, 88, 0, &white);
- font_sixteen
+ font_seven
.glyph('8')
.draw(&mut canvas, 99, 0, &white);
- font_sixteen
+ font_seven
.glyph('9')
.draw(&mut canvas, 110, 0, &white);
- font_sixteen
+ font_seven
.glyph('A')
+ .draw(&mut canvas, 121, 0, &white);
+ font_seven
+ .glyph('B')
+ .draw(&mut canvas, 132, 0, &white);
+ font_seven
+ .glyph('C')
+ .draw(&mut canvas, 143, 0, &white);
+ font_seven
+ .glyph('D')
+ .draw(&mut canvas, 154, 0, &white);
+ font_seven
+ .glyph('E')
+ .draw(&mut canvas, 165, 0, &white);
+ font_seven
+ .glyph('F')
+ .draw(&mut canvas, 0, 20, &white);
+
+ font_sixteen
+ .glyph(' ')
.draw(&mut canvas, 0, 20, &white);
font_sixteen
- .glyph('B')
+ .glyph('0')
.draw(&mut canvas, 11, 20, &white);
font_sixteen
- .glyph('C')
+ .glyph('1')
.draw(&mut canvas, 22, 20, &white);
font_sixteen
- .glyph('D')
+ .glyph('2')
.draw(&mut canvas, 33, 20, &white);
font_sixteen
- .glyph('E')
+ .glyph('3')
.draw(&mut canvas, 44, 20, &white);
font_sixteen
- .glyph('F')
+ .glyph('4')
.draw(&mut canvas, 55, 20, &white);
font_sixteen
- .glyph('G')
+ .glyph('5')
.draw(&mut canvas, 66, 20, &white);
font_sixteen
- .glyph('H')
+ .glyph('6')
.draw(&mut canvas, 77, 20, &white);
font_sixteen
- .glyph('I')
+ .glyph('7')
.draw(&mut canvas, 88, 20, &white);
font_sixteen
- .glyph('J')
+ .glyph('8')
.draw(&mut canvas, 99, 20, &white);
font_sixteen
- .glyph('K')
+ .glyph('9')
.draw(&mut canvas, 110, 20, &white);
+
+ font_sixteen
+ .glyph('A')
+ .draw(&mut canvas, 0, 40, &white);
+ font_sixteen
+ .glyph('B')
+ .draw(&mut canvas, 11, 40, &white);
+ font_sixteen
+ .glyph('C')
+ .draw(&mut canvas, 22, 40, &white);
+ font_sixteen
+ .glyph('D')
+ .draw(&mut canvas, 33, 40, &white);
+ font_sixteen
+ .glyph('E')
+ .draw(&mut canvas, 44, 40, &white);
+ font_sixteen
+ .glyph('F')
+ .draw(&mut canvas, 55, 40, &white);
+ font_sixteen
+ .glyph('G')
+ .draw(&mut canvas, 66, 40, &white);
+ font_sixteen
+ .glyph('H')
+ .draw(&mut canvas, 77, 40, &white);
+ font_sixteen
+ .glyph('I')
+ .draw(&mut canvas, 88, 40, &white);
+ font_sixteen
+ .glyph('J')
+ .draw(&mut canvas, 99, 40, &white);
+ font_sixteen
+ .glyph('K')
+ .draw(&mut canvas, 110, 40, &white);
font_sixteen
.glyph('L')
- .draw(&mut canvas, 121, 20, &white);
+ .draw(&mut canvas, 121, 40, &white);
font_sixteen
.glyph('M')
- .draw(&mut canvas, 132, 20, &white);
+ .draw(&mut canvas, 132, 40, &white);
font_sixteen
.glyph('N')
- .draw(&mut canvas, 143, 20, &white);
+ .draw(&mut canvas, 143, 40, &white);
font_sixteen
.glyph('O')
- .draw(&mut canvas, 154, 20, &white);
+ .draw(&mut canvas, 154, 40, &white);
font_sixteen
.glyph('P')
- .draw(&mut canvas, 0, 40, &white);
+ .draw(&mut canvas, 0, 60, &white);
font_sixteen
.glyph('Q')
- .draw(&mut canvas, 11, 40, &white);
+ .draw(&mut canvas, 11, 60, &white);
font_sixteen
.glyph('R')
- .draw(&mut canvas, 22, 40, &white);
+ .draw(&mut canvas, 22, 60, &white);
font_sixteen
.glyph('S')
- .draw(&mut canvas, 33, 40, &white);
+ .draw(&mut canvas, 33, 60, &white);
font_sixteen
.glyph('T')
- .draw(&mut canvas, 44, 40, &white);
+ .draw(&mut canvas, 44, 60, &white);
font_sixteen
.glyph('U')
- .draw(&mut canvas, 55, 40, &white);
+ .draw(&mut canvas, 55, 60, &white);
font_sixteen
.glyph('V')
- .draw(&mut canvas, 66, 40, &white);
+ .draw(&mut canvas, 66, 60, &white);
font_sixteen
.glyph('W')
- .draw(&mut canvas, 77, 40, &white);
+ .draw(&mut canvas, 77, 60, &white);
font_sixteen
.glyph('X')
- .draw(&mut canvas, 88, 40, &white);
+ .draw(&mut canvas, 88, 60, &white);
font_sixteen
.glyph('Y')
- .draw(&mut canvas, 99, 40, &white);
+ .draw(&mut canvas, 99, 60, &white);
font_sixteen
.glyph('Z')
- .draw(&mut canvas, 110, 40, &white);
+ .draw(&mut canvas, 110, 60, &white);
canvas.square(10, 70, 160, 310, &white);
From 9175b9d4ccb57aa58d0cb72f3301c036432800fe Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Fri, 7 Mar 2025 22:23:03 -0500
Subject: [PATCH 32/34] Create a print function and fill out more
sixteen-segment glyphs
---
pico-st7789/src/canvas.rs | 33 +++-
pico-st7789/src/font/sixteen_segment.rs | 174 +++++++++++++++++++++-
pico-st7789/src/main.rs | 190 +-----------------------
3 files changed, 207 insertions(+), 190 deletions(-)
diff --git a/pico-st7789/src/canvas.rs b/pico-st7789/src/canvas.rs
index b154ebf..a695b86 100644
--- a/pico-st7789/src/canvas.rs
+++ b/pico-st7789/src/canvas.rs
@@ -8,24 +8,47 @@
// e c
// d d d
-pub struct RGB { pub r: u8, pub g: u8, pub b: u8 }
+use crate::font::{Font, Glyph};
+
+pub struct RGB {
+ pub r: u8,
+ pub g: u8,
+ pub b: u8,
+}
pub trait Canvas {
fn set_pixel(&mut self, x: usize, y: usize, color: &RGB);
fn square(&mut self, x1: usize, y1: usize, x2: usize, y2: usize, color: &RGB) {
- for x in x1..x2+1 {
+ for x in x1..x2 + 1 {
self.set_pixel(x, y1, color);
}
- for x in x1..x2+1 {
+ for x in x1..x2 + 1 {
self.set_pixel(x, y2, color);
}
- for y in y1..y2+1 {
+ for y in y1..y2 + 1 {
self.set_pixel(x1, y, color);
}
- for y in y1..y2+1 {
+ for y in y1..y2 + 1 {
self.set_pixel(x2, y, color);
}
}
}
+pub fn print<A>(
+ canvas: &mut impl Canvas,
+ font: &impl Font<A>,
+ sx: usize,
+ sy: usize,
+ text: &str,
+ color: &RGB,
+) where
+ A: Glyph,
+{
+ let mut x = sx;
+ for c in text.chars().map(|c| font.glyph(c)) {
+ c.draw(canvas, x, sy, color);
+ let (dx, _) = c.extents();
+ x = x + dx + 1;
+ }
+}
diff --git a/pico-st7789/src/font/sixteen_segment.rs b/pico-st7789/src/font/sixteen_segment.rs
index 62e1285..eb8cb29 100644
--- a/pico-st7789/src/font/sixteen_segment.rs
+++ b/pico-st7789/src/font/sixteen_segment.rs
@@ -396,13 +396,182 @@ impl SixteenSegmentFont {
| SixteenSegmentGlyph::J
| SixteenSegmentGlyph::K,
);
+
+ font.insert(
+ 'a',
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'b',
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'c',
+ SixteenSegmentGlyph::D1 | SixteenSegmentGlyph::E | SixteenSegmentGlyph::G1,
+ );
+ font.insert(
+ 'd',
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::G2
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'e',
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::K,
+ );
+ font.insert(
+ 'f',
+ SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'g',
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'h',
+ SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert('i', SixteenSegmentGlyph::L);
+ font.insert(
+ 'j',
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'k',
+ SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::L
+ | SixteenSegmentGlyph::M,
+ );
+ font.insert('l', SixteenSegmentGlyph::E | SixteenSegmentGlyph::F);
+ font.insert(
+ 'm',
+ SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::L
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::G2,
+ );
+ font.insert(
+ 'n',
+ SixteenSegmentGlyph::E | SixteenSegmentGlyph::L | SixteenSegmentGlyph::G1,
+ );
+ font.insert(
+ 'o',
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 'p',
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::I,
+ );
+ font.insert(
+ 'q',
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert('r', SixteenSegmentGlyph::E | SixteenSegmentGlyph::G1);
+ font.insert(
+ 's',
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1
+ | SixteenSegmentGlyph::L,
+ );
+ font.insert(
+ 't',
+ SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G1,
+ );
+ font.insert(
+ 'u',
+ SixteenSegmentGlyph::D1 | SixteenSegmentGlyph::E | SixteenSegmentGlyph::L,
+ );
+ font.insert('v', SixteenSegmentGlyph::E | SixteenSegmentGlyph::K);
+ font.insert(
+ 'w',
+ SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::K
+ | SixteenSegmentGlyph::M,
+ );
+ font.insert(
+ 'x',
+ SixteenSegmentGlyph::H
+ | SixteenSegmentGlyph::J
+ | SixteenSegmentGlyph::K
+ | SixteenSegmentGlyph::M,
+ );
+ font.insert(
+ 'y',
+ SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::C
+ | SixteenSegmentGlyph::I
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::G2,
+ );
+ font.insert(
+ 'z',
+ SixteenSegmentGlyph::D1 | SixteenSegmentGlyph::G1 | SixteenSegmentGlyph::K,
+ );
+ font.insert(
+ '@',
+ SixteenSegmentGlyph::A1
+ | SixteenSegmentGlyph::A2
+ | SixteenSegmentGlyph::B
+ | SixteenSegmentGlyph::D1
+ | SixteenSegmentGlyph::D2
+ | SixteenSegmentGlyph::E
+ | SixteenSegmentGlyph::F
+ | SixteenSegmentGlyph::G2,
+ );
Self(font)
}
}
impl Font<SixteenSegmentGlyph> for SixteenSegmentFont {
fn glyph(&self, c: char) -> &SixteenSegmentGlyph {
- self.0.get(&c).unwrap()
+ self.0.get(&c).unwrap_or(&SixteenSegmentGlyph::NONE)
}
}
@@ -515,7 +684,6 @@ impl Glyph for SixteenSegmentGlyph {
}
fn extents(&self) -> (usize, usize) {
- (8, 12)
+ (9, 13)
}
}
-
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 68b0554..79da94f 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -14,7 +14,7 @@ use rp_pico::{
};
mod canvas;
-use canvas::{Canvas, RGB};
+use canvas::{Canvas, RGB, print};
mod font;
use font::{Font, Glyph, SevenSegmentFont, SixteenSegmentFont};
@@ -64,7 +64,6 @@ unsafe fn main() -> ! {
unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
}
- let font_seven = SevenSegmentFont::new();
let font_sixteen = SixteenSegmentFont::new();
// rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
@@ -151,187 +150,14 @@ unsafe fn main() -> ! {
let white = RGB { r: 63, g: 63, b: 63 };
loop {
- /*
- draw_seven_segment(0, &mut frame, 0, 0, (255, 255, 255));
- draw_seven_segment(1, &mut frame, 7, 0, (255, 255, 255));
- draw_seven_segment(2, &mut frame, 14, 0, (255, 255, 255));
- draw_seven_segment(3, &mut frame, 21, 0, (255, 255, 255));
- draw_seven_segment(4, &mut frame, 28, 0, (255, 255, 255));
- draw_seven_segment(5, &mut frame, 35, 0, (255, 255, 255));
- draw_seven_segment(6, &mut frame, 42, 0, (255, 255, 255));
- draw_seven_segment(7, &mut frame, 49, 0, (255, 255, 255));
- draw_seven_segment(8, &mut frame, 56, 0, (255, 255, 255));
- draw_seven_segment(9, &mut frame, 63, 0, (255, 255, 255));
- */
+ print(&mut canvas, &font_sixteen, 1, 1, " !\"#$%&'<>*+,-./", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_sixteen, 1, 21, "0123456789| = ?", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_sixteen, 1, 41, "@ABCDEFGHIJKLMNO", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_sixteen, 1, 61, "PQRSTUVWXYZ[\\]^_", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_sixteen, 1, 81, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_sixteen, 1, 101, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
- font_seven
- .glyph(' ')
- .draw(&mut canvas, 0, 0, &white);
- font_seven
- .glyph('0')
- .draw(&mut canvas, 11, 0, &white);
- font_seven
- .glyph('1')
- .draw(&mut canvas, 22, 0, &white);
- font_seven
- .glyph('2')
- .draw(&mut canvas, 33, 0, &white);
- font_seven
- .glyph('3')
- .draw(&mut canvas, 44, 0, &white);
- font_seven
- .glyph('4')
- .draw(&mut canvas, 55, 0, &white);
- font_seven
- .glyph('5')
- .draw(&mut canvas, 66, 0, &white);
- font_seven
- .glyph('6')
- .draw(&mut canvas, 77, 0, &white);
- font_seven
- .glyph('7')
- .draw(&mut canvas, 88, 0, &white);
- font_seven
- .glyph('8')
- .draw(&mut canvas, 99, 0, &white);
- font_seven
- .glyph('9')
- .draw(&mut canvas, 110, 0, &white);
-
- font_seven
- .glyph('A')
- .draw(&mut canvas, 121, 0, &white);
- font_seven
- .glyph('B')
- .draw(&mut canvas, 132, 0, &white);
- font_seven
- .glyph('C')
- .draw(&mut canvas, 143, 0, &white);
- font_seven
- .glyph('D')
- .draw(&mut canvas, 154, 0, &white);
- font_seven
- .glyph('E')
- .draw(&mut canvas, 165, 0, &white);
- font_seven
- .glyph('F')
- .draw(&mut canvas, 0, 20, &white);
-
- font_sixteen
- .glyph(' ')
- .draw(&mut canvas, 0, 20, &white);
- font_sixteen
- .glyph('0')
- .draw(&mut canvas, 11, 20, &white);
- font_sixteen
- .glyph('1')
- .draw(&mut canvas, 22, 20, &white);
- font_sixteen
- .glyph('2')
- .draw(&mut canvas, 33, 20, &white);
- font_sixteen
- .glyph('3')
- .draw(&mut canvas, 44, 20, &white);
- font_sixteen
- .glyph('4')
- .draw(&mut canvas, 55, 20, &white);
- font_sixteen
- .glyph('5')
- .draw(&mut canvas, 66, 20, &white);
- font_sixteen
- .glyph('6')
- .draw(&mut canvas, 77, 20, &white);
- font_sixteen
- .glyph('7')
- .draw(&mut canvas, 88, 20, &white);
- font_sixteen
- .glyph('8')
- .draw(&mut canvas, 99, 20, &white);
- font_sixteen
- .glyph('9')
- .draw(&mut canvas, 110, 20, &white);
-
- font_sixteen
- .glyph('A')
- .draw(&mut canvas, 0, 40, &white);
- font_sixteen
- .glyph('B')
- .draw(&mut canvas, 11, 40, &white);
- font_sixteen
- .glyph('C')
- .draw(&mut canvas, 22, 40, &white);
- font_sixteen
- .glyph('D')
- .draw(&mut canvas, 33, 40, &white);
- font_sixteen
- .glyph('E')
- .draw(&mut canvas, 44, 40, &white);
- font_sixteen
- .glyph('F')
- .draw(&mut canvas, 55, 40, &white);
- font_sixteen
- .glyph('G')
- .draw(&mut canvas, 66, 40, &white);
- font_sixteen
- .glyph('H')
- .draw(&mut canvas, 77, 40, &white);
- font_sixteen
- .glyph('I')
- .draw(&mut canvas, 88, 40, &white);
- font_sixteen
- .glyph('J')
- .draw(&mut canvas, 99, 40, &white);
- font_sixteen
- .glyph('K')
- .draw(&mut canvas, 110, 40, &white);
- font_sixteen
- .glyph('L')
- .draw(&mut canvas, 121, 40, &white);
- font_sixteen
- .glyph('M')
- .draw(&mut canvas, 132, 40, &white);
- font_sixteen
- .glyph('N')
- .draw(&mut canvas, 143, 40, &white);
- font_sixteen
- .glyph('O')
- .draw(&mut canvas, 154, 40, &white);
-
- font_sixteen
- .glyph('P')
- .draw(&mut canvas, 0, 60, &white);
- font_sixteen
- .glyph('Q')
- .draw(&mut canvas, 11, 60, &white);
- font_sixteen
- .glyph('R')
- .draw(&mut canvas, 22, 60, &white);
- font_sixteen
- .glyph('S')
- .draw(&mut canvas, 33, 60, &white);
- font_sixteen
- .glyph('T')
- .draw(&mut canvas, 44, 60, &white);
- font_sixteen
- .glyph('U')
- .draw(&mut canvas, 55, 60, &white);
- font_sixteen
- .glyph('V')
- .draw(&mut canvas, 66, 60, &white);
- font_sixteen
- .glyph('W')
- .draw(&mut canvas, 77, 60, &white);
- font_sixteen
- .glyph('X')
- .draw(&mut canvas, 88, 60, &white);
- font_sixteen
- .glyph('Y')
- .draw(&mut canvas, 99, 60, &white);
- font_sixteen
- .glyph('Z')
- .draw(&mut canvas, 110, 60, &white);
-
- canvas.square(10, 70, 160, 310, &white);
+ // canvas.square(10, 70, 160, 310, &white);
{
let display = display.acquire();
From 596de6525f2b4908bc9e4a53ca7178ace1ca6dbd Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 8 Mar 2025 01:23:06 -0500
Subject: [PATCH 33/34] Create a 5x8 bitmap font
---
pico-st7789/src/font/bits_5_8.rs | 180 +++++++++++++++++++++++++++++++
pico-st7789/src/font/mod.rs | 3 +
pico-st7789/src/main.rs | 15 ++-
3 files changed, 196 insertions(+), 2 deletions(-)
create mode 100644 pico-st7789/src/font/bits_5_8.rs
diff --git a/pico-st7789/src/font/bits_5_8.rs b/pico-st7789/src/font/bits_5_8.rs
new file mode 100644
index 0000000..301e3dd
--- /dev/null
+++ b/pico-st7789/src/font/bits_5_8.rs
@@ -0,0 +1,180 @@
+use alloc::collections::btree_map::BTreeMap;
+
+use crate::canvas::{Canvas, RGB};
+
+use super::{Font, Glyph};
+
+pub struct BitmapGlyph([u8; 8]);
+
+pub struct BitmapFont(BTreeMap<char, BitmapGlyph>);
+
+impl BitmapFont {
+ pub fn new() -> Self {
+ let mut font = BTreeMap::new();
+ font.insert(' ', BitmapGlyph([
+ 0b10101,
+ 0b01010,
+ 0b10101,
+ 0b01010,
+ 0b10101,
+ 0b01010,
+ 0b10101,
+ 0b01010,
+ ]));
+ font.insert(
+ '/',
+ BitmapGlyph([
+ 0b00001,
+ 0b00010,
+ 0b00010,
+ 0b00100,
+ 0b00100,
+ 0b01000,
+ 0b01000,
+ 0b10000,
+ ]),
+ );
+ font.insert(
+ '0',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10001,
+ 0b10101,
+ 0b10101,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ '1',
+ BitmapGlyph([
+ 0b00001, 0b00011, 0b00101, 0b00001, 0b00001, 0b00001, 0b00001, 0b00001,
+ ]),
+ );
+ font.insert(
+ '2',
+ BitmapGlyph([
+ 0b01110, 0b10001, 0b00001, 0b00001, 0b00010, 0b00100, 0b01000, 0b11111,
+ ]),
+ );
+ font.insert(
+ '3',
+ BitmapGlyph([
+ 0b01110, 0b10001, 0b00001, 0b01110, 0b00001, 0b00001, 0b10001, 0b01110,
+ ]),
+ );
+ font.insert(
+ '4',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b11111,
+ 0b00001,
+ 0b00001,
+ 0b00001,
+ 0b00001,
+ ]),
+ );
+ font.insert(
+ '5',
+ BitmapGlyph([
+ 0b11111,
+ 0b10000,
+ 0b10000,
+ 0b11111,
+ 0b00001,
+ 0b00001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ '6',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10000,
+ 0b10000,
+ 0b11110,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ '7',
+ BitmapGlyph([
+ 0b11111,
+ 0b00001,
+ 0b00001,
+ 0b00010,
+ 0b00110,
+ 0b00100,
+ 0b01000,
+ 0b01000,
+ ]),
+ );
+ font.insert(
+ '8',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ 0b01110,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ '9',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b01111,
+ 0b00001,
+ 0b00001,
+ 0b01110,
+ ]),
+ );
+ Self(font)
+ }
+}
+
+impl Font<BitmapGlyph> for BitmapFont {
+ fn glyph(&self, c: char) -> &BitmapGlyph {
+ self.0.get(&c).unwrap_or(self.0.get(&' ').unwrap())
+ }
+}
+
+impl Glyph for BitmapGlyph {
+ fn draw(&self, canvas: &mut impl Canvas, x: usize, y: usize, color: &RGB) {
+ for row in 0..8 {
+ if self.0[row] & (1 << 4) > 0 {
+ canvas.set_pixel(x, y + row, color);
+ }
+ if self.0[row] & (1 << 3) > 0 {
+ canvas.set_pixel(x + 1, y + row, color);
+ }
+ if self.0[row] & (1 << 2) > 0 {
+ canvas.set_pixel(x + 2, y + row, color);
+ }
+ if self.0[row] & (1 << 1) > 0 {
+ canvas.set_pixel(x + 3, y + row, color);
+ }
+ if self.0[row] & 1 > 0 {
+ canvas.set_pixel(x + 4, y + row, color);
+ }
+ }
+ }
+
+ fn extents(&self) -> (usize, usize) {
+ (5, 8)
+ }
+}
diff --git a/pico-st7789/src/font/mod.rs b/pico-st7789/src/font/mod.rs
index 3886765..f20065b 100644
--- a/pico-st7789/src/font/mod.rs
+++ b/pico-st7789/src/font/mod.rs
@@ -1,5 +1,8 @@
use crate::canvas::{Canvas, RGB};
+mod bits_5_8;
+pub use bits_5_8::BitmapFont;
+
mod seven_segment;
pub use seven_segment::SevenSegmentFont;
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 79da94f..5537613 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -17,7 +17,7 @@ mod canvas;
use canvas::{Canvas, RGB, print};
mod font;
-use font::{Font, Glyph, SevenSegmentFont, SixteenSegmentFont};
+use font::{BitmapFont, Font, Glyph, SevenSegmentFont, SixteenSegmentFont};
mod st7789;
use st7789::{ST7789Display, SETUP_PROGRAM};
@@ -59,12 +59,13 @@ impl Canvas for FrameBuf {
unsafe fn main() -> ! {
{
use core::mem::MaybeUninit;
- const HEAP_SIZE: usize = 1024;
+ const HEAP_SIZE: usize = 64 * 1024;
static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
}
let font_sixteen = SixteenSegmentFont::new();
+ let font_bitmap = BitmapFont::new();
// rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
let mut peripherals = pac::Peripherals::take().unwrap();
@@ -157,6 +158,16 @@ unsafe fn main() -> ! {
print(&mut canvas, &font_sixteen, 1, 81, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
print(&mut canvas, &font_sixteen, 1, 101, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
+
+ print(&mut canvas, &font_bitmap, 1, 121, " !\"#$%&'<>*+,-./", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 141, "0123456789| = ?", &RGB{ r: 63, g: 63, b: 63 });
+ /*
+ print(&mut canvas, &font_bitmap, 1, 161, "@ABCDEFGHIJKLMNO", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 181, "PQRSTUVWXYZ[\\]^_", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 201, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 221, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
+ */
+
// canvas.square(10, 70, 160, 310, &white);
{
From 36eef459710d391515f5db6244d8a886be9bf533 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Sat, 8 Mar 2025 01:49:43 -0500
Subject: [PATCH 34/34] Fill out an alphabet and animate the screen
---
pico-st7789/src/canvas.rs | 8 +
pico-st7789/src/font/bits_5_8.rs | 377 +++++++++++++++++++++++++++++--
pico-st7789/src/main.rs | 28 +--
3 files changed, 374 insertions(+), 39 deletions(-)
diff --git a/pico-st7789/src/canvas.rs b/pico-st7789/src/canvas.rs
index a695b86..7a16821 100644
--- a/pico-st7789/src/canvas.rs
+++ b/pico-st7789/src/canvas.rs
@@ -19,6 +19,14 @@ pub struct RGB {
pub trait Canvas {
fn set_pixel(&mut self, x: usize, y: usize, color: &RGB);
+ fn fill(&mut self, x1: usize, y1: usize, x2: usize, y2: usize, color: &RGB) {
+ for x in x1..x2 + 1 {
+ for y in y1..y2 + 1 {
+ self.set_pixel(x, y, color);
+ }
+ }
+ }
+
fn square(&mut self, x1: usize, y1: usize, x2: usize, y2: usize, color: &RGB) {
for x in x1..x2 + 1 {
self.set_pixel(x, y1, color);
diff --git a/pico-st7789/src/font/bits_5_8.rs b/pico-st7789/src/font/bits_5_8.rs
index 301e3dd..ecada60 100644
--- a/pico-st7789/src/font/bits_5_8.rs
+++ b/pico-st7789/src/font/bits_5_8.rs
@@ -4,7 +4,7 @@ use crate::canvas::{Canvas, RGB};
use super::{Font, Glyph};
-pub struct BitmapGlyph([u8; 8]);
+pub struct BitmapGlyph([u8; 7]);
pub struct BitmapFont(BTreeMap<char, BitmapGlyph>);
@@ -12,15 +12,26 @@ impl BitmapFont {
pub fn new() -> Self {
let mut font = BTreeMap::new();
font.insert(' ', BitmapGlyph([
- 0b10101,
- 0b01010,
- 0b10101,
- 0b01010,
- 0b10101,
- 0b01010,
- 0b10101,
- 0b01010,
+ 0b00000,
+ 0b00000,
+ 0b00000,
+ 0b00000,
+ 0b00000,
+ 0b00000,
+ 0b00000,
]));
+ font.insert(
+ ':',
+ BitmapGlyph([
+ 0b00000,
+ 0b00100,
+ 0b00100,
+ 0b00000,
+ 0b00100,
+ 0b00100,
+ 0b00000,
+ ]),
+ );
font.insert(
'/',
BitmapGlyph([
@@ -28,7 +39,6 @@ impl BitmapFont {
0b00010,
0b00010,
0b00100,
- 0b00100,
0b01000,
0b01000,
0b10000,
@@ -41,7 +51,6 @@ impl BitmapFont {
0b10001,
0b10001,
0b10101,
- 0b10101,
0b10001,
0b10001,
0b01110,
@@ -50,19 +59,37 @@ impl BitmapFont {
font.insert(
'1',
BitmapGlyph([
- 0b00001, 0b00011, 0b00101, 0b00001, 0b00001, 0b00001, 0b00001, 0b00001,
+ 0b00001,
+ 0b00011,
+ 0b00101,
+ 0b00001,
+ 0b00001,
+ 0b00001,
+ 0b00001,
]),
);
font.insert(
'2',
BitmapGlyph([
- 0b01110, 0b10001, 0b00001, 0b00001, 0b00010, 0b00100, 0b01000, 0b11111,
+ 0b01110,
+ 0b10001,
+ 0b00001,
+ 0b00010,
+ 0b00100,
+ 0b01000,
+ 0b11111,
]),
);
font.insert(
'3',
BitmapGlyph([
- 0b01110, 0b10001, 0b00001, 0b01110, 0b00001, 0b00001, 0b10001, 0b01110,
+ 0b01110,
+ 0b10001,
+ 0b00001,
+ 0b01110,
+ 0b00001,
+ 0b10001,
+ 0b01110,
]),
);
font.insert(
@@ -75,7 +102,6 @@ impl BitmapFont {
0b00001,
0b00001,
0b00001,
- 0b00001,
]),
);
font.insert(
@@ -86,7 +112,6 @@ impl BitmapFont {
0b10000,
0b11111,
0b00001,
- 0b00001,
0b10001,
0b01110,
]),
@@ -97,7 +122,6 @@ impl BitmapFont {
0b01110,
0b10001,
0b10000,
- 0b10000,
0b11110,
0b10001,
0b10001,
@@ -109,7 +133,6 @@ impl BitmapFont {
BitmapGlyph([
0b11111,
0b00001,
- 0b00001,
0b00010,
0b00110,
0b00100,
@@ -124,7 +147,6 @@ impl BitmapFont {
0b10001,
0b10001,
0b01110,
- 0b01110,
0b10001,
0b10001,
0b01110,
@@ -136,13 +158,324 @@ impl BitmapFont {
0b01110,
0b10001,
0b10001,
- 0b10001,
0b01111,
0b00001,
0b00001,
0b01110,
]),
);
+ font.insert(
+ 'A',
+ BitmapGlyph([
+ 0b00100,
+ 0b01010,
+ 0b01010,
+ 0b10001,
+ 0b11111,
+ 0b10001,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'B',
+ BitmapGlyph([
+ 0b11110,
+ 0b10001,
+ 0b10001,
+ 0b1111 ,
+ 0b10001,
+ 0b10001,
+ 0b11110,
+ ]),
+ );
+ font.insert(
+ 'C',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'D',
+ BitmapGlyph([
+ 0b11110,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b11110,
+ ]),
+ );
+ font.insert(
+ 'E',
+ BitmapGlyph([
+ 0b11111,
+ 0b10000,
+ 0b10000,
+ 0b11111,
+ 0b10000,
+ 0b10000,
+ 0b11111,
+ ]),
+ );
+ font.insert(
+ 'F',
+ BitmapGlyph([
+ 0b11111,
+ 0b10000,
+ 0b10000,
+ 0b11110,
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ ]),
+ );
+ font.insert(
+ 'G',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10000,
+ 0b10011,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'H',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b11111,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'I',
+ BitmapGlyph([
+ 0b11111,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b11111,
+ ]),
+ );
+ font.insert(
+ 'J',
+ BitmapGlyph([
+ 0b00111,
+ 0b00001,
+ 0b00001,
+ 0b00001,
+ 0b00001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'K',
+ BitmapGlyph([
+ 0b10001,
+ 0b10010,
+ 0b10100,
+ 0b11000,
+ 0b10100,
+ 0b10010,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'L',
+ BitmapGlyph([
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ 0b11111,
+ ]),
+ );
+ font.insert(
+ 'M',
+ BitmapGlyph([
+ 0b10001,
+ 0b11011,
+ 0b10101,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'N',
+ BitmapGlyph([
+ 0b10001,
+ 0b11001,
+ 0b11001,
+ 0b10101,
+ 0b10011,
+ 0b10011,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'O',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'P',
+ BitmapGlyph([
+ 0b11110,
+ 0b10001,
+ 0b10001,
+ 0b11110,
+ 0b10000,
+ 0b10000,
+ 0b10000,
+ ]),
+ );
+ font.insert(
+ 'Q',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10101,
+ 0b10011,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'R',
+ BitmapGlyph([
+ 0b11110,
+ 0b10001,
+ 0b10001,
+ 0b11110,
+ 0b10100,
+ 0b10010,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'S',
+ BitmapGlyph([
+ 0b01110,
+ 0b10001,
+ 0b10000,
+ 0b01110,
+ 0b00001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'T',
+ BitmapGlyph([
+ 0b11111,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ ]),
+ );
+ font.insert(
+ 'U',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b01110,
+ ]),
+ );
+ font.insert(
+ 'V',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b01010,
+ 0b01010,
+ 0b00100,
+ ]),
+ );
+ font.insert(
+ 'W',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10001,
+ 0b10101,
+ 0b10101,
+ 0b01010,
+ ]),
+ );
+ font.insert(
+ 'X',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b01010,
+ 0b00100,
+ 0b01010,
+ 0b10001,
+ 0b10001,
+ ]),
+ );
+ font.insert(
+ 'Y',
+ BitmapGlyph([
+ 0b10001,
+ 0b10001,
+ 0b01010,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ 0b00100,
+ ]),
+ );
+ font.insert(
+ 'Z',
+ BitmapGlyph([
+ 0b11111,
+ 0b00001,
+ 0b00010,
+ 0b00100,
+ 0b01000,
+ 0b10000,
+ 0b11111,
+ ]),
+ );
Self(font)
}
}
@@ -155,7 +488,7 @@ impl Font<BitmapGlyph> for BitmapFont {
impl Glyph for BitmapGlyph {
fn draw(&self, canvas: &mut impl Canvas, x: usize, y: usize, color: &RGB) {
- for row in 0..8 {
+ for row in 0..7 {
if self.0[row] & (1 << 4) > 0 {
canvas.set_pixel(x, y + row, color);
}
@@ -175,6 +508,6 @@ impl Glyph for BitmapGlyph {
}
fn extents(&self) -> (usize, usize) {
- (5, 8)
+ (5, 7)
}
}
diff --git a/pico-st7789/src/main.rs b/pico-st7789/src/main.rs
index 5537613..ad3a90f 100644
--- a/pico-st7789/src/main.rs
+++ b/pico-st7789/src/main.rs
@@ -3,6 +3,7 @@
extern crate alloc;
+use alloc::fmt::format;
use embedded_alloc::LlffHeap as Heap;
use embedded_hal::{delay::DelayNs, digital::OutputPin};
use fugit::RateExtU32;
@@ -64,7 +65,6 @@ unsafe fn main() -> ! {
unsafe { HEAP.init(HEAP_MEM.as_ptr() as usize, HEAP_SIZE) }
}
- let font_sixteen = SixteenSegmentFont::new();
let font_bitmap = BitmapFont::new();
// rp_pico::pac::Peripherals is a reference to physical hardware defined on the Pico.
@@ -149,24 +149,17 @@ unsafe fn main() -> ! {
*/
let mut canvas = FrameBuf::new();
let white = RGB { r: 63, g: 63, b: 63 };
+ let mut count = 0;
loop {
- print(&mut canvas, &font_sixteen, 1, 1, " !\"#$%&'<>*+,-./", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_sixteen, 1, 21, "0123456789| = ?", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_sixteen, 1, 41, "@ABCDEFGHIJKLMNO", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_sixteen, 1, 61, "PQRSTUVWXYZ[\\]^_", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_sixteen, 1, 81, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_sixteen, 1, 101, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
-
-
- print(&mut canvas, &font_bitmap, 1, 121, " !\"#$%&'<>*+,-./", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_bitmap, 1, 141, "0123456789| = ?", &RGB{ r: 63, g: 63, b: 63 });
- /*
- print(&mut canvas, &font_bitmap, 1, 161, "@ABCDEFGHIJKLMNO", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_bitmap, 1, 181, "PQRSTUVWXYZ[\\]^_", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_bitmap, 1, 201, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
- print(&mut canvas, &font_bitmap, 1, 221, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
- */
+ canvas.fill(0, 10, 170, 20, &RGB{r: 0, g: 0, b: 0 });
+ print(&mut canvas, &font_bitmap, 1, 10, &format(format_args!("COUNT: {:03}", count)), &RGB{ r: 32, g: 32, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 200, " !\"#$%&'<>*+,-./", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 220, "0123456789|: = ?", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 240, "@ABCDEFGHIJKLMNO", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 260, "PQRSTUVWXYZ[\\]^_", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 280, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
+ print(&mut canvas, &font_bitmap, 1, 300, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
// canvas.square(10, 70, 160, 310, &white);
@@ -177,6 +170,7 @@ unsafe fn main() -> ! {
display.send_buf(canvas.buf);
let _ = led.set_low();
}
+ count = count + 1;
/*
for x in 80..90 {
for y in 155..165 {