Add log feature, fmt.rs (#7)

* Add log feature, fmt.rs

* Add link to original fmt.rs

Author: bugadani

Cargo.toml

@@ -27,6 +27,11 @@ mockall = "0.13.0"
 optional = true
 version = "0.3"
 
+[dependencies.log]
+optional = true
+version = "0.4"
+
 [features]
 defmt = ["dep:defmt"]
 usb-hs = []
+log = ["dep:log"]

src/dap.rs

@@ -81,7 +81,7 @@ where
 
         let resp = &mut ResponseWriter::new(req.command, rbuf);
 
-        // defmt::trace!("Dap command: {}", req.command);
+        trace!("Dap command: {}", req.command);
 
         match req.command {
             Command::DAP_Info => self.process_info(req, resp, version),
@@ -227,12 +227,12 @@ where
             }
         };
 
-        // defmt::info!(
-        // "DAP connect: {}, SWD: {}, JTAG: {}",
-        // port,
-        // SWD::AVAILABLE,
-        // JTAG::AVAILABLE
-        // );
+        info!(
+            "DAP connect: {}, SWD: {}, JTAG: {}",
+            port,
+            SWD::AVAILABLE,
+            JTAG::AVAILABLE
+        );
 
         match (SWD::AVAILABLE, JTAG::AVAILABLE, port) {
             // SWD
@@ -386,31 +386,33 @@ where
 
         resp.write_ok(); // assume ok until we finish
         let sequence_count = req.next_u8();
-        let success = (0..sequence_count).map(|_| {
-            // parse the seqnence info
-            let sequence_info = req.next_u8();
-            let nbits: usize = match sequence_info & 0x3F {
-                // CMSIS-DAP says 0 means 64 bits
-                0 => 64,
-                // Other integers are normal.
-                n => n as usize,
-            };
-            let nbytes = (nbits + 7) / 8;
-            let output = (sequence_info & 0x80) == 0;
-
-            if output {
-                let output_data = req.data.get(..nbytes).ok_or(())?;
-                swd.write_sequence(nbits, output_data).or(Err(()))?;
-                req.consume(nbytes);
-                Ok(0)
-            } else {
-                let input_data = resp.remaining().get_mut(..nbytes).ok_or(())?;
-                swd.read_sequence(nbits, input_data).or(Err(()))?;
-                resp.skip(nbytes);
-                Ok(nbytes)
-            }
-        }).all(|r: Result<usize, ()>| r.is_ok());
-        
+        let success = (0..sequence_count)
+            .map(|_| {
+                // parse the seqnence info
+                let sequence_info = req.next_u8();
+                let nbits: usize = match sequence_info & 0x3F {
+                    // CMSIS-DAP says 0 means 64 bits
+                    0 => 64,
+                    // Other integers are normal.
+                    n => n as usize,
+                };
+                let nbytes = (nbits + 7) / 8;
+                let output = (sequence_info & 0x80) == 0;
+
+                if output {
+                    let output_data = req.data.get(..nbytes).ok_or(())?;
+                    swd.write_sequence(nbits, output_data).or(Err(()))?;
+                    req.consume(nbytes);
+                    Ok(0)
+                } else {
+                    let input_data = resp.remaining().get_mut(..nbytes).ok_or(())?;
+                    swd.read_sequence(nbits, input_data).or(Err(()))?;
+                    resp.skip(nbytes);
+                    Ok(nbytes)
+                }
+            })
+            .all(|r: Result<usize, ()>| r.is_ok());
+
         if !success {
             resp.write_u8_at(0, 0xFF);
         }
@@ -994,17 +996,26 @@ mod test {
         );
 
         // write 8 bits, read 5 bits, write 33 bits
-        let report = [0x1Du8, 3, 8, 0b10111101, 0x80 | 5, 33, 0x56, 0x83, 0xAB, 0x32, 0x01];
+        let report = [
+            0x1Du8,
+            3,
+            8,
+            0b10111101,
+            0x80 | 5,
+            33,
+            0x56,
+            0x83,
+            0xAB,
+            0x32,
+            0x01,
+        ];
         let mut rbuf = [0u8; 64];
         dap.state.to_swd();
         match &mut dap.state {
             State::Swd(swd) => {
                 swd.expect_write_sequence()
                     .once()
-                    .with(
-                        eq(8),
-                        eq([0b10111101u8]),
-                    )
+                    .with(eq(8), eq([0b10111101u8]))
                     .return_const(Ok(()));
                 swd.expect_read_sequence()
                     .once()
@@ -1015,19 +1026,13 @@ mod test {
                     });
                 swd.expect_write_sequence()
                     .once()
-                    .with(
-                        eq(33),
-                        eq([0x56, 0x83, 0xAB, 0x32, 0x01]),
-                    )
+                    .with(eq(33), eq([0x56, 0x83, 0xAB, 0x32, 0x01]))
                     .return_const(Ok(()));
             }
             _ => assert!(false, "can't switch to swd"),
         }
         let rsize = dap.process_command(&report, &mut rbuf, DapVersion::V2);
         assert_eq!(rsize, 3);
-        assert_eq!(
-            &rbuf[..3],
-            &[0x1Du8, 0x00, 0x1F]
-        )
+        assert_eq!(&rbuf[..3], &[0x1Du8, 0x00, 0x1F])
     }
 }