updated CUxD to 2.9.3

jens-maus · Jul 23, 2022 · 738d57e · 738d57e
1 parent 7656b86
commit 738d57e
Show file tree

Hide file tree

Showing 46 changed files with 273 additions and 27 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6
+2.9.3
diff --git a/ccu1/cuxd/cuxd b/ccu1/cuxd/cuxd
diff --git a/ccu1/cuxd/extra/jq b/ccu1/cuxd/extra/jq
diff --git a/ccu1/cuxd/extra/systemname.tcl b/ccu1/cuxd/extra/systemname.tcl
@@ -0,0 +1,28 @@
+#!/bin/tclsh
+#
+# (C) '2021 by Uwe Langhammer
+# script for reading sytem.Name()
+#
+# all parameters are optional!
+#
+# usage: systemname.tcl [<filename>]
+#
+load tclrega.so
+
+set filename [lindex $argv 0]
+
+set cmd "ret = system.Name();";
+
+if {[catch {array set values [rega_script $cmd]} fid]} {
+  puts stderr $fid
+} else {
+  if {[info exists values(ret)]} {
+    if {[string length $filename] > 1 } {
+      set fo [open $filename "w"]
+      puts -nonewline $fo $values(ret)
+      close $fo
+    } else {
+      puts $values(ret)
+    }
+  }
+}
diff --git a/ccu1/cuxd/index.ccc b/ccu1/cuxd/index.ccc
diff --git a/ccu2/cuxd/cuxd b/ccu2/cuxd/cuxd
diff --git a/ccu2/cuxd/extra/curl.tgz b/ccu2/cuxd/extra/curl.tgz
diff --git a/ccu2/cuxd/extra/jq b/ccu2/cuxd/extra/jq
diff --git a/ccu2/cuxd/extra/socat b/ccu2/cuxd/extra/socat
diff --git a/ccu2/cuxd/extra/systemname.tcl b/ccu2/cuxd/extra/systemname.tcl
@@ -0,0 +1,28 @@
+#!/bin/tclsh
+#
+# (C) '2021 by Uwe Langhammer
+# script for reading sytem.Name()
+#
+# all parameters are optional!
+#
+# usage: systemname.tcl [<filename>]
+#
+load tclrega.so
+
+set filename [lindex $argv 0]
+
+set cmd "ret = system.Name();";
+
+if {[catch {array set values [rega_script $cmd]} fid]} {
+  puts stderr $fid
+} else {
+  if {[info exists values(ret)]} {
+    if {[string length $filename] > 1 } {
+      set fo [open $filename "w"]
+      puts -nonewline $fo $values(ret)
+      close $fo
+    } else {
+      puts $values(ret)
+    }
+  }
+}
diff --git a/ccu2/cuxd/extra/update-check.cgi b/ccu2/cuxd/extra/update-check.cgi
@@ -0,0 +1,31 @@
+#!/bin/tclsh
+
+set checkURL    "https://cuxd.de/cuxd-ccu2.php?$env(QUERY_STRING)"
+set downloadURL "http://cuxd.de/cuxd-ccu2.php?$env(QUERY_STRING)"
+
+catch {
+  set input $env(QUERY_STRING)
+  set pairs [split $input &]
+  foreach pair $pairs {
+    if {$pair == "cmd=download"} {
+      set cmd "download"
+      break
+    }
+  }
+}
+
+if { [info exists cmd ] && $cmd == "download"} {
+  puts -nonewline "Content-Type: text/html; charset=utf-8\r\n\r\n"
+  puts -nonewline "<html><head><meta http-equiv='refresh' content='0; url=$downloadURL' /></head><body></body></html>"
+} else {
+  puts -nonewline "Content-Type: text/plain; charset=utf-8\r\n\r\n"
+  catch {
+    set newversion [ exec /usr/bin/wget -qO- --no-check-certificate $checkURL ]
+  }
+  if { [info exists newversion] } {
+    puts $newversion
+  } else {
+    puts "n/a"
+  }
+}
+
diff --git a/ccu2/cuxd/index.ccc b/ccu2/cuxd/index.ccc
diff --git a/ccu2/cuxd/redir.ccc b/ccu2/cuxd/redir.ccc
diff --git a/ccu2/cuxd/cdc-acm.ko → ccu2/modules/3.4.11.ccu2/cdc-acm.ko b/ccu2/cuxd/cdc-acm.ko → ccu2/modules/3.4.11.ccu2/cdc-acm.ko
diff --git a/ccu2/cuxd/ch341.ko → ccu2/modules/3.4.11.ccu2/ch341.ko b/ccu2/cuxd/ch341.ko → ccu2/modules/3.4.11.ccu2/ch341.ko
diff --git a/ccu2/cuxd/cp210x.ko → ccu2/modules/3.4.11.ccu2/cp210x.ko b/ccu2/cuxd/cp210x.ko → ccu2/modules/3.4.11.ccu2/cp210x.ko
diff --git a/ccu2/cuxd/ftdi_sio.ko → ccu2/modules/3.4.11.ccu2/ftdi_sio.ko b/ccu2/cuxd/ftdi_sio.ko → ccu2/modules/3.4.11.ccu2/ftdi_sio.ko
diff --git a/ccu2/cuxd/mos7720.ko → ccu2/modules/3.4.11.ccu2/mos7720.ko b/ccu2/cuxd/mos7720.ko → ccu2/modules/3.4.11.ccu2/mos7720.ko
diff --git a/ccu2/cuxd/pl2303.ko → ccu2/modules/3.4.11.ccu2/pl2303.ko b/ccu2/cuxd/pl2303.ko → ccu2/modules/3.4.11.ccu2/pl2303.ko
diff --git a/ccu2/cuxd/usbserial.ko → ccu2/modules/3.4.11.ccu2/usbserial.ko b/ccu2/cuxd/usbserial.ko → ccu2/modules/3.4.11.ccu2/usbserial.ko
diff --git a/ccu2/modules/3.4.113.ccu2/cdc-acm.ko b/ccu2/modules/3.4.113.ccu2/cdc-acm.ko
diff --git a/ccu2/modules/3.4.113.ccu2/ch341.ko b/ccu2/modules/3.4.113.ccu2/ch341.ko
diff --git a/ccu2/modules/3.4.113.ccu2/cp210x.ko b/ccu2/modules/3.4.113.ccu2/cp210x.ko
diff --git a/ccu2/modules/3.4.113.ccu2/ftdi_sio.ko b/ccu2/modules/3.4.113.ccu2/ftdi_sio.ko
diff --git a/ccu2/modules/3.4.113.ccu2/mos7720.ko b/ccu2/modules/3.4.113.ccu2/mos7720.ko
diff --git a/ccu2/modules/3.4.113.ccu2/pl2303.ko b/ccu2/modules/3.4.113.ccu2/pl2303.ko
diff --git a/ccu2/modules/3.4.113.ccu2/usbserial.ko b/ccu2/modules/3.4.113.ccu2/usbserial.ko
diff --git a/ccu3/cuxd/cuxd b/ccu3/cuxd/cuxd
diff --git a/ccu3/cuxd/extra/jq b/ccu3/cuxd/extra/jq
diff --git a/ccu3/cuxd/extra/systemname.tcl b/ccu3/cuxd/extra/systemname.tcl
@@ -0,0 +1,28 @@
+#!/bin/tclsh
+#
+# (C) '2021 by Uwe Langhammer
+# script for reading sytem.Name()
+#
+# all parameters are optional!
+#
+# usage: systemname.tcl [<filename>]
+#
+load tclrega.so
+
+set filename [lindex $argv 0]
+
+set cmd "ret = system.Name();";
+
+if {[catch {array set values [rega_script $cmd]} fid]} {
+  puts stderr $fid
+} else {
+  if {[info exists values(ret)]} {
+    if {[string length $filename] > 1 } {
+      set fo [open $filename "w"]
+      puts -nonewline $fo $values(ret)
+      close $fo
+    } else {
+      puts $values(ret)
+    }
+  }
+}
diff --git a/ccu3/cuxd/extra/update-check.cgi b/ccu3/cuxd/extra/update-check.cgi
@@ -1,14 +1,15 @@
 #!/bin/tclsh
 
-set checkURL    "http://cuxd.de/cuxd-ccurm.php?$env(QUERY_STRING)"
+set checkURL    "https://cuxd.de/cuxd-ccurm.php?$env(QUERY_STRING)"
 set downloadURL "http://cuxd.de/cuxd-ccurm.php?$env(QUERY_STRING)"
 
 catch {
   set input $env(QUERY_STRING)
   set pairs [split $input &]
   foreach pair $pairs {
-    if {0 != [regexp "^(\[^=]*)=(.*)$" $pair dummy varname val]} {
-      set $varname $val
+    if {$pair == "cmd=download"} {
+      set cmd "download"
+      break
     }
   }
 }
@@ -17,8 +18,9 @@ if { [info exists cmd ] && $cmd == "download"} {
   puts -nonewline "Content-Type: text/html; charset=utf-8\r\n\r\n"
   puts -nonewline "<html><head><meta http-equiv='refresh' content='0; url=$downloadURL' /></head><body></body></html>"
 } else {
+  puts -nonewline "Content-Type: text/plain; charset=utf-8\r\n\r\n"
   catch {
-    set newversion [ exec /usr/bin/wget -qO- --no-check-certificate $checkURL | head -1 ]
+    set newversion [ exec /usr/bin/wget -qO- --no-check-certificate $checkURL ]
   }
   if { [info exists newversion] } {
     puts $newversion

diff --git a/ccu3/cuxd/index.ccc b/ccu3/cuxd/index.ccc
diff --git a/ccu3/rc.d/cuxdaemon b/ccu3/rc.d/cuxdaemon
@@ -30,6 +30,13 @@ Start () {
         mount -o remount,ro /
       fi
     fi
+    if [ -f /usr/bin/jq ]
+    then
+      if [ ! -h $CUXDIR/extra/jq ]
+      then
+        ln -sf /usr/bin/jq $CUXDIR/extra/jq 
+      fi
+    fi
     if [ "$PSPID" = "" ]
     then
       modprobe ehci_hcd 2>/dev/null

diff --git a/ccux86/cuxd/cuxd b/ccux86/cuxd/cuxd
diff --git a/ccux86/cuxd/extra/jq b/ccux86/cuxd/extra/jq
diff --git a/ccux86/cuxd/extra/systemname.tcl b/ccux86/cuxd/extra/systemname.tcl
@@ -0,0 +1,28 @@
+#!/bin/tclsh
+#
+# (C) '2021 by Uwe Langhammer
+# script for reading sytem.Name()
+#
+# all parameters are optional!
+#
+# usage: systemname.tcl [<filename>]
+#
+load tclrega.so
+
+set filename [lindex $argv 0]
+
+set cmd "ret = system.Name();";
+
+if {[catch {array set values [rega_script $cmd]} fid]} {
+  puts stderr $fid
+} else {
+  if {[info exists values(ret)]} {
+    if {[string length $filename] > 1 } {
+      set fo [open $filename "w"]
+      puts -nonewline $fo $values(ret)
+      close $fo
+    } else {
+      puts $values(ret)
+    }
+  }
+}
diff --git a/ccux86/cuxd/extra/update-check.cgi b/ccux86/cuxd/extra/update-check.cgi
@@ -1,14 +1,15 @@
 #!/bin/tclsh
 
-set checkURL    "http://cuxd.de/cuxd-ccux86.php?$env(QUERY_STRING)"
+set checkURL    "https://cuxd.de/cuxd-ccux86.php?$env(QUERY_STRING)"
 set downloadURL "http://cuxd.de/cuxd-ccux86.php?$env(QUERY_STRING)"
 
 catch {
   set input $env(QUERY_STRING)
   set pairs [split $input &]
   foreach pair $pairs {
-    if {0 != [regexp "^(\[^=]*)=(.*)$" $pair dummy varname val]} {
-      set $varname $val
+    if {$pair == "cmd=download"} {
+      set cmd "download"
+      break
     }
   }
 }
@@ -17,6 +18,7 @@ if { [info exists cmd ] && $cmd == "download"} {
   puts -nonewline "Content-Type: text/html; charset=utf-8\r\n\r\n"
   puts -nonewline "<html><head><meta http-equiv='refresh' content='0; url=$downloadURL' /></head><body></body></html>"
 } else {
+  puts -nonewline "Content-Type: text/plain; charset=utf-8\r\n\r\n"
   catch {
     set newversion [ exec /usr/bin/wget -qO- --no-check-certificate $checkURL ]
   }

diff --git a/ccux86/cuxd/index.ccc b/ccux86/cuxd/index.ccc
diff --git a/ccux86/cuxd/redir.ccc b/ccux86/cuxd/redir.ccc
diff --git a/ccux86/rc.d/cuxdaemon b/ccux86/rc.d/cuxdaemon
@@ -26,6 +26,13 @@ Start () {
         ln -sf $CONFIG_DIR/rc.d/cuxdaemon $STARTRC
       fi
     fi
+    if [ -f /usr/bin/jq ]
+    then
+      if [ ! -h $CUXDIR/extra/jq ]
+      then
+        ln -sf /usr/bin/jq $CUXDIR/extra/jq
+      fi
+    fi
     if [ "$PSPID" = "" ]
     then
       modprobe ehci_hcd 2>/dev/null

diff --git a/common/cuxd/cuxd.inc b/common/cuxd/cuxd.inc
@@ -3,7 +3,7 @@
 <html>
 <head>
 |<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>HomeMatic CUxD</title>
+<title>%s</title>
 </head>
 <body style='background-color:#ffffee;margin-bottom:0px; margin-top:5px;'> 
 <style type='text/css'>
@@ -61,6 +61,8 @@ CUxD-Ger&auml;te verwalten
 <br><br><b>CUxD&nbsp;Ger&auml;tetyp:</b>&nbsp;\
 <input type='hidden' name='sid' value='<!SID!>'/>
 <select name='m' size='1' style='width:50%%;' onChange='dtype2.value=0;dtype.submit();'>
+<option value='200' style='background-color:#E0E0FF'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;----- KLF200 -----</option>
+<option value='219'>(19) KLF200 Geräte</option>
 <option value='200' style='background-color:#E0E0FF'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;----- EnOcean -----</option>
 <option value='233'>(33) [RPS] Taster und Drehgriffkontakt</option>
 <option value='234'>(34) [1BS] T&uuml;r-/Fensterkontakt</option>
@@ -107,8 +109,8 @@ CUxD-Ger&auml;te verwalten
 <option value='240'>(40) 16 Kanal Universalsteuerung</option>
 <option value='291'>(91) CloudMatic ...</option>
 |<option value='241'>(41) Ping / Alive 16fach</option>
-<option value='200' style='background-color:#FFC0C0'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;----- Experimental -----</option>
-<option value='230' style='background-color:#FFE0E0'>(30) Wetter Thermo/Hygro/Baro</option>
+|<option value='200' style='background-color:#FFC0C0'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;----- Experimental -----</option>
+|<option value='230' style='background-color:#FFE0E0'>(30) Wetter Thermo/Hygro/Baro</option>
 <!-- <option value='299' style='background-color:#FFE0E0'>(99) email-SMTP/IMAP Device</option> -->
 </select>
 <input type='hidden' name='dtype2' value='0'/>
@@ -403,9 +405,9 @@ function submit_dtype2(obj) {
   f.submit(true);
 }
 
-function set_Device(form,id) {
+function set_Device(form,id,disableflag) {
   if (id) {
-    form.dbase.disabled=true;
+    form.dbase.disabled=disableflag;
     form.dbase.value=id;
     showimage();
   } else {
@@ -761,6 +763,7 @@ Funktion:&nbsp;<select name='dtype2' size='1' onChange='submit_dtype2(this)'>
 <option value='4'$selected$>5. VLD Jalousieaktor (1-4 Kanal) (D2-05-0x)</option>
 <option value='5'$selected$>6. Multisensor (D2-14-41)</option>
 <option value='6'$selected$>7. NodOn SoftButton (D2-03-0A)</option>
+<option value='7'$selected$>8. REHAU SmartGuard (D2-06-11)</option>
 </select><br><br>
 |
 ##53
@@ -782,12 +785,13 @@ Funktion:&nbsp;<select name='dtype2' size='1' onChange='submit_dtype2(this)'>
 |
 ##55
 |
-<br><br>Control:&nbsp;<select name='dcontrol' size='1' onChange='if (this.value==4) { set_Device(this.form,%d) } else { set_Device(this.form,0) }'>
+<br><br>Control:&nbsp;<select name='dcontrol' size='1' onChange='arr = [%s];set_Device(this.form,arr[this.value],(this.value==4) ? true : false);''>
 <option value='0'>Taster</option>
 <option value='1'>Schalter</option>
 <option value='2'>Jalousie</option>
 <option value='3'>Dimmer</option>
 <option value='4'>Dimmer+RGB+WHITE</option>
+<option value='5'>Fensteröffner</option>
 </select>
 |
 ##56
@@ -814,7 +818,7 @@ Period:<input type="text" name="period" size="3" value="168"/>\
 |
 ##58
 |
-<br><br>Control:&nbsp;<select name='dcontrol' size='1'>
+<br><br>Control:&nbsp;<select name='dcontrol' size='1' onChange='arr = [%s];set_Device(this.form,arr[this.value],false);''>
 <option value='0'>Taster</option>
 <option value='1'>Schalter</option>
 <option value='2'>T&uuml;r-/Fensterkontakt</option>
@@ -870,6 +874,7 @@ Funktion:&nbsp;<select name='dtype2' size='1' onChange='submit_dtype2(this)'>
 <div style='font-family:arial;position:absolute;'>
 <div id='process' style='position:absolute;left:0px;top:0px;height:100%;width:100%;opacity:0.7;z-index:-1'></div>
 <form onSubmit="var docstyle=document.getElementById('process').style;docstyle.zIndex=99;docstyle.background='#fff url(ajax.gif) no-repeat center';return true;">
+<input type='hidden' name='sid' value='<!SID!>'/>
 |
 ##65
 |
@@ -961,3 +966,13 @@ foreach (id,dom.GetObject(ID_DEVICES).EnumUsedIDs()) {
 }
 id="DONE";
 |
+##73
+|
+Ger&auml;t:&nbsp;<select name='dtype2' size='1' onChange='submit_dtype2(this)'>
+<option value='0'$selected$>1. Szenentaster</option>
+<option value='1'$selected$>2. Rolladen</option>
+<option value='2'$selected$>3. Fensteröffner</option>
+<option value='3'$selected$>4. Schalter</option>
+<option value='4'$selected$>5. Dimmer</option>
+</select><br><br>
+|
diff --git a/common/cuxd/devicelist.inc b/common/cuxd/devicelist.inc
@@ -58,6 +58,7 @@ HM-LC-Bl1-SM        6_hm-lc-bl1-sm_thumb        Jalousieaktor 1fach Aufputz
 HM-LC-Bl1PBU-FM     PushButton-2ch-wm_thumb     Jalousieaktor 1fach Schalter
 HM-LC-Ja1PBU-FM     PushButton-2ch-wm_thumb     Jalousieaktor mit Lamellen
 HmIPW-DRBL4         163_hmipw-drbl4_thumb       Jalousieaktor 4fach (WR)
+HM-Sec-Win          15_hm-sec-win_thumb		WinMatic
 
 HM-LC-Dim1T-FM      65_hm-lc-dim1t-fm_thumb     Dimmaktor 1fach Unterputz
 HM-LC-Dim2L-SM      45_hm-lc-dim2l-sm_thumb     Dimmaktor 2fach Aufputz

diff --git a/common/cuxd/dfu/at90usb162.tgz b/common/cuxd/dfu/at90usb162.tgz
diff --git a/common/cuxd/dfu/atmega32u2.tgz b/common/cuxd/dfu/atmega32u2.tgz
diff --git a/common/cuxd/dfu/atmega32u4.tgz b/common/cuxd/dfu/atmega32u4.tgz