Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.3 #41

Merged
merged 8 commits into from
May 25, 2021
Merged

5.3 #41

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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ _Bitte etwas Geduld haben - je nach Geschwindigkeit der SD Karte kann die Instal
|<img src="src/addon/www/config/img/devices/50/hb-uni-sen-ph-orp_thumb.png" width=25/> | [HB-UNI-Sen-PH-ORP](https://github.com/jp112sdl/HB-UNI-Sen-PH-ORP) | PH-+ORP-Sensor | ⚡️ |
|<img src="src/addon/www/config/img/devices/50/hb-uni-sen-pool_thumb.png" width=25/> | [HB-UNI-Sen-POOL](https://github.com/jp112sdl/HB-UNI-Sen-POOL) | Pool Multidevice (4x Aktor-, 2x Schließerkontakt- <br/>und 1 Messkanal (PH, ORP, 2x Temperatur, Druck, Durchflussrate)| ⚡️ |
|<img src="src/addon/www/config/img/devices/50/hb-ou-rgbw-led-fx_thumb.png" width=25/> | [HB-OU-RGBW-LED-FX](https://github.com/jp112sdl/HB-OU-RGBW-LED-FX) | [WS2812FX](https://github.com/kitesurfer1404/WS2812FX) Implementierung für SK6812 LED Stripes| ⚡️ |
|<img src="src/addon/www/config/img/devices/50/hb-lc-sw4-tp_thumb.png" width=25/> | [HB-LC-SwX-TP](https://github.com/jp112sdl/HB-LC-SwX-TP) | 1-/2-/4-fach Aktor mit Zeitprofil| ⚡️ |

**Hinweis für Entwickler** _(verwendete Device Model meiner bzw. fremd-eingebundener HB-Geräte)_ **:**

Expand Down Expand Up @@ -137,6 +138,9 @@ _Bitte etwas Geduld haben - je nach Geschwindigkeit der SD Karte kann die Instal
|F3 20 | HB-LC-SW12-FM |
|F3 21 | HB-LC-Bl1-FM-BAT|
|F3 22 | HB-LC-SwX-TP |
|F3 23 | HB-LC-Sw1-TP |
|F3 24 | HB-LC-Sw2-TP |
|F3 25 | HB-LC-Sw4-TP |
|F3 2B | HB-RC-X-POS |
|F3 2C | HB-RC-10-POS |
|F3 2D | HB-RC-4-TOUCH |
Expand Down
1 change: 1 addition & 0 deletions patchsource/www/config/ic_deviceparameters.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@ proc put_channel_parameters {} {
|| ([string equal $ch_paramid "dw_controller_color_virt_ch_master"] == 1)
|| ([string equal $ch_paramid "dw_controller_brightness_ch_master"] == 1)
|| ([string equal $ch_paramid "dw_controller_brightness_virt_ch_master"] == 1)
|| ([string equal $ch_paramid "hb_sw_tp_ch_master"] == 1)
} {
setInternalDeviceKey $ch_paramid
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@ jQuery.extend(true,langJSON, {
"iconChDirArrow":"Pfeil zum Taster",
"lblHbIterations":"Anzahl der Durchl%E4ufe",
"lblEffectNr":"Effekt",
"lblEffectOptions":"Effekt-Optionen",
"lblEffectSpeed":"Effektgeschwindigkeit",
"iconHbSprinkler":"Sprinkler",
"iconHbValve":"Wasserhahn",
Expand Down
32 changes: 29 additions & 3 deletions patchsource/www/webui/webui.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,30 @@ DEV_DESCRIPTION['HB-UNI-DMX-Master']='Universal Simple DMX Controller (Master)';
DEV_PATHS['HB-UNI-DMX-Master'] = new Object();
DEV_PATHS['HB-UNI-DMX-Master']['50'] = '/config/img/devices/50/hb-uni-dmx-master_thumb.png';
DEV_PATHS['HB-UNI-DMX-Master']['250'] = '/config/img/devices/250/hb-uni-dmx-master.png';
DEV_HIGHLIGHT['HB-LC-SwX-TP'] = new Object();
DEV_LIST.push('HB-LC-SwX-TP');
DEV_DESCRIPTION['HB-LC-SwX-TP']='radio-controlled switch actuator X-channel, with time profile';
DEV_PATHS['HB-LC-SwX-TP'] = new Object();
DEV_PATHS['HB-LC-SwX-TP']['50'] = '/config/img/devices/50/hb-lc-swx-tp_thumb.png';
DEV_PATHS['HB-LC-SwX-TP']['250'] = '/config/img/devices/250/hb-lc-swx-tp.png';
DEV_HIGHLIGHT['HB-LC-Sw1-TP'] = new Object();
DEV_LIST.push('HB-LC-Sw1-TP');
DEV_DESCRIPTION['HB-LC-Sw1-TP']='radio-controlled switch actuator 1-channel, with time profile';
DEV_PATHS['HB-LC-Sw1-TP'] = new Object();
DEV_PATHS['HB-LC-Sw1-TP']['50'] = '/config/img/devices/50/hb-lc-sw1-tp_thumb.png';
DEV_PATHS['HB-LC-Sw1-TP']['250'] = '/config/img/devices/250/hb-lc-sw1-tp.png';
DEV_HIGHLIGHT['HB-LC-Sw2-TP'] = new Object();
DEV_LIST.push('HB-LC-Sw2-TP');
DEV_DESCRIPTION['HB-LC-Sw2-TP']='radio-controlled switch actuator 2-channel, with time profile';
DEV_PATHS['HB-LC-Sw2-TP'] = new Object();
DEV_PATHS['HB-LC-Sw2-TP']['50'] = '/config/img/devices/50/hb-lc-sw2-tp_thumb.png';
DEV_PATHS['HB-LC-Sw2-TP']['250'] = '/config/img/devices/250/hb-lc-sw2-tp.png';
DEV_HIGHLIGHT['HB-LC-Sw4-TP'] = new Object();
DEV_LIST.push('HB-LC-Sw4-TP');
DEV_DESCRIPTION['HB-LC-Sw4-TP']='radio-controlled switch actuator 4-channel, with time profile';
DEV_PATHS['HB-LC-Sw4-TP'] = new Object();
DEV_PATHS['HB-LC-Sw4-TP']['50'] = '/config/img/devices/50/hb-lc-sw4-tp_thumb.png';
DEV_PATHS['HB-LC-Sw4-TP']['250'] = '/config/img/devices/250/hb-lc-sw4-tp.png';
DEV_HIGHLIGHT['HB-Sec-RHS-3'] = new Object();
DEV_LIST.push('HB-Sec-RHS-3');
DEV_DESCRIPTION['HB-Sec-RHS-3']='HB Rotary Handle Sensor with battery state';
Expand All @@ -350,7 +374,8 @@ DEV_LIST.push('HB-RC-6-PBU-LED');
DEV_DESCRIPTION['HB-RC-6-PBU-LED']='6 remote channel push button with led';
DEV_PATHS['HB-RC-6-PBU-LED'] = new Object();
DEV_PATHS['HB-RC-6-PBU-LED']['50'] = '/config/img/devices/50/hb-rc-6-pbu-led_thumb.png';
DEV_PATHS['HB-RC-6-PBU-LED']['250'] = '/config/img/devices/250/hb-rc-6-pbu-led.png';DEV_HIGHLIGHT['HB-RC-6-PBU-LED'] = new Object();
DEV_PATHS['HB-RC-6-PBU-LED']['250'] = '/config/img/devices/250/hb-rc-6-pbu-led.png';
DEV_HIGHLIGHT['HB-RC-6-PBU-LED'] = new Object();
DEV_HIGHLIGHT['HB-RC-6-PBU-LED']['Light_circle'] = [4, 0.8079999999999999, 0.656, 0.118, 0.112];
DEV_HIGHLIGHT['HB-RC-6-PBU-LED']['Light_beam_1'] = [6, 0.748, 0.712, 0.776, 0.712, 0.016];
DEV_HIGHLIGHT['HB-RC-6-PBU-LED']['Light_beam_2'] = [6, 0.776, 0.632, 0.8, 0.652, 0.016];
Expand Down Expand Up @@ -424,7 +449,8 @@ DEV_LIST.push('HB-OU-MP3-LED');
DEV_DESCRIPTION['HB-OU-MP3-LED']='MP3 Player with adressable LED';
DEV_PATHS['HB-OU-MP3-LED'] = new Object();
DEV_PATHS['HB-OU-MP3-LED']['50'] = '/config/img/devices/50/hb-ou-mp3-led_thumb.png';
DEV_PATHS['HB-OU-MP3-LED']['250'] = '/config/img/devices/250/hb-ou-mp3-led.png';DEV_HIGHLIGHT['HB-OU-MP3-LED'] = new Object();
DEV_PATHS['HB-OU-MP3-LED']['250'] = '/config/img/devices/250/hb-ou-mp3-led.png';
DEV_HIGHLIGHT['HB-OU-MP3-LED'] = new Object();
DEV_HIGHLIGHT['HB-OU-MP3-LED']['Light_circle'] = [4, 0.8079999999999999, 0.656, 0.118, 0.112];
DEV_HIGHLIGHT['HB-OU-MP3-LED']['Light_beam_1'] = [6, 0.748, 0.712, 0.776, 0.712, 0.016];
DEV_HIGHLIGHT['HB-OU-MP3-LED']['Light_beam_2'] = [6, 0.776, 0.632, 0.8, 0.652, 0.016];
Expand Down Expand Up @@ -24270,7 +24296,7 @@ iseMessageBox.prototype =
case ID_SET_HBOURGBWLEDFX_MODE:
this.setTitle( translateKey("dialogEnterValue") /*"Wert eingeben" */);
this.addToPostBody( 'string type = "'+this.type+'";' );
this.setWidth(400);
this.setWidth(480);
this.setFile( "/pages/msg/setHBOURGBWLEDFXMode.htm" );
break;
case ID_SET_STATUS_DISPLAY:
Expand Down
2 changes: 1 addition & 1 deletion src/addon/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2
5.3
4 changes: 4 additions & 0 deletions src/addon/devdb.csv
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ HB-LC-Sw1PBU-FM;PushButton-2ch-wm
HB-LC-Sw2-FM;5_hm-lc-sw2-fm
HB-LC-Sw2PBU-FM;PushButton-2ch-wm
HB-LC-Sw12-FM;hb-lc-sw12-fm
HB-LC-SwX-TP;hb-lc-swx-tp
HB-LC-Sw1-TP;hb-lc-sw1-tp
HB-LC-Sw2-TP;hb-lc-sw2-tp
HB-LC-Sw4-TP;hb-lc-sw4-tp
HB-OU-AF-SEN-TEMP;hb-ou-af-sen-temp
HB-OU-MOT-FAN;hb-ou-mot-fan
HB-OU-MOT-FAN-RPM;hb-ou-mot-fan
Expand Down
4 changes: 4 additions & 0 deletions src/addon/firmware/rftypes/hb-ou-rgbw-led-fx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,10 @@
</logical>
<physical type="integer" interface="config" list="3" index="0x24" size="1.0"/>
</parameter>
<parameter id="SHORT_ACT_OPTIONS">
<logical type="integer" min="0" max="255" default="0"/>
<physical type="integer" interface="config" list="3" index="0x30" size="1.0"/>
</parameter>
<parameter id="SHORT_ACT_NUM">
<logical type="integer" min="0" max="255" default="0"/>
<physical type="integer" interface="config" list="3" index="0x25" size="1.0"/>
Expand Down
Loading