renumbered chapters again

Author: BartMassey

Cargo.toml

@@ -3,8 +3,8 @@ resolver = "2"
 members = [
   "mdbook/src/03-setup",
   "mdbook/src/05-hello-world",
-  "mdbook/src/07-registers",
-  "mdbook/src/05-led-roulette",
+  "mdbook/src/06-registers",
+  "mdbook/src/07-led-roulette",
   "mdbook/src/09-uart",
   "mdbook/src/10-i2c",
   "mdbook/src/11-led-compass",

mdbook/src/05-led-roulette/.cargo/config.toml renamed to mdbook/src/06-registers/.cargo/config.toml

@@ -2,7 +2,7 @@
 
 It's time to explore what calling `display_pins.row1.set_high()` does under the hood.
 
-In a nutshell, it just writes to some special memory regions. Go into the `07-registers` directory
+In a nutshell, it just writes to some special memory regions. Go into the `06-registers` directory
 and let's run the starter code statement by statement.
 
 ``` rust

mdbook/src/07-registers/Cargo.toml renamed to mdbook/src/06-registers/Cargo.toml

@@ -19,13 +19,13 @@ Target halted
 (gdb) continue
 Continuing.
 
-Breakpoint 1, registers::__cortex_m_rt_main_trampoline () at src/07-registers/src/main.rs:9
+Breakpoint 1, registers::__cortex_m_rt_main_trampoline () at src/06-registers/src/main.rs:9
 9	#[entry]
 (gdb) continue
 Continuing.
 
 Program received signal SIGINT, Interrupt.
-registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:10
+registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:10
 10	fn main() -> ! {
 (gdb) continue
 Continuing.

mdbook/src/07-registers/Embed.toml renamed to mdbook/src/06-registers/Embed.toml

@@ -63,14 +63,14 @@ So here we go. Furst turn off the `inaccessible-by-default` flag, then set a cou
 ```
 (gdb) set mem inaccessible-by-default off
 (gdb) break 16
-Breakpoint 1 at 0x172: file src/07-registers/src/main.rs, line 16.
+Breakpoint 1 at 0x172: file src/06-registers/src/main.rs, line 16.
 Note: automatically using hardware breakpoints for read-only addresses.
 (gdb) break 19
-Breakpoint 2 at 0x17c: file src/07-registers/src/main.rs, line 19.
+Breakpoint 2 at 0x17c: file src/06-registers/src/main.rs, line 19.
 (gdb) break 22
-Breakpoint 3 at 0x184: file src/07-registers/src/main.rs, line 22.
+Breakpoint 3 at 0x184: file src/06-registers/src/main.rs, line 22.
 (gdb) break 25
-Breakpoint 4 at 0x18c: file src/07-registers/src/main.rs, line 25.
+Breakpoint 4 at 0x18c: file src/06-registers/src/main.rs, line 25.
 (gdb) monitor reset halt
 Resetting and halting target
 Target halted
@@ -82,7 +82,7 @@ All right. Let's continue until the first breakpoint, right before line 16, and
 (gdb) c
 Continuing.
 
-Breakpoint 1, registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:16
+Breakpoint 1, registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:16
 16              *(PORT_P0_OUT as *mut u32) |= 1 << 21;
 (gdb) x 0x50000504
 0x50000504:     0x00000000
@@ -97,12 +97,12 @@ Let's go on. This line consists of multiple instructions (reading, bitwise ORing
 Continuing.
 
 Program received signal SIGINT, Interrupt.
-0x00000174 in registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:16
+0x00000174 in registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:16
 16              *(PORT_P0_OUT as *mut u32) |= 1 << 21;
 (gdb) c
 Continuing.
 
-Breakpoint 2, registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:19
+Breakpoint 2, registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:19
 19              *(PORT_P0_OUT as *mut u32) |= 1 << 19;
 ```
 
@@ -126,12 +126,12 @@ Yeah, I was gonna say that. Now, hit 'c' another time to continue execution up t
 
 ```
 Program received signal SIGINT, Interrupt.
-0x0000017e in registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:19
+0x0000017e in registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:19
 19              *(PORT_P0_OUT as *mut u32) |= 1 << 19;
 (gdb) c
 Continuing.
 
-Breakpoint 3, registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:22
+Breakpoint 3, registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:22
 22              *(PORT_P0_OUT as *mut u32) &= !(1 << 21);
 (gdb) x 0x50000504
 0x50000504:     0x00280000
@@ -150,26 +150,26 @@ Continue execution and check that the reported values of the `OUT` register matc
 Continuing.
 
 Program received signal SIGINT, Interrupt.
-0x00000186 in registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:22
+0x00000186 in registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:22
 22              *(PORT_P0_OUT as *mut u32) &= !(1 << 21);
 (gdb) c
 Continuing.
 
-Breakpoint 4, registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:25
+Breakpoint 4, registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:25
 25              *(PORT_P0_OUT as *mut u32) &= !(1 << 19);
 (gdb) x 0x50000504
 0x50000504:     0x00080000
 (gdb) c
 Continuing.
 
 Program received signal SIGINT, Interrupt.
-0x0000018e in registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:25
+0x0000018e in registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:25
 25              *(PORT_P0_OUT as *mut u32) &= !(1 << 19);
 (gdb) c
 Continuing.
 ^C
 Program received signal SIGINT, Interrupt.
-0x00000196 in registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:28
+0x00000196 in registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:28
 28          loop {}
 (gdb) x 0x50000504
 0x50000504:     0x00000000

mdbook/src/07-registers/README.md renamed to mdbook/src/06-registers/README.md

@@ -68,18 +68,18 @@ cortex_m_rt::DefaultPreInit () at src/lib.rs:1058
 (gdb) continue
 Continuing.
 
-Breakpoint 1, registers::__cortex_m_rt_main_trampoline () at src/07-registers/src/main.rs:7
+Breakpoint 1, registers::__cortex_m_rt_main_trampoline () at src/06-registers/src/main.rs:7
 7	#[entry]
 (gdb) continue
 Continuing.
 
 Program received signal SIGINT, Interrupt.
-registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:8
+registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:8
 8	fn main() -> ! {
 (gdb) continue
 Continuing.
 
-Breakpoint 4.2, registers::__cortex_m_rt_main () at src/07-registers/src/main.rs:12
+Breakpoint 4.2, registers::__cortex_m_rt_main () at src/06-registers/src/main.rs:12
 12	    p0.out.modify(|_, w| w.pin21().set_bit());
 (gdb) print *p0                                               ; ⬅️ Printing `*p0` here!
 $1 = nrf52833_pac::p0::RegisterBlock {

mdbook/src/07-registers/bad-address.md renamed to mdbook/src/06-registers/bad-address.md

@@ -15,7 +15,7 @@ The starter code is in the `src` directory of the book repository. Inside that d
 more directories named after each chapter of this book. Most of those directories are starter Cargo
 projects.
 
-Now, jump into the `src/05-led-roulette` directory. Check the `examples/init.rs` file:
+Now, jump into the `src/07-led-roulette` directory. Check the `examples/init.rs` file:
 
 ``` rust
 {{#include examples/init.rs}}

mdbook/src/07-registers/embed.gdb renamed to mdbook/src/06-registers/embed.gdb

@@ -39,7 +39,7 @@ while [verifying your setup].
 
 
 With the `rust-std` component in place you can now cross compile the program using Cargo.
-Make sure you are in the `src/05-led-roulette` directory, then build. This initial code is an
+Make sure you are in the `src/07-led-roulette` directory, then build. This initial code is an
 example, so we compile it as such.
 
 ``` console

mdbook/src/07-registers/optimization.md renamed to mdbook/src/06-registers/optimization.md

@@ -54,12 +54,12 @@ setting a breakpoint there and then continuing program execution until we hit th
 
 ```
 (gdb) break main
-Breakpoint 1 at 0x104: file src/05-led-roulette/examples/init.rs, line 9.
+Breakpoint 1 at 0x104: file src/07-led-roulette/examples/init.rs, line 9.
 Note: automatically using hardware breakpoints for read-only addresses.
 (gdb) continue
 Continuing.
 
-Breakpoint 1, init::__cortex_m_rt_main_trampoline () at src/05-led-roulette/examples/init.rs:9
+Breakpoint 1, init::__cortex_m_rt_main_trampoline () at src/07-led-roulette/examples/init.rs:9
 9       #[entry]
 ```
 
@@ -89,11 +89,11 @@ numbers.  If we want to break in line 13 we can simply do:
 
 ```
 (gdb) break 13
-Breakpoint 2 at 0x110: file src/05-led-roulette/examples/init.rs, line 13.
+Breakpoint 2 at 0x110: file src/07-led-roulette/examples/init.rs, line 13.
 (gdb) continue
 Continuing.
 
-Breakpoint 2, init::__cortex_m_rt_main () at src/05-led-roulette/examples/init.rs:13
+Breakpoint 2, init::__cortex_m_rt_main () at src/07-led-roulette/examples/init.rs:13
 (gdb)
 ```
 
@@ -201,7 +201,7 @@ One last trick before we move to something more interesting. Enter the following
 (gdb) c
 Continuing.
 
-Breakpoint 1, init::__cortex_m_rt_main_trampoline () at src/05-led-roulette/src/main.rs:9
+Breakpoint 1, init::__cortex_m_rt_main_trampoline () at src/07-led-roulette/src/main.rs:9
 9       #[entry]
 (gdb)
 ```

mdbook/src/07-registers/rtrm.md renamed to mdbook/src/06-registers/rtrm.md

@@ -17,29 +17,20 @@
     - [Timers](05-hello-world/timers.md)
     - [Portability](05-hello-world/portability.md)
     - [Board support crate](05-hello-world/board-support-crate.md)
-- [Registers](07-registers/README.md)
-    - [RTRM](07-registers/rtrm.md)
-    - [(mis)Optimization](07-registers/optimization.md)
-    - [`0xBAAAAAAD` address](07-registers/bad-address.md)
-    - [Spooky action at a distance](07-registers/spooky-action-at-a-distance.md)
-    - [Type safe manipulation](07-registers/type-safe-manipulation.md)
-- [LED roulette](05-led-roulette/README.md)
-    - [Build it](05-led-roulette/build-it.md)
-    - [Flash it](05-led-roulette/flash-it.md)
-    - [Debug it](05-led-roulette/debug-it.md)
-    - [Light it up](05-led-roulette/light-it-up.md)
-    - [It blinks](05-led-roulette/it-blinks.md)
-    - [The challenge](05-led-roulette/the-challenge.md)
-    - [My solution](05-led-roulette/my-solution.md)
-- [Clocks and timers](06-clocks-and-timers/README.md)
-    - [`for` loop delays](06-clocks-and-timers/for-loop-delays.md)
-    - [NOP](06-clocks-and-timers/nop.md)
-- [Registers](07-registers/README.md)
-    - [RTRM](07-registers/rtrm.md)
-    - [(mis)Optimization](07-registers/optimization.md)
-    - [`0xBAAAAAAD` address](07-registers/bad-address.md)
-    - [Spooky action at a distance](07-registers/spooky-action-at-a-distance.md)
-    - [Type safe manipulation](07-registers/type-safe-manipulation.md)
+- [Registers](06-registers/README.md)
+    - [RTRM](06-registers/rtrm.md)
+    - [(mis)Optimization](06-registers/optimization.md)
+    - [`0xBAAAAAAD` address](06-registers/bad-address.md)
+    - [Spooky action at a distance](06-registers/spooky-action-at-a-distance.md)
+    - [Type safe manipulation](06-registers/type-safe-manipulation.md)
+- [LED roulette](07-led-roulette/README.md)
+    - [Build it](07-led-roulette/build-it.md)
+    - [Flash it](07-led-roulette/flash-it.md)
+    - [Debug it](07-led-roulette/debug-it.md)
+    - [Light it up](07-led-roulette/light-it-up.md)
+    - [It blinks](07-led-roulette/it-blinks.md)
+    - [The challenge](07-led-roulette/the-challenge.md)
+    - [My solution](07-led-roulette/my-solution.md)
 - [Serial communication](08-serial-communication/README.md)
     - [\*nix tooling](08-serial-communication/nix-tooling.md)
     - [Windows tooling](08-serial-communication/windows-tooling.md)

mdbook/src/07-registers/spooky-action-at-a-distance.md renamed to mdbook/src/06-registers/spooky-action-at-a-distance.md

@@ -1,7 +1,7 @@
 # How to use GDB
 
 Below are some useful GDB commands that can help us debug our programs. This assumes you have
-[flashed a program](../../05-led-roulette/flash-it.md) onto your microcontroller and attached GDB to
+[flashed a program](../../07-led-roulette/flash-it.md) onto your microcontroller and attached GDB to
 a `cargo-embed` session.
 
 ## General Debugging

mdbook/src/07-registers/src/bin/bad.rs renamed to mdbook/src/06-registers/src/bin/bad.rs

@@ -78,7 +78,7 @@ def next_line(lines):
         if line is not None:
             print(line, file=ns)
         if ch - 1 != nch:
-            print("chapter count mismatch: summary {ch - 1}, dir {nch}", file=sys.stderr)
+            print(f"chapter count mismatch: summary {ch - 1}, dir {nch}", file=sys.stderr)
             exit(1)
 
 sed_script = Path("rechapter.sed")