Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/webui/rega/www/esp/datapointconfigurator.fn
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ function ::dcCreate()
Call("/esp/controls/hap.fn::CreateHAP()");
}

if ((ch.Label() == "RPI-RF-MOD") || (ch.Label() =="HmIP-CCU3")) {
if ((ch.Label() == "RPI-RF-MOD") || (ch.Label() == "HmIP-CCU3") || (ch.Label() == "HmIP-RFUSB")) {
WriteLine( "<script>conInfo('Create CoPro Control.');</script>" );
sLastControlName = CN_MAINTENANCE;
isKnownControl = true;
Expand Down
2 changes: 1 addition & 1 deletion src/webui/rega/www/esp/functions.fn
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ function ::showHideHmIPChannel() {
! can be MAINTENANCE_BAT_BL, MAINTENANCE_BAT_EL, MAINTENANCE_BAT_CL and so on
! For BidCos-RF this isn't necessary

if ((oDevHssType != "HmIP-CCU3") && (oDevHssType != "HmIP-HAP") && (oDevHssType != "HmIP-HAP-A") && (oDevHssType != "HmIP-HAP2") && (oDevHssType != "HmIP-HAP2-A") && (oDevHssType != "HmIP-HAP-B1") && (oDevHssType != "HmIP-HAP JS1") && (oDevHssType != "RPI-RF-MOD")) {
if ((oDevHssType != "HmIP-CCU3") && (oDevHssType != "HmIP-HAP") && (oDevHssType != "HmIP-HAP-A") && (oDevHssType != "HmIP-HAP2") && (oDevHssType != "HmIP-HAP2-A") && (oDevHssType != "HmIP-HAP-B1") && (oDevHssType != "HmIP-HAP JS1") && (oDevHssType != "RPI-RF-MOD") && (oDevHssType != "HmIP-RFUSB")) {
bShowChannel = false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ proc getMaintenance {chn p descr address} {

puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/HmIP-ParamHelp.js');</script>"

if {([string equal $devType "HmIP-CCU3"] == 1) || ([string equal $devType "RPI-RF-MOD"] == 1)} {
if {([string equal $devType "HmIP-CCU3"] == 1) || ([string equal $devType "RPI-RF-MOD"] == 1) || ([string equal $devType "HmIP-RFUSB"] == 1)} {
append html "[getNoParametersToSet]"
return $html
}
Expand Down
5 changes: 3 additions & 2 deletions src/webui/www/tools/js/model/devicetypelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ DeviceTypeList = Singleton.create({
"HMW-RCV-50",
"HM-Sec-SD-Team",
"HmIP-CCU3",
"RPI-RF-MOD"
"RPI-RF-MOD",
"HmIP-RFUSB"
],

/**
Expand Down Expand Up @@ -110,4 +111,4 @@ DeviceTypeList = Singleton.create({
}

});

Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ jQuery.extend(true,langJSON, {
"HmIP-BROLL-2": "Homematic IP Rollladenaktor f%FCr Markenschalter",
"HmIP-BS2": "Homematic IP Wandtaster f%FCr Markenschalter - 2-fach",
"HmIP-BSL": "Homematic IP Schaltaktor f%FCr Markenschalter - mit Signalleuchte",
"HmIP-CCU3": "Homematic IP Zentrale CCU3",
"HmIP-CCU3": "Homematic IP Zentrale",
"HmIP-DRG-DALI": "Homematic IP DALI Gateway",
"HmIP-DBB": "Homematic IP T%FCrklingeltaster",
"HmIP-DLD" : "Homematic IP T%FCrschlossantrieb",
Expand Down Expand Up @@ -241,6 +241,7 @@ jQuery.extend(true,langJSON, {
"HmIP-PCBS2": "Homematic IP Schaltplatine - 2-fach",
"HmIP-PMFS": "Homematic IP Netzausfall%FCberwachung",
"HmIP-RCV-50": "Virtuelle Fernbedienung",
"HmIP-RFUSB": "Homematic IP Zentrale",
"HmIP-RGBW" : "Homematic IP LED Controller - RGBW",
"HmIP-SAM" :"Homematic IP Ersch%FCtterungs- / Beschleunigungssensor",
"HmIP-SCI" : "Homematic IP Kontakt-Schnittstelle",
Expand Down Expand Up @@ -345,7 +346,7 @@ jQuery.extend(true,langJSON, {
"RC8": "Homematic IP Fernbedienung, 8 Kanal",
"RF-LAN-Sniffer" : "RF-LAN-Sniffer",
"RM-110-45" : "TEXINO Rohrmotor HmIP 8-Kantwelle 60mm/15Nm",
"RPI-RF-MOD" : "CO-PROCESSOR",
"RPI-RF-MOD" : "Homematic IP Zentrale",
"SMI": "Homematic IP Bewegungsmelder innen",
"SMO": "Homematic IP Bewegungsmelder au%DFen",
"SRH": "Homematic IP Fenster-/ Drehgriffkontakt",
Expand Down Expand Up @@ -381,4 +382,4 @@ jQuery.extend(true,langJSON, {
"ZEL_STG_RM_WT_2": "Funk-Wandtaster 2-fach im 55er Rahmen",
"The END": ""
}
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ jQuery.extend(true,langJSON, {
"HmIP-BROLL-2": "Homematic IP Blind Actuator for brand switch systems, flush-mount",
"HmIP-BS2": "Homematic IP Remote Control for brand switches - 2 channels",
"HmIP-BSL": "Homematic IP Switch Actuator with Signal Lamp - for brand switches",
"HmIP-CCU3": "Homematic IP Central Control Unit CCU3",
"HmIP-CCU3": "Homematic IP Central Control Unit",
"HmIP-DRG-DALI": "Homematic IP DALI Gateway",
"HmIP-DBB": "Homematic IP Doorbell Button",
"HmIP-DLD" : "Homematic IP Door Lock Drive",
Expand Down Expand Up @@ -241,6 +241,7 @@ jQuery.extend(true,langJSON, {
"HmIP-PCBS2": "Homematic IP Switch Circuit Board - 2 channels",
"HmIP-PMFS": "Homematic IP Mains Failure Surveillance",
"HmIP-RCV-50": "Virtual Remote Control",
"HmIP-RFUSB": "Homematic IP Central Control Unit",
"HmIP-RGBW" : "Homematic IP LED Controller - RGBW",
"HmIP-SAM": "Homematic IP Acceleration Sensor",
"HmIP-SCTH230" : "Homematic IP CO2 Sensor, 230 V",
Expand Down Expand Up @@ -343,7 +344,7 @@ jQuery.extend(true,langJSON, {
"RC8": "Homematic IP Remote Contro, 8-channel",
"RF-LAN-Sniffer" : "RF-LAN-Sniffer",
"RM-110-45" : "TEXINO Tubular Drive HmIP Octagonal Shaft 60mm/15Nm",
"RPI-RF-MOD" : "CO-PROCESSOR",
"RPI-RF-MOD" : "Homematic IP Central Control Unit",
"SMI": "Homematic IP Motion Detector - indoor",
"SMO": "Homematic IP Motion Detector, outdoor",
"SRH": "Homematic IP Rotary Handle Sensor",
Expand Down Expand Up @@ -379,4 +380,4 @@ jQuery.extend(true,langJSON, {
"ZEL_STG_RM_WT_2": "Wireless Push-button 2-channel in 55mm frame",
"The END": ""
}
});
});
19 changes: 19 additions & 0 deletions src/webui/www_source/config/devdescr/copro_usb_hmip-rfusb.tcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/tclsh
# This is the HmIP-RFUSB stick used as CCU-CoPro

#Typ dieser Beschreibung (Schl�ssel)
#-----------------------------------------------------------------------
set TYPE "HmIP-RFUSB"

#Beschreibung des Ger�tetyps
#-----------------------------------------------------------------------
set DESCRIPTION "HmIP-RFUSB"

#Pfade zu den Bildern verschiedener Gr��e
#lappend PATHLIST <Pixell�nge maximale Ausdehnung> <Pfad zum Bild>
#-----------------------------------------------------------------------
set PATHLIST ""
lappend PATHLIST [list 50 "/config/img/devices/50/CCU3_thumb.png"]
lappend PATHLIST [list 250 "/config/img/devices/250/CCU3.png"]

set P ""
3 changes: 2 additions & 1 deletion src/webui/www_source/webui/js/model/devicetypelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ DeviceTypeList = Singleton.create({
"HM-Sec-SD-Team",
"HM-Sec-SD-2-Team",
"HmIP-CCU3",
"RPI-RF-MOD"
"RPI-RF-MOD",
"HmIP-RFUSB"
],

/**
Expand Down