Improved demo

Author: stevenewald

src/entrypoint.cpp

@@ -11,7 +11,6 @@ extern void ipc_part2(void);
 extern void exception_task(void);
 extern void spinlock_task(void);
 extern void ending_task(void);
-extern void sensor_task(void);
 extern void captouch_task(void);
 
 int main(void)
@@ -29,7 +28,5 @@ int main(void)
     edge::scheduler.add_task(spinlock_task);
     edge::scheduler.add_task(ending_task);
 
-    edge::scheduler.add_task(sensor_task);
-
     edge::scheduler.start_scheduler();
 }

src/scheduler/pending_process_callbacks.cpp

@@ -15,7 +15,7 @@ void PendingProcessCallbacks::add_ready_callback(
 )
 {
     if (ready_callbacks[process_id].size() == MAX_READY_CALLBACKS) {
-        printf("Process %d is OUT OF SPACE FOR CALLBACKS\n", process_id);
+        // printf("Process %d is OUT OF SPACE FOR CALLBACKS\n", process_id);
         return;
     }
     ready_callbacks[process_id].emplace_back(callback, arg1, arg2);

src/scheduler/user_callback_storage.cpp

@@ -20,7 +20,9 @@ void UserCallbackStorage::set_callback(ProcessId id, ProcessCallbackPtr ptr)
 void UserCallbackStorage::call_callback(ProcessId id, int arg1, int arg2)
 {
     if (!has_callback(id)) {
-        panic("Attempted to call callback when it has not been set");
+        printf(
+            "Attempted to call callback when it has not been set for process %d\n", id
+        );
     }
 
     PendingProcessCallbacks::get().add_ready_callback(id, callbacks_[id], arg1, arg2);

src/user_programs/user_program_ipc_part_2.cpp

@@ -8,10 +8,14 @@ void ipc_part2(void)
     static void (*on_button_press)(ButtonType, ButtonState) = [](ButtonType type,
                                                                  ButtonState state) {
         if (state == ButtonState::DOWN) {
-            if (type == ButtonType::A)
+            if (type == ButtonType::A) {
+                edge::userlib::debug_print("Button A pressed\n");
                 send_ipc("LED_DISPLAY", true);
-            else
+            }
+            else {
                 send_ipc("LED_DISPLAY", false);
+                edge::userlib::debug_print("Button B pressed\n");
+            }
         }
     };
 

src/user_programs/user_program_sensor.cpp

@@ -1,15 +1,12 @@
+#include "nrf_delay.h"
 #include "userlib/syscalls.hpp"
 
 #include <cstdint>
 
 void spinlock_task(void)
 {
-    volatile uint64_t i = 0;
     while (1) {
-        if (i == 100'000'000) {
-            edge::userlib::debug_print("Spinlock Task : Still Spinlocked.\n");
-            i = 0;
-        }
-        i = i + 1;
+        nrf_delay_ms(1000);
+        edge::userlib::debug_print("Spinlock Task : Still Spinlocked.\n");
     }
 }