From 59ae1bf070d30ecff6db6c6c44345c59937eb072 Mon Sep 17 00:00:00 2001 From: Pedro Pena Date: Fri, 6 Jan 2017 00:58:11 -0500 Subject: [PATCH 1/3] failed because version of edid-decode had leading spaces in front of Checksum. added pattern that matches leading spaces --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index da35328..be5a640 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ clean: %.crc: %.bin.nocrc cat $^ | edid-decode \ - | sed -ne 's/^Checksum: 0x\w\+ (should be \(0x\w\+\))$$/\1/p' >$@ + | sed -ne 's/^[ ]*Checksum: 0x\w\+ (should be \(0x\w\+\))$$/\1/p' >$@ %.p: %.crc %.S cc -c -DCRC="$$(cat $*.crc)" -o $@ $*.S From 14a178fd94f892df1d52513896a92ba3540200ff Mon Sep 17 00:00:00 2001 From: Pedro Pena Date: Fri, 6 Jan 2017 01:09:21 -0500 Subject: [PATCH 2/3] removed local -a from creating of variable lines. kept crashing under ubuntu 14.04 --- modeline2edid | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/modeline2edid b/modeline2edid index 85138af..b12554f 100755 --- a/modeline2edid +++ b/modeline2edid @@ -38,33 +38,31 @@ template-S() { local -A defines defines=( - TIMING_NAME "${(qqq)name}" - - CLOCK "$pixel_clock_khz" - XPIX "$hdisp" - XBLANK "$((htotal - hdisp))" - XOFFSET "$((hsyncstart - hdisp))" - XPULSE "$((hsyncend - hsyncstart))" - - YPIX "$vdisp" - YBLANK "$((vtotal - vdisp))" - YOFFSET "(63+$((vsyncstart - vdisp)))" - YPULSE "(63+$((vsyncend - vsyncstart)))" - VERSION "${edid_version%%.*}" REVISION "${edid_version#*.}" - + CLOCK "$pixel_clock_khz" + XPIX "$hdisp" + YPIX "$vdisp" XY_RATIO "XY_RATIO_${(U)ratio//:/_}" + XBLANK "$((htotal - hdisp))" + YBLANK "$((vtotal - vdisp))" + XOFFSET "$((hsyncstart - hdisp))" + XPULSE "$((hsyncend - hsyncstart))" + YOFFSET "(63+$((vsyncstart - vdisp)))" + YPULSE "(63+$((vsyncend - vsyncstart)))" DPI "$dpi" VFREQ "$vfreq_hz" + TIMING_NAME "${(qqq)name}" HSYNC_POL "$hsync_polarity" VSYNC_POL "$vsync_polarity" ) - local -a lines=('/* '"$name: $REPLY"' */') + lines=('/* '"$name: $REPLY"' */') # removed local -a local k - for k in ${(k)defines}; do + for k in "${(@k)defines}"; do lines+=("#define $k ${defines[$k]}") + #echo ${defines[TIMING_NAME]} + #echo "#define $k ${defines[$k]}" done lines+=('#include "edid.S"') From a22ff9fc2d86ce4673ce11b5063ff9ccb9368446 Mon Sep 17 00:00:00 2001 From: Pedro Pena Date: Tue, 14 Mar 2017 21:31:42 -0400 Subject: [PATCH 3/3] added -a paramter to local & removed debugging statements --- modeline2edid | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modeline2edid b/modeline2edid index b12554f..7cd10c8 100755 --- a/modeline2edid +++ b/modeline2edid @@ -57,12 +57,11 @@ template-S() { VSYNC_POL "$vsync_polarity" ) - lines=('/* '"$name: $REPLY"' */') # removed local -a + local lines=('/* '"$name: $REPLY"' */') # removed -a option local k for k in "${(@k)defines}"; do lines+=("#define $k ${defines[$k]}") - #echo ${defines[TIMING_NAME]} - #echo "#define $k ${defines[$k]}" + done lines+=('#include "edid.S"')