Updated RPi Tests

Author: LucAce

rpi/rpi_strand_test.py rpi/rpi_strand_gpo_test.pyrpi/rpi_strand_test.py renamed to rpi/rpi_strand_gpo_test.py

@@ -23,19 +23,21 @@
 #
 #******************************************************************************
 #
-# File:  rpi_strand_test.py
+# File:  rpi_strand_gpo_test.py
 # Date:  Sun Aug 18 12:00:00 EDT 2019
 #
 # Functional Description:
 #
-#   Raspberry Pi Based Strand Test
+#   Raspberry Pi Strand Plus GPO Test
+#
+# Notes:
+#
+#   - Raspbery Pi SPI Master Code
+#   - RPi Board Pin 36 is used as an Active Low FPGA Logic Reset
+#   - RPi CE0 is used for the FPGA User SPI Slave Chip Select
 #
 #******************************************************************************
 
-# Raspbery Pi SPI Master Code
-# Board Pin 36 is used as an Active Low FPGA Logic Reset
-# RPi CE0 is used for the FPGA User SPI Slave Chip Select
-
 import sys
 import time
 import spidev
@@ -46,6 +48,8 @@
 metrics['tx_sum']     = 0
 metrics['tx_max']     = 0
 metrics['tx_min']     = 10000
+fc_count = 0
+led_state = 0
 
 def spi_transfer(msg, verbose):
     if (verbose == 1):
@@ -103,25 +107,31 @@ def reg_write(offset, wdata):
     print()
 
 def rgb_load(rgb):
+    global fc_count
+
     msg = [0x04]
     msg.extend(rgb)
     retval = spi_transfer(msg, 0)
 
     # Wait until not Almost fulll
-    while ((retval[-1] & 0x08) == 1):
-        print ("Flow Controlled")
+    while ((retval[-1] & 0x08) != 0x00):
+        # print ("Flow Controlled")
         msg = [0x00, 0x00, 0x00, 0x00]
         retval = spi_transfer(msg, 0)
+        fc_count += 1
 
 def rgb_reset_code():
+    global fc_count
+
     msg = [0x07, 0xA5]
     retval = spi_transfer(msg, 0)
 
     # Wait until not Almost fulll
-    while ((retval[-1] & 0x08) == 1):
-        print ("Flow Controlled")
+    while ((retval[-1] & 0x08) !=0x00):
+        # print ("Flow Controlled")
         msg = [0x00, 0x00, 0x00, 0x00]
         retval = spi_transfer(msg, 0)
+        fc_count += 1
 
 
 RESET_PIN = 36
@@ -138,7 +148,7 @@ def rgb_reset_code():
 spi.open(BUS_ID, DEVICE_ID)
 
 # Set SPI speed and mode
-spi.max_speed_hz = 1953000
+spi.max_speed_hz = 15600000
 spi.mode = 0
 
 print ("\nReset FPGA Fabric Logic")
@@ -154,7 +164,7 @@ def rgb_reset_code():
 print ("Issue Hardware Revision Command")
 revision_read()
 
-# print ("Issue Register Write Command (Reset Code Timing")
+print ("Issue Register Write Command (Reset Code Timing)")
 reg_write(0x0C, [0xA0])
 
 print ("Issue Register Reads Command (All Registers)")
@@ -164,6 +174,9 @@ def rgb_reset_code():
 reg_write(0xF2, [0x12, 0x34, 0x56, 0x78])
 reg_read(0xF2, 4)
 
+print ("Enabling LEDs")
+reg_write(0xF1, [3])
+
 print ("Issue RGB Commands")
 loop_count = 1
 while (1):
@@ -229,9 +242,24 @@ def rgb_reset_code():
         if (delta < metrics['tx_min']):
             metrics['tx_min'] = delta
 
+    # Set PCB LED
+    if (led_state == 0):
+        reg_write(0xF0, [1])
+        led_state = 1
+    elif (led_state == 1):
+        reg_write(0xF0, [2])
+        led_state = 2
+    elif (led_state == 2):
+        reg_write(0xF0, [3])
+        led_state = 3
+    else:
+        reg_write(0xF0, [0])
+        led_state = 0
+
     # Render Average
     metrics['rend_avg'] = (metrics['tx_sum'] / metrics['loop_count'])
-    print("LEDs: %1d; Current Render: %9f; TX Avg: %9f; TX Max: %9f, TX Min: %9f" % (LED_COUNT, cdelta, metrics['rend_avg'], metrics['tx_max'], metrics['tx_min']))
+    print("LEDs: %1d; Current Render: %9f; TX Avg: %9f; TX Max: %9f, TX Min: %9f; Flow Control: %5d" % (LED_COUNT, cdelta, metrics['rend_avg'], metrics['tx_max'], metrics['tx_min'], fc_count))
+    fc_count = 0
 
 spi.close()
 exit()

rpi/rpi_fpga_test.py rpi/rpi_strand_walking_pixel_test.pyrpi/rpi_fpga_test.py renamed to rpi/rpi_strand_walking_pixel_test.py

@@ -23,19 +23,21 @@
 #
 #******************************************************************************
 #
-# File:  rpi_fpga_test.py
+# File:  rpi_strand_walking_pixel_test.py
 # Date:  Sun Aug 18 12:00:00 EDT 2019
 #
 # Functional Description:
 #
-#   Raspberry Pi Based FPGA Test
+#   Raspberry Pi Strand Walking Pixel Test
+#
+# Notes:
+#
+#   - Raspbery Pi SPI Master Code
+#   - RPi Board Pin 36 is used as an Active Low FPGA Logic Reset
+#   - RPi CE0 is used for the FPGA User SPI Slave Chip Select
 #
 #******************************************************************************
 
-# Raspbery Pi SPI Master Code
-# Board Pin 36 is used as an Active Low FPGA Logic Reset
-# RPi CE0 is used for the FPGA User SPI Slave Chip Select
-
 import sys
 import time
 import spidev
@@ -116,7 +118,7 @@ def rgb_reset_code():
 RESET_PIN = 36
 BUS_ID = 0
 DEVICE_ID = 0
-LED_COUNT = 5
+LED_COUNT = 60
 
 # Reset is on board pin 36
 GPIO.setmode(GPIO.BOARD)
@@ -127,7 +129,7 @@ def rgb_reset_code():
 spi.open(BUS_ID, DEVICE_ID)
 
 # Set SPI speed and mode
-spi.max_speed_hz = 3900000
+spi.max_speed_hz = 1953000
 spi.mode = 0
 
 print ("\nReset FPGA Fabric Logic")
@@ -143,7 +145,10 @@ def rgb_reset_code():
 print ("Issue Hardware Revision Command, 3 Bytes")
 revision_read()
 
-print ("Issue Register Reads Command, 16 Bytes")
+print ("Issue Register Write Command (Reset Code Timing), 3 Bytes")
+reg_write(0x0C, [0xA0])
+
+print ("Issue Register Reads Command (All Registers)")
 reg_read(0x00, 0x0D)
 
 print ("Issue Register Write Command (Scratch Pad), 6 Bytes")