More precise delays (issue #4)

wagiminator · wagiminator · commit 12524175d754 · 2023-11-19T09:07:53.000+01:00
diff --git a/picoAVR_Programmer/software/picoavr.bin b/picoAVR_Programmer/software/picoavr.bin
diff --git a/picoAVR_Programmer/software/src/delay.c b/picoAVR_Programmer/software/src/delay.c
@@ -1,9 +1,8 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #include "delay.h"
-#include "ch554.h"
 
 // ===================================================================================
 // Delay in Units of us
@@ -22,40 +21,40 @@ void DLY_us(uint16_t n) {           // delay in us
   #endif
 
   while(n) {                        // total = 12~13 Fsys cycles, 1uS @Fsys=12MHz
-    SAFE_MOD++;                     // 2 Fsys cycles, for higher Fsys, add operation here
+    __asm__("inc _SAFE_MOD");       // 2 Fsys cycles, for higher Fsys, add operation here
     #ifdef F_CPU
       #if F_CPU >= 14000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 16000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 18000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 20000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 22000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 24000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 26000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 28000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 30000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 32000000
-		    SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
     #endif
-		n--;
+    --n;
   }
 }
 
@@ -64,7 +63,8 @@ void DLY_us(uint16_t n) {           // delay in us
 // ===================================================================================
 void DLY_ms(uint16_t n) {           // delay in ms
   while(n) {
-    DLY_us(1000);
-    n--;
+    while(!(TKEY_CTRL & bTKC_IF));
+		while(TKEY_CTRL & bTKC_IF);
+		--n;
   }
 }
diff --git a/picoAVR_Programmer/software/src/delay.h b/picoAVR_Programmer/software/src/delay.h
@@ -1,9 +1,10 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #pragma once
 #include <stdint.h>
+#include "ch554.h"
 
 void DLY_us(uint16_t n);   // delay in units of us
 void DLY_ms(uint16_t n);   // delay in units of ms
diff --git a/picoISP_Programmer/software/picoasp/picoasp.bin b/picoISP_Programmer/software/picoasp/picoasp.bin
diff --git a/picoISP_Programmer/software/picoasp/src/delay.c b/picoISP_Programmer/software/picoasp/src/delay.c
@@ -1,9 +1,8 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #include "delay.h"
-#include "ch554.h"
 
 // ===================================================================================
 // Delay in Units of us
@@ -22,39 +21,39 @@ void DLY_us(uint16_t n) {           // delay in us
   #endif
 
   while(n) {                        // total = 12~13 Fsys cycles, 1uS @Fsys=12MHz
-    SAFE_MOD++;                     // 2 Fsys cycles, for higher Fsys, add operation here
+    __asm__("inc _SAFE_MOD");       // 2 Fsys cycles, for higher Fsys, add operation here
     #ifdef F_CPU
       #if F_CPU >= 14000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 16000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 18000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 20000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 22000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 24000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 26000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 28000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 30000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 32000000
-		    SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
     #endif
-		n--;
+    --n;
   }
 }
diff --git a/picoISP_Programmer/software/picoasp/src/delay.h b/picoISP_Programmer/software/picoasp/src/delay.h
@@ -1,8 +1,9 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #pragma once
 #include <stdint.h>
+#include "ch554.h"
 
 void DLY_us(uint16_t n);   // delay in units of us
diff --git a/picoISP_Programmer/software/picoisp/picoisp.bin b/picoISP_Programmer/software/picoisp/picoisp.bin
diff --git a/picoISP_Programmer/software/picoisp/src/delay.c b/picoISP_Programmer/software/picoisp/src/delay.c
@@ -1,9 +1,8 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #include "delay.h"
-#include "ch554.h"
 
 // ===================================================================================
 // Delay in Units of us
@@ -22,39 +21,39 @@ void DLY_us(uint16_t n) {           // delay in us
   #endif
 
   while(n) {                        // total = 12~13 Fsys cycles, 1uS @Fsys=12MHz
-    SAFE_MOD++;                     // 2 Fsys cycles, for higher Fsys, add operation here
+    __asm__("inc _SAFE_MOD");       // 2 Fsys cycles, for higher Fsys, add operation here
     #ifdef F_CPU
       #if F_CPU >= 14000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 16000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 18000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 20000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 22000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 24000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 26000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 28000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 30000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 32000000
-		    SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
     #endif
-		n--;
+    --n;
   }
 }
diff --git a/picoISP_Programmer/software/picoisp/src/delay.h b/picoISP_Programmer/software/picoisp/src/delay.h
@@ -1,8 +1,9 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #pragma once
 #include <stdint.h>
+#include "ch554.h"
 
 void DLY_us(uint16_t n);   // delay in units of us
diff --git a/picoISP_Programmer/software/picostk/picostk.bin b/picoISP_Programmer/software/picostk/picostk.bin
diff --git a/picoISP_Programmer/software/picostk/src/delay.c b/picoISP_Programmer/software/picostk/src/delay.c
@@ -1,9 +1,8 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #include "delay.h"
-#include "ch554.h"
 
 // ===================================================================================
 // Delay in Units of us
@@ -22,39 +21,39 @@ void DLY_us(uint16_t n) {           // delay in us
   #endif
 
   while(n) {                        // total = 12~13 Fsys cycles, 1uS @Fsys=12MHz
-    SAFE_MOD++;                     // 2 Fsys cycles, for higher Fsys, add operation here
+    __asm__("inc _SAFE_MOD");       // 2 Fsys cycles, for higher Fsys, add operation here
     #ifdef F_CPU
       #if F_CPU >= 14000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 16000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 18000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 20000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 22000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 24000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 26000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 28000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 30000000
-        SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
       #if F_CPU >= 32000000
-		    SAFE_MOD++;
+        __asm__("inc _SAFE_MOD");
       #endif
     #endif
-		n--;
+    --n;
   }
 }
diff --git a/picoISP_Programmer/software/picostk/src/delay.h b/picoISP_Programmer/software/picostk/src/delay.h
@@ -1,8 +1,9 @@
 // ===================================================================================
-// Delay Functions for CH551, CH552 and CH554
+// Delay Functions for CH551, CH552 and CH554                                 * v1.1 *
 // ===================================================================================
 
 #pragma once
 #include <stdint.h>
+#include "ch554.h"
 
 void DLY_us(uint16_t n);   // delay in units of us
