diff options
| author | root <root@new-fish.medaka.james.internal> | 2025-06-16 09:15:25 +0100 |
|---|---|---|
| committer | root <root@new-fish.medaka.james.internal> | 2025-06-16 09:15:25 +0100 |
| commit | 2ec5e2b43370697a198e5aa432d0295b4633e327 (patch) | |
| tree | 516b4e62a56384db59babbe523d573cc32f78867 /fpga/hp_lcd_driver | |
| parent | cffb37bfca4c871c60e972860b25d81cdc366369 (diff) | |
| download | hp_instrument_lcds-2ec5e2b43370697a198e5aa432d0295b4633e327.tar.gz hp_instrument_lcds-2ec5e2b43370697a198e5aa432d0295b4633e327.tar.bz2 hp_instrument_lcds-2ec5e2b43370697a198e5aa432d0295b4633e327.zip | |
don't require an x-server
Diffstat (limited to 'fpga/hp_lcd_driver')
| -rwxr-xr-x | fpga/hp_lcd_driver/scripts/run_in_x | 29 | ||||
| -rw-r--r-- | fpga/hp_lcd_driver/smh-ac415.mk | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/fpga/hp_lcd_driver/scripts/run_in_x b/fpga/hp_lcd_driver/scripts/run_in_x new file mode 100755 index 0000000..1031f9a --- /dev/null +++ b/fpga/hp_lcd_driver/scripts/run_in_x @@ -0,0 +1,29 @@ +#!/bin/bash +XPID=$$ + +trap "kill -INT ${XPID}" INT + +D=0 +XA=xauthority + +while true; do +Xvfb :${D} -auth ${XA} 2> /dev/null & +XPID=$! +sleep .1 +if kill -0 ${XPID} 2> /dev/null ; then +sleep 1 +if kill -0 ${XPID} 2> /dev/null ; then + break; +fi +fi + +D=$[ $D + 1 ] +done + + +export DISPLAY=:${D} +export XAUTHORITY=${PWD}/${XA} +"$@" + +kill -INT ${XPID} + diff --git a/fpga/hp_lcd_driver/smh-ac415.mk b/fpga/hp_lcd_driver/smh-ac415.mk index 1994e3b..e31a960 100644 --- a/fpga/hp_lcd_driver/smh-ac415.mk +++ b/fpga/hp_lcd_driver/smh-ac415.mk @@ -46,7 +46,7 @@ default:${SVF} ${PSVF} ${BUILD}/%.vhd ${BUILD}/%.qip:%.vhdl cat $< > ${BUILD}/${<:%.vhdl=%.vhd} - (cd ${BUILD} && run_quartus qmegawiz -silent $(call relpath,${BUILD}/${<:%.vhdl=%.vhd},${BUILD})) + (cd ${BUILD} && ../scripts/run_in_x run_quartus qmegawiz -silent $(call relpath,${BUILD}/${<:%.vhdl=%.vhd},${BUILD})) ${QSF}: ${PRJ} ${DESIGN_NAME}.${BOARD}_qsft |