Merge #542

542: `snapshot-tests`: Test alternate hint for bitfields r=Urhengulas a=Urhengulas Co-authored-by: Johann Hemmann <johann.hemmann@code.berlin>
knurling-rs · Jul 19, 2021 · 02123c9 · 02123c9
2 parents bad5034 + 62967fe
commit 02123c9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/firmware/qemu/src/bin/hints.out b/firmware/qemu/src/bin/hints.out
@@ -50,7 +50,10 @@
 0.000049 INFO ----
 0.000050 INFO no hint 10
 0.000051 INFO hex     a
-0.000052 INFO HEX     A
-0.000053 INFO binary  1010
-0.000054 INFO ASCII   b"\n"
-0.000055 INFO Debug   10
+0.000052 INFO hex     0xa
+0.000053 INFO HEX     A
+0.000054 INFO HEX     0xA
+0.000055 INFO binary  1010
+0.000056 INFO binary  0b1010
+0.000057 INFO ASCII   b"\n"
+0.000058 INFO Debug   10
diff --git a/firmware/qemu/src/bin/hints.release.out b/firmware/qemu/src/bin/hints.release.out
@@ -50,7 +50,10 @@
 0.000049 INFO ----
 0.000050 INFO no hint 10
 0.000051 INFO hex     a
-0.000052 INFO HEX     A
-0.000053 INFO binary  1010
-0.000054 INFO ASCII   b"\n"
-0.000055 INFO Debug   10
+0.000052 INFO hex     0xa
+0.000053 INFO HEX     A
+0.000054 INFO HEX     0xA
+0.000055 INFO binary  1010
+0.000056 INFO binary  0b1010
+0.000057 INFO ASCII   b"\n"
+0.000058 INFO Debug   10
diff --git a/firmware/qemu/src/bin/hints.rs b/firmware/qemu/src/bin/hints.rs
@@ -115,8 +115,11 @@ fn main() -> ! {
     let x = 42u32;
     defmt::info!("no hint {=0..4}", x);
     defmt::info!("hex     {=0..4:x}", x);
+    defmt::info!("hex     {=0..4:#x}", x);
     defmt::info!("HEX     {=0..4:X}", x);
+    defmt::info!("HEX     {=0..4:#X}", x);
     defmt::info!("binary  {=0..4:b}", x);
+    defmt::info!("binary  {=0..4:#b}", x);
     defmt::info!("ASCII   {=0..4:a}", x);
     defmt::info!("Debug   {=0..4:?}", x);