Fixed timeout in _rxraw

totalspectrum · Aug 29, 2023 · 40fd35a · 40fd35a
1 parent a268733
commit 40fd35a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -6,6 +6,7 @@ Version 6.4.0
 - Fixed some quirks in the space/tab warning code
 - Fixed incorrect expansion of field[ptr][n]~~
 - Fixed an incompatibility between _tx and debug()
+- Fixed timeout in _rxraw() (test was wrong way around)
 - Improved range of sin and cos functions
 - Improved performance of flash access in littlefs (thanks, Evan!)
 - Updated -gbrk code to most recent from Chip, and add support for brk #0 interactive debug (thanks, Ada!)

diff --git a/sys/nucode_util.spin b/sys/nucode_util.spin
@@ -147,7 +147,7 @@ pri _rxraw(timeout = 0) : rxbyte = long | z, endtime, temp2, rxpin
       rxbyte := _rdpin(rxpin)>>24
       quit
     if timeout
-      if _getcnt() - endtime < 0
+      if endtime - _getcnt() < 0
         quit
 
 ''

diff --git a/sys/nucode_util.spin.h b/sys/nucode_util.spin.h
diff --git a/sys/p1_code.spin b/sys/p1_code.spin
@@ -162,7 +162,7 @@ pri _rxraw(timeout = 0) | val, waitcycles, i, bitcycles
     repeat
       if ina[_rxpin] == 0
         quit
-      if waitcycles - cnt < 0
+      if cnt - waitcycles < 0
         return -1
   else
     repeat until ina[_rxpin] == 0

diff --git a/sys/p1_code.spin.h b/sys/p1_code.spin.h
diff --git a/sys/p2_code.spin b/sys/p2_code.spin
@@ -212,7 +212,7 @@ pri _rxraw(timeout = 0) : rxbyte = long | z, endtime, temp2, rxpin
   if_z    shr    temp2, #32 - 28
 .breakone
     endasm
-  until z or (timeout and (_getcnt() - endtime < 0))
+  until z or (timeout and (endtime - _getcnt() < 0))
   if z
     rxbyte := temp2 & $ff
   _rx_temp := temp2

diff --git a/sys/p2_code.spin.h b/sys/p2_code.spin.h