Pi calc works for 100 and 1,000 digits

Author: ckormanyos

examples/chapter11_07a/readme.md

@@ -0,0 +1,12 @@
+# Example Chapter11_07a
+## Preemptive Multitasking
+
+This example makes advanced use
+of preemptive multitasking scheduling with a highly compley pi-spigot calculation
+combined with a blinky-style application. The pi calculation
+is performed perpetually and cyclically (and also numerically verified)
+in a low-priority background task.
+
+## Application Description
+
+TODO

examples/chapter11_07a/src/app/led/app_led.cpp

@@ -19,9 +19,12 @@ namespace
 
   app_led_timer_type app_led_timer_background;
   app_led_timer_type app_led_timer_toggle_led0;
+
+  bool result_pi_calc_is_ok { true };
 }
 
-extern auto manip_container() -> bool;
+extern "C"
+auto pi_main() -> int;
 
 extern "C"
 void app_led_task_background(void*)
@@ -33,20 +36,21 @@ void app_led_task_background(void*)
 
   for(;;)
   {
-    while((!app_led_timer_background.timeout()))
-    {
-      mcal::cpu::nop();
-    }
+    const int next_pi_result { pi_main() };
 
-    if(!manip_container())
+    result_pi_calc_is_ok = ((next_pi_result == int { INT8_C(0) }) && result_pi_calc_is_ok);
+
+    if(!result_pi_calc_is_ok)
     {
-      for(;;) { ; }
+      // If the pi calculation is wrong, exercise a hard, visible error
+      // that stops the perpetual calculation loop.
+      for(;;)
+      {
+        mcal::cpu::nop();
+
+        mcal::wdg::secure::trigger();
+      }
     }
-    app_led_timer_background.start_interval(app_led_timer_type::milliseconds(app_led_tick_type { UINT8_C(50) }));
-
-    // Toggle led1 every 50ms.
-
-    mcal::led::led1().toggle();
   }
 }
 

examples/chapter11_07a/src/app/pi_calc_cfg.h

@@ -9,15 +9,17 @@
   #define PI_CALC_CFG_2023_05_09_H
 
   //#define PI_CRUNCH_METAL_STANDALONE_MAIN
-  //#define PI_CRUNCH_METAL_DISABLE_IOSTREAM
+  #if !defined(PI_CRUNCH_METAL_DISABLE_IOSTREAM)
+  #define PI_CRUNCH_METAL_DISABLE_IOSTREAM
+  #endif
 
   #define PI_CRUNCH_METAL_PI_SPIGOT_USE_100_DIGITS      100
   #define PI_CRUNCH_METAL_PI_SPIGOT_USE_1K_DIGITS      1000
   #define PI_CRUNCH_METAL_PI_SPIGOT_USE_10K_DIGITS    10000
   #define PI_CRUNCH_METAL_PI_SPIGOT_USE_100K_DIGITS  100000
 
   #if !defined(PI_CRUNCH_METAL_PI_SPIGOT_DIGITS)
-  #define PI_CRUNCH_METAL_PI_SPIGOT_DIGITS  PI_CRUNCH_METAL_PI_SPIGOT_USE_10K_DIGITS
+  #define PI_CRUNCH_METAL_PI_SPIGOT_DIGITS  PI_CRUNCH_METAL_PI_SPIGOT_USE_1K_DIGITS
   #endif
 
 #endif // PI_CALC_CFG_2023_05_09_H

examples/chapter11_07a/src/app/pi_spigot/pi_spigot.cpp

@@ -28,8 +28,8 @@
 
 #include <math/checksums/hash/hash_sha1.h>
 #include <math/pi_spigot/pi_spigot.h>
-#if !defined(PI_CRUNCH_METAL_STANDALONE_MAIN)
 #include <mcal_benchmark.h>
+#if !defined(PI_CRUNCH_METAL_STANDALONE_MAIN)
 #include <mcal_memory/mcal_memory_sram_array.h>
 #endif
 #include <util/utility/util_baselexical_cast.h>
@@ -70,9 +70,7 @@ namespace local
 
   auto pi_output_digits10 = static_cast<std::uint32_t>(UINT8_C(0));
 
-  #if !defined(PI_CRUNCH_METAL_STANDALONE_MAIN)
   using benchmark_port_type = ::mcal::benchmark::benchmark_port_type;
-  #endif
 
   #if defined(PI_CRUNCH_METAL_STANDALONE_MAIN)
   using mcal_sram_uintptr_t = std::uintptr_t;
@@ -94,27 +92,15 @@ namespace local
 
 extern "C"
 {
-  auto mcal_led_toggle() -> void;
-
   auto pi_main() -> int;
-
-  auto pi_led_toggle() -> void;
-}
-
-extern "C"
-auto pi_led_toggle() -> void
-{
-  ::mcal_led_toggle();
 }
 
 extern auto pi_lcd_progress(const std::uint32_t pi_output_digits10) -> void;
 extern auto pi_count_of_calculations() -> std::uint32_t&;
 
 auto pi_main() -> int
 {
-  #if !defined(PI_CRUNCH_METAL_STANDALONE_MAIN)
   local::benchmark_port_type::toggle_pin();
-  #endif
 
   local::pi_spigot_instance.calculate(local::pi_spigot_input.data(), pi_lcd_progress, &local::pi_spigot_hash);
 

examples/chapter11_07a/src/mcal/avr/mcal_benchmark.h

@@ -19,8 +19,8 @@
     {
       using benchmark_port_type = mcal::port::port_pin<std::uint8_t,
                                                        std::uint8_t,
-                                                       mcal::reg::portd,
-                                                       UINT8_C(3)>;
+                                                       mcal::reg::portb,
+                                                       UINT8_C(2)>;
     }
   }
 

examples/chapter11_07a/src/sys/start/sys_start.cpp

@@ -6,6 +6,7 @@
 //
 
 #include <app/led/app_led.h>
+#include <mcal_benchmark.h>
 #include <mcal/mcal.h>
 #include <os/os_task.h>
 
@@ -15,51 +16,24 @@
 
 ATTRIBUTE(used,noinline) auto main() -> int;
 
-auto manip_container() -> bool;
-
-constexpr auto sram_start_address = static_cast<mcal_sram_uintptr_t>(UINT8_C(0));
-
-using sram_container_type =
-  mcal::memory::sram::array<std::uint32_t,
-                            std::uint32_t { UINT32_C(1024) * UINT32_C(1024) },
-                            sram_start_address>;
-
-sram_container_type container { };
-
 auto main() -> int
 {
   // Initialize the microcontroller abstraction layer.
   mcal::init();
 
+  using benchmark_port_type = ::mcal::benchmark::benchmark_port_type;
+
+  benchmark_port_type::set_direction_output();
+
   mcal::spi::sram::mcal_spi_sram_type::init();
 
   // Configure and create the OS tasks. These macros
   // also setup the task static resources including the
   // task control block structures and task stacks.
 
-  OS_TASK_CREATE(app_led_task_background,  nullptr, 1U, 64U);
-  OS_TASK_CREATE(app_led_task_toggle_led0, nullptr, 3U, 64U);
+  OS_TASK_CREATE(app_led_task_background,  nullptr, 1U, 512U);
+  OS_TASK_CREATE(app_led_task_toggle_led0, nullptr, 3U,  32U);
 
   // Start the OS scheduler (and never return).
   OS_TASK_START_SCHEDULER();
 }
-
-auto manip_container() -> bool
-{
-  static sram_container_type::pointer my_sram_ptr { container.data() };
-  static std::uint32_t my_sram_value { };
-
-  *my_sram_ptr = my_sram_value;
-
-  const bool result_sram_is_ok { (*my_sram_ptr == my_sram_value) };
-
-  ++my_sram_ptr;
-  ++my_sram_value;
-
-  if(my_sram_ptr == container.data() + container.size())
-  {
-    my_sram_ptr = container.data();
-  }
-
-  return result_sram_is_ok;
-}

ref_app/tools/AVR/avrdude/avrdude-v8.0-windows-x64/09_08.bat

@@ -0,0 +1,27 @@
+rem ///////////////////////////////////////////////////////////////////////////////
+rem //  Copyright Christopher Kormanyos 2007 - 2025.
+rem //  Distributed under the Boost Software License,
+rem //  Version 1.0. (See accompanying file LICENSE_1_0.txt
+rem //  or copy at http://www.boost.org/LICENSE_1_0.txt)
+rem //
+
+echo off
+
+set AVRDUDE=.\avrdude.exe
+
+set HEX=../../../../../examples/chapter09_08/bin/chapter09_08.hex
+
+rem Erase the chip.
+echo "Erase the chip."
+%AVRDUDE% -c avrisp2 -p m328p -P usb -e
+echo.
+
+rem Flash the HEX-file.
+echo "Flash the HEX-file."
+%AVRDUDE% -c avrisp2 -p m328p -P usb -U flash:w:%HEX%:i
+echo.
+
+rem Verify the flash.
+echo "Verify the flash."
+%AVRDUDE% -c avrisp2 -p m328p -P usb -U flash:v:%HEX%:i
+echo.