K=7 FEC with interleaving + LibreSDR hardware support

README.md

@@ -15,7 +15,7 @@ The following ORI library components are used as submodules to this repository:
 7. [Exponential Moving Average Filter](https://github.com/OpenResearchInstitute/lowpass_ema)
 
 ## Building
-In oder to build the FPGA bitstream, you first need to install Vivado. Recommended version is 2022.2. In this documentation and in the `Makefile`, the Vivado installation path is assumed to be `/opt/Xilinx/Vivado`. If it is in another directory, change the path in the steps below (for example, to `/tools/Xilinx/Vivado`) or create a symbolic link in `/opt` pointing to the actual installation directory. For example,
+In order to build the FPGA bitstream, you first need to install Vivado. Recommended version is 2022.2. In this documentation and in the `Makefile`, the Vivado installation path is assumed to be `/opt/Xilinx/Vivado`. If it is in another directory, change the path in the steps below (for example, to `/tools/Xilinx/Vivado`) or create a symbolic link in `/opt` pointing to the actual installation directory. For example,
 ```
 sudo ln -s /tools/Xilinx /opt/Xilinx
 ```
@@ -130,6 +130,8 @@ sys	39m46.236s
 | 0x84 |lowpass_ema_alpha1|               Exponential Moving Average Alpha              |
 | 0x88 |lowpass_ema_alpha2|               Exponential Moving Average Alpha              |
 | 0x8C |     rx_power     |                        Receive Power                        |
+| 0x90 |tx_async_fifo_rd_wr_ptr|            Tx async FIFO read and write pointers            |
+| 0x94 |rx_async_fifo_rd_wr_ptr|            Rx async FIFO read and write pointers            |
 
 
 See [MSK Top Regs](rdl/msk_top_regs.pdf) for detailed register definitions.

docs/msk_math.md

@@ -115,10 +115,12 @@ The four resulting values for the f1 mix are
 cos(2𝝿f1t)*cos(2𝝿f1t) = 1/2 [ cos(2𝝿f1t - 2𝝿f1t) + cos(2𝝿f1t + 2𝝿f1t) ]
 					  = 1/2 [ cos(0) + cos(4𝝿f1t) ]
 					  = 1/2 [ 1 + cos(4𝝿f1t)]
+					  = 1/2 + 1/2cos(2𝝿2f1t)
 
 -cos(2𝝿f1t)*cos(2𝝿f1t) = -1/2 [ cos(2𝝿f1t - 2𝝿f1t) + cos(2𝝿f1t + 2𝝿f1t) ]
 					   = -1/2 [ cos(0) + cos(4𝝿f1t) ]
 					   = -1/2 [ 1 + cos(4𝝿f1t)]
+					   = -1/2 - 1/2cos(2𝝿2f1t)
 
 (both the previous results are a DC value and a sinusoid at 2*f1)
 
@@ -149,20 +151,28 @@ cos(2𝝿f1t)*sin(2𝝿f1t) = 1/2 [ sin(2𝝿f1t + 2𝝿f1t + theta) - sin(2𝝿
 					  = 1/2 sin(4𝝿f1t + theta)
 
 
--cos(2𝝿f1t)*sin(2𝝿f1t) = -1/2 [ sin(2𝝿f1t + 2𝝿f1t) - sin(2𝝿f1t - 2𝝿f1t) ]
-					   = -1/2 [ sin(4𝝿f1t) - sin(0) ]
-					   = -1/2 sin(4𝝿f1t)
+-cos(2𝝿f1t)*sin(2𝝿f1t) = -1/2 [ sin(2𝝿f1t + 2𝝿f1t + theta) - sin(2𝝿f1t - 2𝝿f1t + theta) ]
+					   = -1/2 [ sin(2𝝿2f1t + theta) - sin(theta) ]
+					   = -1/2 sin(2𝝿2f1t + theta) 
 
 again we only care about the DC component, which when the phases are aligned is 0. If the phases are not aligned the 
 sin(0) term becomes sin(Δφ) a constant.
 
 
 cos(2𝝿f1t)*sin(2𝝿f1t) = 1/2 [ sin(2𝝿f2t + 2𝝿f1t) - sin(2𝝿f2t - 2𝝿f1t) ]
-					  = 1/2 [ sin(2𝝿(f2+f1)t) - sin(2𝝿(f2-f1)t) ]
+					  = 1/2 [ sin(2𝝿(f2+f1)t) - sin(2𝝿(f2-f1)t) ]	
 
 
 cos(2𝝿f1t)*sin(2𝝿f1t) = -1/2 [ sin(2𝝿f2t + 2𝝿f1t) - sin(2𝝿f2t - 2𝝿f1t) ]
 					  = -1/2 [ sin(2𝝿(f2+f1)t) - sin(2𝝿(f2-f1)t) ]
 
 
 
+
+error_instant =  1/2 sin(2𝝿2f1t + theta) * sign( 1/2 + 1/2cos(2𝝿2f1t))
+      = -1/2 sin(2𝝿2f1t + theta) * sign(-1/2 - 1/2cos(2𝝿2f1t))
+      =  1/2 sin(2𝝿2f1t + theta)
+
+error = SUM_T(1/2 sin(2𝝿2f1t + theta)) = -cos(2𝝿2f1t + theta) + C
+
+

firmware/Makefile

@@ -44,7 +44,7 @@ ifneq (1, ${PATCH})
 endif
 
 TARGET ?= pluto
-SUPPORTED_TARGETS:=pluto plutoplus e200
+SUPPORTED_TARGETS:=pluto plutoplus e200 libre
 #XSA_FILE ?= ori/bitstream/${TARGET}/system_top.xsa
 
 $(warning *** Building target $(TARGET),)
@@ -54,9 +54,9 @@ include scripts/$(TARGET).mk
 
 ifeq (, $(shell which dfu-suffix))
 $(warning "No dfu-utils in PATH consider doing: sudo apt-get install dfu-util")
-TARGETS = build/pluto.frm build/boot.frm 
+TARGETS = build/$(TARGET).frm build/boot.frm 
 else
-TARGETS = build/$(TARGET).dfu build/uboot-env.dfu build/pluto.frm  build/boot.dfu build/boot.frm 
+TARGETS = build/$(TARGET).dfu build/uboot-env.dfu build/$(TARGET).frm  build/boot.dfu build/boot.frm 
 endif
 
 ifeq ($(findstring $(TARGET),$(SUPPORTED_TARGETS)),)
@@ -175,6 +175,10 @@ ifeq ($(TARGET),e200)
 	bash -c "source $(VIVADO_SETTINGS) && make -C ../hdl/projects/pluto-ori-e200 && cp ../hdl/projects/pluto-ori-e200/e200.sdk/system_top.xsa $@"
 	unzip -l $@ | grep -q ps7_init || cp ../hdl/projects/pluto-ori-e200/e200.srcs/sources_1/bd/system/ip/system_sys_ps7_0/ps7_init* build/
 endif	
+ifeq ($(TARGET),libre)
+	bash -c "source $(VIVADO_SETTINGS) && env -u TARGET make -C ../projects/libre && cp ../projects/libre/libre.sdk/system_top.xsa $@"
+	unzip -l $@ | grep -q ps7_init || cp ../projects/libre/libre.srcs/sources_1/bd/system/ip/system_sys_ps7_0/ps7_init* build/
+endif
 #bash -c "source $(VIVADO_SETTINGS) && make -C ../hdl/projects/pluto-ori-plus"
 endif
 
@@ -199,7 +203,7 @@ else
 endif
 ### MSD update firmware file ###
 
-build/pluto.frm: build/$(TARGET).itb
+build/$(TARGET).frm: build/$(TARGET).itb
 	md5sum $< | cut -d ' ' -f 1 > [email protected]
 	cat $< [email protected] > $@
 
@@ -235,6 +239,9 @@ endif
 ifeq ($(TARGET),e200)
 	cp build/zynq-e200.dtb 	$(SDIMGDIR)/devicetree.dtb
 endif	
+ifeq ($(TARGET),libre)
+	cp build/zynq-libre.dtb 	$(SDIMGDIR)/devicetree.dtb
+endif
 	cp build/uboot-env.txt  		$(SDIMGDIR)/uEnv.txt
 	cp build/rootfs.cpio.gz  		$(SDIMGDIR)/ramdisk.image.gz
 	mkimage -A arm -T ramdisk -C gzip -d $(SDIMGDIR)/ramdisk.image.gz $(SDIMGDIR)/uramdisk.image.gz

firmware/ori/libre/buildroot-configs/zynq_libre_defconfig

@@ -0,0 +1,68 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_NEON=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y
+BR2_OPTIMIZE_3=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_ETHTOOL_PRETTY_PRINT=y
+BR2_PACKAGE_IPERF3=y
+BR2_PACKAGE_HTOP=y
+BR2_TARGET_GENERIC_HOSTNAME="libre"
+BR2_TARGET_GENERIC_ISSUE="Welcome to LibreSDR"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_ROOT_PASSWD="analog"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/libre/post-build.sh"
+BR2_PACKAGE_ZSTD=y
+BR2_PACKAGE_MTD=y
+# BR2_PACKAGE_MTD_NANDDUMP is not set
+# BR2_PACKAGE_MTD_NANDTEST is not set
+# BR2_PACKAGE_MTD_NANDWRITE is not set
+# BR2_PACKAGE_MTD_UBIATTACH is not set
+# BR2_PACKAGE_MTD_UBICRC32 is not set
+# BR2_PACKAGE_MTD_UBIDETACH is not set
+# BR2_PACKAGE_MTD_UBIFORMAT is not set
+# BR2_PACKAGE_MTD_UBIMKVOL is not set
+# BR2_PACKAGE_MTD_UBINFO is not set
+# BR2_PACKAGE_MTD_UBINIZE is not set
+# BR2_PACKAGE_MTD_UBIRENAME is not set
+# BR2_PACKAGE_MTD_UBIRMVOL is not set
+# BR2_PACKAGE_MTD_UBIRSVOL is not set
+# BR2_PACKAGE_MTD_UBIUPDATEVOL is not set
+# BR2_PACKAGE_MTD_UBIBLOCK is not set
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
+BR2_PACKAGE_INPUT_EVENT_DAEMON=y
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_ZLIB=y
+BR2_PACKAGE_LIBAD9361_IIO=y
+BR2_PACKAGE_LIBGPIOD=y
+BR2_PACKAGE_LIBGPIOD_TOOLS=y
+BR2_PACKAGE_LIBIIO_IIOD_USBD=y
+BR2_PACKAGE_LIBIIO_TESTS=y
+BR2_PACKAGE_LIBINI=y
+BR2_PACKAGE_AVAHI=y
+BR2_PACKAGE_AVAHI_DAEMON=y
+BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="board/pluto/dropbrear_localoptions.h"
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_POLL_SYSFS=y
+BR2_PACKAGE_AD936X_REF_CAL=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y