Skip to content

Commit

Permalink
Update to 2.19.9 Version
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfgang Willinghoefer committed Jun 6, 2016
1 parent e60183f commit e9b2827
Show file tree
Hide file tree
Showing 315 changed files with 11,653 additions and 1,302 deletions.
Binary file modified HMserver/opt/HMServer/HMIPServer.jar
Binary file not shown.
1 change: 1 addition & 0 deletions HMserver/opt/HMServer/pages/AvailableFirmware.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
</table>

<script type="text/javascript">
setPath("<span onclick='WebUI.enter(SystemConfigPage);'>"+translateKey('menuSettingsPage')+"</span> &gt; "+ translateKey('submenuDeviceFirmware'));
var s = "";
s += "<table cellspacing='8'>";
s += "<tr>";
Expand Down
3 changes: 2 additions & 1 deletion HMserver/opt/HMServer/pages/DiagramControlListPage.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,8 @@
for (var i = 0; i < diagramSettings.options.series.length; i++)
{
var oldLabel = diagramSettings.options.series[i].label;
var label = GetChannelName(oldLabel.substring(0,12)) + " ";
var label = GetChannelName(oldLabel.substring(0,oldLabel.indexOf('_'))) + " ";
label += translateKey('diagramValueType' + oldLabel.split(" ")[1]);
diagramSettings.options.series[i].label = label;
}
Expand Down
4 changes: 2 additions & 2 deletions HMserver/opt/HMServer/pages/DiagramSettingsDetailPage.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@
<#assign i = 0>
<#list object.dataSources as dataSource>
jQuery('#assignedGroupName${i}').text(GetDeviceName('${dataSource.getGroupId()}'));
jQuery('#assignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,12)}'));
jQuery('#assignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,dataSource.getId()?index_of("_"))}'));
<#assign i = i + 1>
</#list>
<#assign i = 0>
<#list notAssignedDataSources as dataSource>
jQuery('#notAssignedGroupName${i}').text(GetDeviceName('${dataSource.getGroupId()}'));
jQuery('#notAssignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,12)}'));
jQuery('#notAssignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,dataSource.getId()?index_of("_"))}'));
<#assign i = i + 1>
</#list>
Expand Down
3 changes: 2 additions & 1 deletion HMserver/opt/HMServer/pages/GroupListPage.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@


<script type="text/javascript">
setPath("<span onclick='WebUI.enter(GroupsPage);'>"+translateKey('menuGroupListPage')+"</span>");
setPath("<span onclick='WebUI.enter(SystemConfigPage);'>"+translateKey('menuSettingsPage')+"</span> &gt; "+ translateKey('menuGroupListPage'));
</script>
<!--</head>
<body>-->
Expand Down
31 changes: 28 additions & 3 deletions WebUI/www/config/cp_maintenance.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,8 @@ proc action_put_page {} {
table {
table_row {
table_data {
division {class="CLASS20908"} "onClick=\"window.location.href='$REMOTE_FIRMWARE_SCRIPT?cmd=download&version=$cur_version&serial=$serial&lang=de&product=HM-CCU2';\"" {
puts "\${dialogSettingsCMBtnPerformSoftwareUpdateDownload}"
}
division {class="CLASS20908" style="display: none"} {id="btnFwDownload"} {} "onClick=\"window.location.href='$REMOTE_FIRMWARE_SCRIPT?cmd=download&version=$cur_version&serial=$serial&lang=de&product=HM-CCU2';\"" {}
division {class="CLASS20908"} "onClick=\"showCCULicense();\"" {puts "\${dialogSettingsCMBtnPerformSoftwareUpdateDownload}"}
}
}
}
Expand Down Expand Up @@ -678,6 +677,32 @@ proc action_put_page {} {
}
}

puts {
showCCULicense = function() {
ShowWaitAnim();
HideWaitAnimAutomatically(60);
if (showDummyLicense == "true") {
homematic.com.showCCUDummyLicense(function (result) {
HideWaitAnim();
var dlg = new EulaDialog(translateKey('dialogEulaTitle'), result ,function(userAction) {
if (userAction == 1) {
jQuery("#btnFwDownload").click();
}
}, "html");
});
} else {
homematic.com.showCCULicense(function (result) {
HideWaitAnim();
var dlg = new EulaDialog(translateKey('dialogEulaTitle'), result ,function(userAction) {
if (userAction == 1) {
jQuery("#btnFwDownload").click();
}
}, "html");
});
}

}
}
}
cgi_javascript {
puts "translatePage('#messagebox');"
Expand Down
8 changes: 4 additions & 4 deletions WebUI/www/config/devdescr/DEVDB.tcl

Large diffs are not rendered by default.

54 changes: 24 additions & 30 deletions WebUI/www/config/easymodes/ALARMACTUATOR/WEATHER.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ set PROFILE_0(UI_HINT) 0
set PROFILE_0(UI_DESCRIPTION) "Expertenprofil"
set PROFILE_0(UI_TEMPLATE) "Expertenprofil"

set PROFILE_1(SHORT_CT_OFFDELAY) {0 1}
set PROFILE_1(SHORT_CT_ONDELAY) {0 1}
set PROFILE_1(SHORT_CT_OFF) {0 1}
set PROFILE_1(SHORT_CT_ON) {0 1}
set PROFILE_1(SHORT_COND_VALUE_LO) {50 range 0 - 200}
set PROFILE_1(SHORT_COND_VALUE_HI) {0 range 0 - 100}
set PROFILE_1(SHORT_CT_OFFDELAY) 0
set PROFILE_1(SHORT_CT_ONDELAY) 0
set PROFILE_1(SHORT_CT_OFF) 0
set PROFILE_1(SHORT_CT_ON) 0
set PROFILE_1(SHORT_COND_VALUE_LO) {50 200}
set PROFILE_1(SHORT_COND_VALUE_HI) {0 100}
set PROFILE_1(SHORT_ONDELAY_TIME) 0
set PROFILE_1(SHORT_ON_TIME) {120 300}
set PROFILE_1(SHORT_OFFDELAY_TIME) 0
Expand All @@ -26,26 +26,28 @@ set PROFILE_1(SHORT_ON_TIME_MODE) 0
set PROFILE_1(SHORT_OFF_TIME_MODE) 0
set PROFILE_1(SHORT_ACTION_TYPE) 1
set PROFILE_1(SHORT_JT_OFF) 1
set PROFILE_1(SHORT_JT_ON) {0 2}
set PROFILE_1(SHORT_JT_OFFDELAY) {0 2}
set PROFILE_1(SHORT_JT_ONDELAY) {0 2}
set PROFILE_1(SHORT_JT_ON) 0
set PROFILE_1(SHORT_JT_OFFDELAY) 0
set PROFILE_1(SHORT_JT_ONDELAY) 0
set PROFILE_1(UI_DESCRIPTION) "Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet der Alarm f&uuml;r die eingestellte Zeit ein."
set PROFILE_1(UI_TEMPLATE) $PROFILE_1(UI_DESCRIPTION)
set PROFILE_1(UI_HINT) 1


set SUBSET_1(NAME) "hidden element"
#set SUBSET_1(NAME) "Wind stark - Aus / Wind schwach - Ein"
set SUBSET_1(NAME) "\${subset_1}"
set SUBSET_1(SUBSET_OPTION_VALUE) 1
set SUBSET_1(SHORT_CT_OFFDELAY) 1
set SUBSET_1(SHORT_CT_ONDELAY) 1
set SUBSET_1(SHORT_CT_OFF) 1
set SUBSET_1(SHORT_CT_ON) 1

set SUBSET_1(SHORT_JT_OFF) 1
set SUBSET_1(SHORT_JT_ON) 2
set SUBSET_1(SHORT_JT_OFFDELAY) 2
set SUBSET_1(SHORT_JT_ONDELAY) 2

set SUBSET_1(SHORT_CT_OFF) 2
set SUBSET_1(SHORT_CT_OFFDELAY) 2
set SUBSET_1(SHORT_CT_ON) 0
set SUBSET_1(SHORT_CT_ONDELAY) 0

#set SUBSET_2(NAME) "Wind stark - Ein / Wind schwach - Aus"
set SUBSET_2(NAME) "\${subset_2}"
set SUBSET_2(SUBSET_OPTION_VALUE) 2
set SUBSET_2(SHORT_CT_OFF) 0
set SUBSET_2(SHORT_CT_OFFDELAY) 0
set SUBSET_2(SHORT_CT_ON) 2
set SUBSET_2(SHORT_CT_ONDELAY) 2

proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {

Expand Down Expand Up @@ -88,20 +90,12 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {

#1
incr prn
set pref 0
set pref 1
if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"

if {$dev_descr_sender(PARENT_TYPE) == "HM-WDS100-C6-O-2"} {
incr pref;
append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td></td><td>"
append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn]
append HTML_PARAMS(separate_$prn) "</td></tr>"
}

incr pref;
append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
option $manner($ch)
append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
Expand Down
115 changes: 115 additions & 0 deletions WebUI/www/config/easymodes/ALARMACTUATOR/WEATHER_2.tcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
#!/bin/tclsh

source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options_alarmactuator.tcl]

set PROFILES_MAP(0) "\${expert}"
set PROFILES_MAP(1) "\${alarm_on}"


set PROFILE_0(UI_HINT) 0
set PROFILE_0(UI_DESCRIPTION) "Expertenprofil"
set PROFILE_0(UI_TEMPLATE) "Expertenprofil"

set PROFILE_1(SHORT_CT_OFFDELAY) 1
set PROFILE_1(SHORT_CT_ONDELAY) 1
set PROFILE_1(SHORT_CT_OFF) 1
set PROFILE_1(SHORT_CT_ON) 1
set PROFILE_1(SHORT_COND_VALUE_LO) {0 range 0 - 255}
set PROFILE_1(SHORT_COND_VALUE_HI) {0 range 0 - 255}
set PROFILE_1(SHORT_ONDELAY_TIME) 0
set PROFILE_1(SHORT_ON_TIME) {120 300}
set PROFILE_1(SHORT_OFFDELAY_TIME) 0
set PROFILE_1(SHORT_OFF_TIME) 111600
set PROFILE_1(SHORT_ON_TIME_MODE) 0
set PROFILE_1(SHORT_OFF_TIME_MODE) 0
set PROFILE_1(SHORT_ACTION_TYPE) 1
set PROFILE_1(SHORT_JT_OFF) 1
set PROFILE_1(SHORT_JT_ON) 2
set PROFILE_1(SHORT_JT_OFFDELAY) 2
set PROFILE_1(SHORT_JT_ONDELAY) 2
set PROFILE_1(UI_DESCRIPTION) "Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet der Alarm f&uuml;r die eingestellte Zeit ein."
set PROFILE_1(UI_TEMPLATE) $PROFILE_1(UI_DESCRIPTION)
set PROFILE_1(UI_HINT) 1


proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {

global dev_descr_sender dev_descr_receiver receiver_address
upvar PROFILES_MAP PROFILES_MAP
upvar HTML_PARAMS HTML_PARAMS
upvar PROFILE_PNAME PROFILE_PNAME
upvar $pps ps
upvar $pps_descr ps_descr

# hier wird der gewaehlte Kancal der ASA ermittelt, Kanal 1 = Sirene - Kanal 2 = Blitzlicht
set ch [string range $receiver_address [expr [string first ":" $receiver_address] +1] [string length $receiver_address]]
set manner(1) "siren"
set manner(2) "flashlight"

foreach pro [array names PROFILES_MAP] {
upvar PROFILE_$pro PROFILE_$pro
}

set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]

#global SUBSETS
set name "x"
set i 1
while {$name != ""} {
upvar SUBSET_$i SUBSET_$i
array set subset [array get SUBSET_$i]
set name ""
catch {set name $subset(NAME)}
array_clear subset
incr i
}

# die Texte der Platzhalter einlesen
puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
set prn 0
append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
append HTML_PARAMS(separate_$prn) "</textarea></div>"

#1
incr prn
set pref 0
if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"

incr pref; #1
append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
option $manner($ch)
append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
append HTML_PARAMS(separate_$prn) "</td></tr>"

incr pref;# 2
append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_LO\"></td></tr>"
incr pref;# 3
append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_HI\"></td></tr>"

append HTML_PARAMS(separate_$prn) "</table></textarea></div>"

append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
append HTML_PARAMS(separate_1) "var stormLowerThresholdElm = jQuery(\"\[name='__STORM_LOWER_THRESHOLD'\]\").first();"
append HTML_PARAMS(separate_1) "var stormUpperThresholdElm = jQuery(\"\[name='__STORM_UPPER_THRESHOLD'\]\").first();"

# The Expert Mode is not active
append HTML_PARAMS(separate_1) "if (stormUpperThresholdElm.length == 0) \{"
append HTML_PARAMS(separate_1) "var stormUpperThresholdElm = jQuery(\"\[name='STORM_UPPER_THRESHOLD'\]\").first();"
append HTML_PARAMS(separate_1) "var stormLowerThresholdElm = jQuery(\"\[name='STORM_LOWER_THRESHOLD'\]\").first();"
append HTML_PARAMS(separate_1) "\}"

append HTML_PARAMS(separate_1) "var condValLoElm1 = jQuery(\"#separate_receiver_1_2\");"
append HTML_PARAMS(separate_1) "var condValHiElm1 = jQuery(\"#separate_receiver_1_3\");"
append HTML_PARAMS(separate_1) "condValLoElm1.val(stormLowerThresholdElm.val());"
append HTML_PARAMS(separate_1) "condValHiElm1.val(stormUpperThresholdElm.val());"
append HTML_PARAMS(separate_1) "</script>"

}

constructor
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"description_1_s" : "<span class=\"translated\">Wenn die gew&auml;hlte Windgeschwindigkeit erreicht wird, schaltet",
"description_1_e" : "f&uuml;r die festgelegte Zeit ein.</span><br/><br/>",
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"description_1_s" : "<span class=\"translated\">When the selected wind velocity will be reached",
"description_1_e" : "will be switched on for the defined time.</span><br/><br/>",
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"description_1_s" : "<span class=\"translated\">Secilen hiza ulasildiginda belirlenen s&uuml;re boyunca",
"description_1_e" : "devreye girer.</span><br/><br/>",
Loading

0 comments on commit e9b2827

Please sign in to comment.