Merge branch 'ksng' into no-rtos

Required minor manual intervention to resolve merge issues git had no
way of understanding: git is clever, but not quite clever enough to
understand that a commit in branch had removed the entire RTOS that a
commit in the other branch was using.  No big deal, just a couple of
osDelay() calls  needing conversion to HAL_Delay() or task_delay().

1 files changed, 4 insertions, 0 deletions

diff --git a/projects/hsm/hsm.c b/projects/hsm/hsm.c
index 60fa2bd..55c41db 100644
--- a/projects/hsm/hsm.c
+++ b/projects/hsm/hsm.c
@@ -386,6 +386,10 @@ task_mutex_t ks_mutex = { 0 };
 void hal_ks_lock(void)   { task_mutex_lock(&ks_mutex); }
 void hal_ks_unlock(void) { task_mutex_unlock(&ks_mutex); }
 
+/* Sleep for specified number of seconds.
+ */
+void hal_sleep(const unsigned seconds) { task_delay(seconds * 1000); }
+
 /* The main task. This does all the setup, and the worker tasks handle
  * the rest.
  */