Skip to content

Commit

Permalink
updated file from 2.1.0 release archives.
Browse files Browse the repository at this point in the history
  • Loading branch information
jens-maus committed Sep 5, 2018
1 parent 3a4ccfa commit cb7c5e7
Show file tree
Hide file tree
Showing 16 changed files with 3,536 additions and 5 deletions.
Binary file modified ccu1/cuxd/cuxd
Binary file not shown.
Binary file modified ccu1/cuxd/index.ccc
Binary file not shown.
Binary file modified ccu2/cuxd/cuxd
Binary file not shown.
106 changes: 106 additions & 0 deletions ccu2/cuxd/extra/ctl_startup
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
#!/bin/tclsh
#
# (C) '2014-2018 by Uwe Langhammer
# script for enabling/disabling server processes
#
# usage: ctl_startup <mode> <reboot> <service1> [<service2> ... <serviceN>]
# mode:0..disable
# mode:1..enable
#
load tclrega.so

set mode [lindex $argv 0]
set reboot_flag [lindex $argv 1]

if {!($mode >= 0 && $mode <= 1) || ($argc < 3)} {
puts "usage: $argv0 0|1 0|1 <service1> \[<service2> ... <serviceN>\]"
exit 1
}

set reboot 0
set i 0
foreach process $argv {
incr i
if {$i <= 2} continue

foreach startscript [glob -nocomplain /etc/init.d/*$process] {
# break
}

if {[info exists startscript] } {
set fp [open $startscript r]
set file_data [read $fp]
set data [split $file_data "\n"]
set line1 [lindex $data 0]
close $fp
set flag 0
if { ($mode == 0) && ($process == "HMServer") } {
puts ""
puts "###############################################################################"
puts "## ##"
puts "## Nach der Deaktivierung sind unter anderem die folgenden CCU2-Funktionen ##"
puts "## nicht mehr moeglich: ##"
puts "## ##"
puts "## - Diagramme ##"
puts "## - Gruppenfunktion (bei Heizungsthermostaten) ##"
puts "## - Erstinitialisierung der SD-Karte ##"
puts "## - Geraetefirmwareupdate ueber WebUI ##"
puts "## - HomeMatic-IP Interface ##"
puts "## ##"
puts "###############################################################################"
puts ""
}
if {[string range $line1 0 3] == "exit"} {
puts "$process in $startscript disabled"
if {$mode != 0} {
puts "enable $process in $startscript"
set flag 1
}
} else {
puts "$process in $startscript enabled"
if {$mode == 0} {
# puts "stop $process"
# exec $startscript stop
puts "disable $process in $startscript"
set flag 1
}
}

if {$flag == 1} {
if {!($reboot == 1)} {
exec mount -o remount,rw /
}
puts "write $startscript"
set fp [open $startscript w 0755]
if {$mode != 0} {
puts -nonewline $fp [join [lreplace $data 0 0] \n]
} else {
puts $fp "exit"
puts -nonewline $fp $file_data
}
close $fp
set reboot 1
}
} else {
puts "$process startscript not found!"
# exit 1
}
}

if {($reboot == 1) && ($reboot_flag == 1)} {
exec mount -o remount,ro /
puts -nonewline "saving DOM..."
flush stdout
rega system.Save()
set result [exec /usr/bin/tail -1 /etc/config/homematic.regadom]
if {$result == "</dom>"} {
puts " OK!"
} else {
puts " XML error!"
exit 1
}
file delete /etc/config/InterfacesList.xml
puts "reboot..."
exec /sbin/reboot
}
exit 0
Binary file modified ccu2/cuxd/index.ccc
Binary file not shown.
1 change: 1 addition & 0 deletions ccu2/cuxd/libusb-1.0.so
Binary file modified ccurm/cuxd/cuxd
Binary file not shown.
106 changes: 106 additions & 0 deletions ccurm/cuxd/extra/ctl_startup
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
#!/bin/tclsh
#
# (C) '2014-2018 by Uwe Langhammer
# script for enabling/disabling server processes
#
# usage: ctl_startup <mode> <reboot> <service1> [<service2> ... <serviceN>]
# mode:0..disable
# mode:1..enable
#
load tclrega.so

set mode [lindex $argv 0]
set reboot_flag [lindex $argv 1]

if {!($mode >= 0 && $mode <= 1) || ($argc < 3)} {
puts "usage: $argv0 0|1 0|1 <service1> \[<service2> ... <serviceN>\]"
exit 1
}

set reboot 0
set i 0
foreach process $argv {
incr i
if {$i <= 2} continue

foreach startscript [glob -nocomplain /etc/init.d/*$process] {
# break
}

if {[info exists startscript] } {
set fp [open $startscript r]
set file_data [read $fp]
set data [split $file_data "\n"]
set line1 [lindex $data 0]
close $fp
set flag 0
if { ($mode == 0) && ($process == "HMServer") } {
puts ""
puts "###############################################################################"
puts "## ##"
puts "## Nach der Deaktivierung sind unter anderem die folgenden CCU2-Funktionen ##"
puts "## nicht mehr moeglich: ##"
puts "## ##"
puts "## - Diagramme ##"
puts "## - Gruppenfunktion (bei Heizungsthermostaten) ##"
puts "## - Erstinitialisierung der SD-Karte ##"
puts "## - Geraetefirmwareupdate ueber WebUI ##"
puts "## - HomeMatic-IP Interface ##"
puts "## ##"
puts "###############################################################################"
puts ""
}
if {[string range $line1 0 3] == "exit"} {
puts "$process in $startscript disabled"
if {$mode != 0} {
puts "enable $process in $startscript"
set flag 1
}
} else {
puts "$process in $startscript enabled"
if {$mode == 0} {
# puts "stop $process"
# exec $startscript stop
puts "disable $process in $startscript"
set flag 1
}
}

if {$flag == 1} {
if {!($reboot == 1)} {
exec mount -o remount,rw /
}
puts "write $startscript"
set fp [open $startscript w 0755]
if {$mode != 0} {
puts -nonewline $fp [join [lreplace $data 0 0] \n]
} else {
puts $fp "exit"
puts -nonewline $fp $file_data
}
close $fp
set reboot 1
}
} else {
puts "$process startscript not found!"
# exit 1
}
}

if {($reboot == 1) && ($reboot_flag == 1)} {
exec mount -o remount,ro /
puts -nonewline "saving DOM..."
flush stdout
rega system.Save()
set result [exec /usr/bin/tail -1 /etc/config/homematic.regadom]
if {$result == "</dom>"} {
puts " OK!"
} else {
puts " XML error!"
exit 1
}
file delete /etc/config/InterfacesList.xml
puts "reboot..."
exec /sbin/reboot
}
exit 0
Binary file modified ccurm/cuxd/index.ccc
Binary file not shown.
7 changes: 4 additions & 3 deletions common/cuxd/cuxd.inc
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ Info
</tr>
</table>
<div align='center' style='border:1px solid #aaaaaa;'>
<iframe width='100%%' scrolling='auto' height='380' frameborder='0' style='padding:0px;' src='/addons/cuxd/index.ccc?m=20&lines=%d' name='cuxdoutput'>
<iframe width='100%%' scrolling='auto' height='380' frameborder='0' style='padding:0px;' src='index.ccc?m=20&lines=%d' name='cuxdoutput'>
</iframe>
</div>
</body>
Expand All @@ -282,7 +282,7 @@ Sende/Empfangs-Terminal
</tr>
</table>
<div align='center' style='border:1px solid #aaaaaa;'>
<iframe width='100%%' scrolling='no' height='380' frameborder='0' style='padding:0px;' src='/addons/cuxd/index.ccc?m=16' name='cuxdoutput'>
<iframe width='100%%' scrolling='no' height='380' frameborder='0' style='padding:0px;' src='index.ccc?m=16' name='cuxdoutput'>
</iframe>
</div>
</body>
Expand Down Expand Up @@ -536,7 +536,7 @@ foreach (c,root.Channels().EnumUsedIDs()){
<td style='vertical-align:top'>
<input type='submit' value='Ger&auml;t von CCU l&ouml;schen !' style='width:180px;font-family:arial;font-size:12px;' onClick='var si = dselect.selectedIndex;return(si != -1 && confirm("Ger&auml;t [CUX" + dselect.options[si].value + "] l&ouml;schen?"));'/>
&nbsp;&nbsp;&nbsp;
<input type='button' value='Ger&auml;t bearbeiten' style='width:180px;font-family:arial;font-size:12px;' onClick='var si = dselect.selectedIndex;if (si != -1) { parent.document.getElementById("left_table").innerHTML="<iframe width=\"100%%\" height=\"100%%\" src=\"/addons/cuxd/index.ccc?m=53&dev="+dselect.options[si].value+"\" name=\"devedit\" scrolling=\"no\" frameborder=\"0\" style=\"padding:0px;\"></iframe>";}'/>
<input type='button' value='Ger&auml;t bearbeiten' style='width:180px;font-family:arial;font-size:12px;' onClick='var si = dselect.selectedIndex;if (si != -1) { parent.document.getElementById("left_table").innerHTML="<iframe width=\"100%%\" height=\"100%%\" src=\"index.ccc?m=53&dev="+dselect.options[si].value+"\" name=\"devedit\" scrolling=\"no\" frameborder=\"0\" style=\"padding:0px;\"></iframe>";}'/>
</td></tr></table>
|
##33
Expand Down Expand Up @@ -677,6 +677,7 @@ Funktion:&nbsp;<select name='dtype2' size='1' onChange='submit_dtype2(this)'>
<option value='0'$selected$>Transform</option>
<option value='1'$selected$>State</option>
<option value='2'$selected$>Thermostat</option>
<option value='3'$selected$>LED16</option>
</select><br><br>
|
##48
Expand Down
Binary file modified common/cuxd/dfu/at90usb162.tgz
Binary file not shown.
Binary file modified common/cuxd/dfu/atmega32u2.tgz
Binary file not shown.
Binary file modified common/cuxd/dfu/atmega32u4.tgz
Binary file not shown.
Loading

0 comments on commit cb7c5e7

Please sign in to comment.