LDPC FEC now enabled by default.

tx_picam.py

@@ -20,7 +20,7 @@ except:
 
 print("Using callsign: %s" % callsign)
 
-fec = False
+fec = True
 debug_output = False # If True, packet bits are saved to debug.bin as one char per bit.
 
 def transmit_file(filename, tx_object):

tx_picam_rate_test.py

@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-#
-#	PiCam Transmitter Script
-#	Capture images from the PiCam, and transmit them.
-#	Multiple baud rate test version.
-#
-#	Mark Jessop <vk5qi@rfhead.net>
-#
-
-import PacketTX,  sys, os, datetime, time
-from PacketTX import write_debug_message
-from wenet_util import *
-
-try:
-	callsign = sys.argv[1]
-	if len(callsign)>6:
-		callsign = callsign[:6]
-except:
-	print("Usage: python tx_picam.py CALLSIGN ")
-	sys.exit(1)
-
-print("Using callsign: %s" % callsign)
-
-
-fec = False
-debug_output = False # If True, packet bits are saved to debug.bin as one char per bit.
-
-baud_rate_1 = 115200
-baud_rate_2 = 19200
-
-def transmit_file(filename, tx_object):
-	file_size = os.path.getsize(filename)
-
-	if file_size % 256 > 0:
-		tx.set_idle_message("File size not a multiple of 256 bytes!")
-		return
-
-	print("Transmitting %d Packets." % (file_size/256))
-
-	f = open(filename,'rb')
-
-	for x in range(file_size/256):
-		data = f.read(256)
-		tx_object.tx_packet(data)
-
-	f.close()
-	print("Waiting for tx queue to empty...")
-	tx_object.wait()
-
-tx = PacketTX.PacketTX(debug=debug_output, callsign=callsign,serial_baud=baud_rate_1)
-tx.start_tx()
-
-image_id = 0
-
-try:
-	while True:
-		# Capture image using PiCam
-		print("Capturing Image...")
-		capture_time = datetime.datetime.utcnow().strftime("%Y%m%d-%H%M%SZ")
-		capture_multiple(filename="./tx_images/%s.jpg"%capture_time, debug_ptr = tx.set_idle_message)
-		#os.system("raspistill -t 100 -o ./tx_images/%s.jpg -vf -hf -w 1024 -h 768" % capture_time)
-		# Resize using convert
-		tx.set_idle_message("Converting Image to SSDV...")
-		#os.system("convert temp.jpg -resize %s\! temp.jpg" % tx_resolution)
-		# SSDV'ify the image.
-		os.system("ssdv -e -n -c %s -i %d ./tx_images/%s.jpg temp.ssdv" % (callsign,image_id,capture_time))
-		# Transmit image
-		print("Transmitting...")
-
-		# Transmit first in 115200 baud.
-		transmit_file("temp.ssdv",tx)
-		tx.close()
-		time.sleep(2)
-
-		# Transmit again in 19200 baud
-		tx = PacketTX.PacketTX(debug=debug_output, callsign=callsign, serial_baud=baud_rate_2, fec = fec)
-		tx.start_tx()
-		transmit_file("temp.ssdv",tx)
-		tx.close()
-		time.sleep(2)
-
-		# Re-open TX in 115200 baud.
-		tx = PacketTX.PacketTX(debug=debug_output, callsign=callsign, serial_baud=baud_rate_1, fec = fec)
-		tx.start_tx()
-
-		# Increment Counter
-		image_id = (image_id+1)%256
-except KeyboardInterrupt:
-	print("Closing")
-	tx.close()

wenet_util.py

@@ -11,7 +11,7 @@ from PacketTX import write_debug_message
 #
 
 # Adjust this line to suit your needs (resolution, image flip, etc)
-picam_str = "raspistill -t 3000 -ex auto -mm matrix -o %s -vf -hf -w 2592 -h 1936"
+picam_str = "raspistill -t 3000 -ex auto -mm matrix -o %s -vf -hf -w 1488 -h 1120"
 temp_file_prefix = "./temp_pic"