Completed functioning TX/RX system between Props

cspang1 · May 10, 2018 · f5575c8 · f5575c8 · konimaru · May 14, 2018
1 parent c3445dd
commit f5575c8
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 47 deletions.
diff --git a/Dev/Game/Software/rx_test.spin b/Dev/Game/Software/rx_test.spin
@@ -0,0 +1,37 @@
+{{
+        File:     txrx.spin
+        Author:   Connor Spangler
+        Date:     5/9/2018
+        Version:  1.0
+        Description: 
+                  This file contains the PASM code defining a test transmission routine
+}}
+
+CON
+  ' Clock settings
+  _clkmode = xtal1 + pll16x     ' Standard clock mode w/ 16x PLL
+  _xinfreq = 6_500_000          ' 6.5 MHz clock for x16 = 104 MHz
+
+OBJ
+  vga_rx        : "vga_rx"      ' Import graphics reception system
+  serial        : "FullDuplexSerial"
+
+PUB main | time, indx
+  serial.Start(31, 30, %0000, 57600)
+  waitcnt(cnt + (1 * clkfreq))
+
+  vga_rx.start(@output)
+  indx := 0
+  time := cnt
+
+  repeat
+    waitcnt(time += (clkfreq/60))
+    serial.Hex(long[@output][indx], 8)
+    serial.Tx($0D)
+    indx++
+    if indx == ((40*30*2)+(32*16)*2+(64*4))/4
+      indx := 0
+
+DAT
+
+output        long      0[((40*30*2)+(32*16)*2+(64*4))/4]
diff --git a/Dev/Game/Software/tx_test.spin b/Dev/Game/Software/tx_test.spin
@@ -0,0 +1,28 @@
+{{
+        File:     txrx.spin
+        Author:   Connor Spangler
+        Date:     5/9/2018
+        Version:  1.0
+        Description: 
+                  This file contains the PASM code defining a test transmission routine
+}}
+
+CON
+  ' Clock settings
+  _clkmode = xtal1 + pll16x     ' Standard clock mode w/ 16x PLL
+  _xinfreq = 6_500_000          ' 6.5 MHz clock for x16 = 104 MHz
+
+OBJ
+  vga_tx        : "vga_tx"      ' Import graphics transmission system
+
+PUB main | time, indx
+  vga_tx.start(@input)
+  time := cnt
+
+  repeat
+    waitcnt(time += (clkfreq/60))
+    vga_tx.transmit
+
+DAT
+
+input         long      $ABCD_DCBA[((40*30*2)+(32*16)*2+(64*4))/4]
diff --git a/Dev/Game/Software/txrx.spin b/Dev/Game/Software/txrx.spin
diff --git a/Dev/Game/Software/vga_rx.spin b/Dev/Game/Software/vga_rx.spin
@@ -33,8 +33,8 @@ PUB receive
   cont_ := FALSE
 
 PUB stop                                                ' Function to stop reception driver
-    if cog_                                             ' If cog is running
-      cogstop(cog_~ - 1)                                ' Stop the cog
+  if cog_                                             ' If cog is running
+    cogstop(cog_~ - 1)                                ' Stop the cog
 
 DAT
         org             0
@@ -45,16 +45,15 @@ rx
         rdlong          bufptr, par             ' Initialize pointer to variables
 
         ' Initialize pins
-        andn            dira,   RxPin           ' Set output pin {{ DOES THIS BREAK??? }}
+        andn            dira,   RxPin           ' Set output pin
         or              outa,   RxPin           ' Set pin high for ACK
 
         ' Receive graphics buffer
 rxbuff  mov             bufsiz, BuffSz          ' Initialize graphics buffer size
         mov             curlng, bufptr          ' Initialize graphics buffer location
 
         ' Receive long
-:rxlong mov             rxval,  #0              ' Zero reception long buffer {{ NECESSARY??? }}
-        waitpeq         RxPin,  RxPin           ' Wait for ACK
+:rxlong waitpeq         RxPin,  RxPin           ' Wait for ACK
 
         ' Receive bits
 :rxbits test            RxPin,  ina wc          ' Get bit
@@ -143,4 +142,4 @@ bufsiz        res       1       ' Container for size of graphics buffer
 curlng        res       1       ' Container for current long address
 rxval         res       1       ' Container for current long
 
-        fit
+        fit
diff --git a/Dev/Game/Software/vga_tx.spin b/Dev/Game/Software/vga_tx.spin
@@ -64,6 +64,7 @@ txbuff  mov             bufsiz, BuffSz          ' Initialize graphics buffer siz
 
         ' Setup long transmission start
         mov             phsa,   TxStart         ' Send one bit high
+        nop
         mov             phsa,   txval           ' Stage long for transfer
 
         ' Transmit bits