Move xtasks to target-gen; extend README; link correctly

Author: Yatekii

.cargo/config.toml

@@ -1,8 +1,3 @@
-[alias]
-xtask = "run --package xtask --"
-export = "xtask export"
-iterate = "xtask iterate"
-
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
 rustflags = [
   "-C",
@@ -12,12 +7,16 @@ rustflags = [
   "-C",
   "link-arg=-Tmemory.x",
   # Code-size optimizations.
-  "-Z",
-  "trap-unreachable=no",
+  # This requires nightly atm.
+  # "-Z",
+  # "trap-unreachable=no",
   "-C",
   "inline-threshold=5",
   "-C",
   "no-vectorize-loops",
   "-C",
   "force-frame-pointers=no",
 ]
+
+[build]
+target = "{{target-arch}}"

Cargo.toml

@@ -1,17 +1,14 @@
-cargo-features = ["per-package-target"]
-
 [package]
 authors = ["{{authors}}"]
 edition = "2021"
 readme = "README.md"
 name = "{{project-name}}"
 version = "0.1.0"
 
-forced-target = "{{target-arch}}"
-
 [dependencies]
 cortex-m = "0.7.0"
 flash-algorithm = { version = "0.3.0" }
+rtt-target = { version = "0.3", features = ["cortex-m"] }
 
 # this lets you use `cargo fix`!
 [[bin]]
@@ -50,6 +47,3 @@ debug = false
 debug-assertions = false
 opt-level = 0
 overflow-checks = false
-
-[workspace]
-members = [".", "xtask"]

README.md

@@ -39,7 +39,14 @@ to generate a new project from the template.
 
 Building requires nightly Rust.
 
-Just run `cargo export`. It spits out the flash algo in the probe-rs YAML format.
+Just run `target-gen export`. It spits out the flash algo in the probe-rs YAML format.
+
+## Developing the algorithm
+
+Building requires nightly Rust.
+
+Just run `target-gen test`. It spits out the flash algo in the probe-rs YAML format and downloads it onto a target and makes a test run.
+You will also be able to see RTT messages.
 
 # License
 

calculate-memory.rhai

@@ -12,6 +12,13 @@ variable::set(
       + parse_int(variable::get("flash-size").sub_string(2), 16)
     ).to_hex()
 );
+variable::set(
+  "link-address",
+  "0x" + (
+      parse_int(variable::get("ram-start-address").sub_string(2), 16)
+    + 0x20
+  ).to_hex()
+);
 
 let target = variable::get("target");
 

link.x

@@ -1 +1 @@
-ALGO_PLACEMENT_START_ADDRESS = {{ram-start-address}};
+ALGO_PLACEMENT_START_ADDRESS = {{link-address}};

rust-toolchain

@@ -4,6 +4,7 @@
 use core::mem::MaybeUninit;
 
 use flash_algorithm::*;
+use rtt_target::{rprintln, rtt_init_print};
 
 struct Algorithm;
 
@@ -20,21 +21,26 @@ algorithm!(Algorithm, {
 
 impl FlashAlgorithm for Algorithm {
     fn new(_address: u32, _clock: u32, _function: Function) -> Result<Self, ErrorCode> {
+        rtt_init_print!();
+        rprintln!("Init");
         // TODO: Add setup code for the flash algorithm.
         Ok(Self)
     }
 
     fn erase_all(&mut self) -> Result<(), ErrorCode> {
+        rprintln!("Erase All");
         // TODO: Add code here that erases the entire flash.
         Err(ErrorCode::new(0x70d0).unwrap())
     }
 
-    fn erase_sector(&mut self, _addr: u32) -> Result<(), ErrorCode> {
+    fn erase_sector(&mut self, addr: u32) -> Result<(), ErrorCode> {
+        rprintln!("Erase sector addr:{}", addr);
         // TODO: Add code here that erases a page to flash.
         Ok(())
     }
 
-    fn program_page(&mut self, _addr: u32, _size: u32, _data: *const u8) -> Result<(), ErrorCode> {
+    fn program_page(&mut self, addr: u32, size: u32, _data: *const u8) -> Result<(), ErrorCode> {
+        rprintln!("Program Page addr:{} size:{}", addr, size);
         // TODO: Add code here that writes a page to flash.
         Ok(())
     }