From c2e022b4b1cd76b88a6a5abdfa3410d0b47a55d5 Mon Sep 17 00:00:00 2001
From: TMRh20 <tmrh20@gmail.com>
Date: Tue, 20 Feb 2024 17:11:02 -0600
Subject: [PATCH 1/2] Fix for BluePill

- Rename clock.h to RF24_clock.h
---
 utility/{clock.h => RF24_clock.h} | 6 +++---
 utility/uiptimer.c                | 2 +-
 utility/uiptimer.h                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename utility/{clock.h => RF24_clock.h} (96%)

diff --git a/utility/clock.h b/utility/RF24_clock.h
similarity index 96%
rename from utility/clock.h
rename to utility/RF24_clock.h
index f34d78f..77c05a5 100644
--- a/utility/clock.h
+++ b/utility/RF24_clock.h
@@ -49,8 +49,8 @@
  *
  * $Id: clock.h,v 1.3 2006/06/11 21:46:39 adam Exp $
  */
-#ifndef __CLOCK_H__
-#define __CLOCK_H__
+#ifndef __RF24_CLOCK_H__
+#define __RF24_CLOCK_H__
 
 #include "clock-arch.h"
 
@@ -80,7 +80,7 @@ clock_time_t clock_time(void);
 #ifdef CLOCK_CONF_SECOND
 #define CLOCK_SECOND CLOCK_CONF_SECOND
 #else
-#define CLOCK_SECOND (clock_time_t)32
+#define CLOCK_SECOND (RF24_clock_time_t)32
 #endif
 
 #endif /* __CLOCK_H__ */
diff --git a/utility/uiptimer.c b/utility/uiptimer.c
index 986a45d..32fad08 100644
--- a/utility/uiptimer.c
+++ b/utility/uiptimer.c
@@ -45,7 +45,7 @@
  * $Id: timer.c,v 1.2 2006/06/12 08:00:30 adam Exp $
  */
 
-#include "clock.h"
+#include "RF24_clock.h"
 #include "uiptimer.h"
 
 /*---------------------------------------------------------------------------*/
diff --git a/utility/uiptimer.h b/utility/uiptimer.h
index f9bc8c1..6c25083 100644
--- a/utility/uiptimer.h
+++ b/utility/uiptimer.h
@@ -61,7 +61,7 @@
 #ifndef __UIPTIMER_H__
 #define __UIPTIMER_H__
 
-#include "clock.h"
+#include "RF24_clock.h"
 
 /**
  * A timer.

From 8af59af132265541d9d6a780f7c3bf602f00413c Mon Sep 17 00:00:00 2001
From: TMRh20 <tmrh20@gmail.com>
Date: Tue, 20 Feb 2024 17:13:48 -0600
Subject: [PATCH 2/2] Minor change to last commit

---
 utility/RF24_clock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utility/RF24_clock.h b/utility/RF24_clock.h
index 77c05a5..5a3c89b 100644
--- a/utility/RF24_clock.h
+++ b/utility/RF24_clock.h
@@ -80,7 +80,7 @@ clock_time_t clock_time(void);
 #ifdef CLOCK_CONF_SECOND
 #define CLOCK_SECOND CLOCK_CONF_SECOND
 #else
-#define CLOCK_SECOND (RF24_clock_time_t)32
+#define CLOCK_SECOND (clock_time_t)32
 #endif
 
 #endif /* __CLOCK_H__ */