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.

Sign up for GitHub

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

Jump to bottom

[velbus] New functionality and bug fix #15661

Merged
merged 44 commits into from
Apr 28, 2024
Merged

[velbus] New functionality and bug fix #15661

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
01fbb66
[velbus] New functionnality & Bug fix
Rosen01 Sep 27, 2023
d25e053
[velbus] VMBDALI white channel
Rosen01 Sep 28, 2023
f3143c3
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Oct 4, 2023
37b72b2
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Oct 4, 2023
fb2ee80
Update bundles/org.openhab.binding.velbus/README.md
Rosen01 Oct 4, 2023
f3565df
Update bundles/org.openhab.binding.velbus/README.md
Rosen01 Oct 4, 2023
1196489
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Oct 4, 2023
215c6ac
Update bundles/org.openhab.binding.velbus/README.md
Rosen01 Oct 4, 2023
817c8c7
Update bundles/org.openhab.binding.velbus/README.md
Rosen01 Oct 4, 2023
b49bd66
Update bundles/org.openhab.binding.velbus/README.md
Rosen01 Oct 4, 2023
77f3005
Merge branch 'openhab:main' into main
Rosen01 Oct 5, 2023
025684c
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Oct 5, 2023
5d76cc4
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Oct 5, 2023
0d29715
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Oct 5, 2023
6f1d1d1
[velbus] colors channels & disposed handlers
Rosen01 Oct 5, 2023
6f5c9e5
[velbus] small correction
Rosen01 Oct 5, 2023
f539895
Merge branch 'openhab:main' into main
Rosen01 Nov 14, 2023
1be6169
[velbus] Add thing upgrade instructions VMBELx
Rosen01 Nov 19, 2023
f338b9e
Merge branch 'main' of https://github.com/Rosen01/openhab-addons
Rosen01 Nov 19, 2023
bac1d97
[velbus] Update Readme
Rosen01 Nov 19, 2023
cb12d88
Merge branch 'openhab:main' into main
Rosen01 Nov 25, 2023
9e82176
Merge branch 'openhab:main' into main
Rosen01 Dec 14, 2023
018b0e2
[velbus] Add new modules
Rosen01 Dec 14, 2023
c8128ed
Merge branch 'main' into main
Rosen01 Jan 17, 2024
a5f13e5
[velbus] Fix codestyle
Rosen01 Jan 17, 2024
13aea1e
[velbus] Copyright update
Rosen01 Jan 17, 2024
75352b0
Merge branch 'openhab:main' into main
Rosen01 Jan 30, 2024
40cbed0
Merge branch 'openhab:main' into main
Rosen01 Jan 30, 2024
89c04aa
[velbus] Fix update instructions
Rosen01 Jan 30, 2024
a02016e
Merge branch 'openhab:main' into main
Rosen01 Feb 13, 2024
b54ca33
Merge branch 'openhab:main' into main
Rosen01 Feb 27, 2024
bf0ac9e
Merge branch 'openhab:main' into main
Rosen01 Mar 5, 2024
15c950a
Merge branch 'openhab:main' into main
Rosen01 Mar 8, 2024
9e2b724
Merge branch 'openhab:main' into main
Rosen01 Mar 24, 2024
f6f9a9b
Merge branch 'openhab:main' into main
Rosen01 Apr 8, 2024
58ac264
[velbus] Disable push button events on sensor address for new modules
Rosen01 Apr 8, 2024
7afc5ff
Merge branch 'openhab:main' into main
Rosen01 Apr 25, 2024
e978b29
Update bundles/org.openhab.binding.velbus/README.md
Rosen01 Apr 28, 2024
3e68197
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Apr 28, 2024
296b229
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Apr 28, 2024
ff2a1b2
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Apr 28, 2024
9eda049
Update bundles/org.openhab.binding.velbus/src/main/java/org/openhab/b…
Rosen01 Apr 28, 2024
29c5224
Merge branch 'openhab:main' into main
Rosen01 Apr 28, 2024
5fe388c
Update VelbusVMBDALIHandler.java
Rosen01 Apr 28, 2024
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
209 changes: 128 additions & 81 deletions bundles/org.openhab.binding.velbus/README.md
View file
Open in desktop

Large diffs are not rendered by default.

131 changes: 108 additions & 23 deletions ...ding.velbus/src/main/java/org/openhab/binding/velbus/internal/VelbusBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ public class VelbusBindingConstants {
public static final ThingTypeUID THING_TYPE_VMBKP = new ThingTypeUID(BINDING_ID, "vmbkp");
public static final ThingTypeUID THING_TYPE_VMBIN = new ThingTypeUID(BINDING_ID, "vmbin");
public static final ThingTypeUID THING_TYPE_VMB4PB = new ThingTypeUID(BINDING_ID, "vmb4pb");
public static final ThingTypeUID THING_TYPE_VMBDALI = new ThingTypeUID(BINDING_ID, "vmbdali");
public static final ThingTypeUID THING_TYPE_VMB4RYLD_10 = new ThingTypeUID(BINDING_ID, "vmb4ryld-10");
public static final ThingTypeUID THING_TYPE_VMB4RYNO_10 = new ThingTypeUID(BINDING_ID, "vmb4ryno-10");
public static final ThingTypeUID THING_TYPE_VMB2BLE_10 = new ThingTypeUID(BINDING_ID, "vmb2ble-10");
public static final ThingTypeUID THING_TYPE_VMB6PB_20 = new ThingTypeUID(BINDING_ID, "vmb6pb-20");
public static final ThingTypeUID THING_TYPE_VMBEL1_20 = new ThingTypeUID(BINDING_ID, "vmbel1-20");
public static final ThingTypeUID THING_TYPE_VMBEL2_20 = new ThingTypeUID(BINDING_ID, "vmbel2-20");
public static final ThingTypeUID THING_TYPE_VMBEL4_20 = new ThingTypeUID(BINDING_ID, "vmbel4-20");
public static final ThingTypeUID THING_TYPE_VMBELO_20 = new ThingTypeUID(BINDING_ID, "vmbelo-20");
public static final ThingTypeUID THING_TYPE_VMBGP1_20 = new ThingTypeUID(BINDING_ID, "vmbgp1-20");
public static final ThingTypeUID THING_TYPE_VMBGP2_20 = new ThingTypeUID(BINDING_ID, "vmbgp2-20");
public static final ThingTypeUID THING_TYPE_VMBGP4_20 = new ThingTypeUID(BINDING_ID, "vmbgp4-20");
public static final ThingTypeUID THING_TYPE_VMBGPO_20 = new ThingTypeUID(BINDING_ID, "vmbgpo-20");
public static final ThingTypeUID THING_TYPE_VMBDALI_20 = new ThingTypeUID(BINDING_ID, "vmbdali-20");
public static final ThingTypeUID THING_TYPE_VMBEL4PIR_20 = new ThingTypeUID(BINDING_ID, "vmbel4pir-20");
public static final ThingTypeUID THING_TYPE_VMBGP4PIR_20 = new ThingTypeUID(BINDING_ID, "vmbgp4pir-20");

// thing type sets
public static final Set<ThingTypeUID> BRIDGE_THING_TYPES_UIDS = Set.of(BRIDGE_THING_TYPE,
Expand All @@ -98,7 +114,11 @@ public class VelbusBindingConstants {
THING_TYPE_VMBGP1_2, THING_TYPE_VMBGP2, THING_TYPE_VMBGP2_2, THING_TYPE_VMBGP4, THING_TYPE_VMBGP4_2,
THING_TYPE_VMBGP4PIR, THING_TYPE_VMBGP4PIR_2, THING_TYPE_VMBGPO, THING_TYPE_VMBGPOD, THING_TYPE_VMBGPOD_2,
THING_TYPE_VMBMETEO, THING_TYPE_VMBPIRC, THING_TYPE_VMBPIRM, THING_TYPE_VMBPIRO, THING_TYPE_VMBRFR8S,
THING_TYPE_VMBVP1, THING_TYPE_VMBKP, THING_TYPE_VMBIN, THING_TYPE_VMB4PB);
THING_TYPE_VMBVP1, THING_TYPE_VMBKP, THING_TYPE_VMBIN, THING_TYPE_VMB4PB, THING_TYPE_VMBDALI,
THING_TYPE_VMB4RYLD_10, THING_TYPE_VMB4RYNO_10, THING_TYPE_VMB2BLE_10, THING_TYPE_VMB6PB_20,
THING_TYPE_VMBEL1_20, THING_TYPE_VMBEL2_20, THING_TYPE_VMBEL4_20, THING_TYPE_VMBELO_20,
THING_TYPE_VMBGP1_20, THING_TYPE_VMBGP2_20, THING_TYPE_VMBGP4_20, THING_TYPE_VMBGPO_20,
THING_TYPE_VMBDALI_20, THING_TYPE_VMBEL4PIR_20, THING_TYPE_VMBGP4PIR_20);

// Velbus module types
public static final byte MODULE_TYPE_VMB8PB = 0x01;
Expand All @@ -114,6 +134,7 @@ public class VelbusBindingConstants {
public static final byte MODULE_TYPE_VMB4RYLD = 0x10;
public static final byte MODULE_TYPE_VMB4RYNO = 0x11;
public static final byte MODULE_TYPE_VMB4DC = 0x12;
public static final byte MODULE_TYPE_VMBLCDWB = 0x13;
public static final byte MODULE_TYPE_VMBDME = 0x14;
public static final byte MODULE_TYPE_VMBDMI = 0x15;
public static final byte MODULE_TYPE_VMB8PBU = 0x16;
Expand Down Expand Up @@ -152,6 +173,22 @@ public class VelbusBindingConstants {
public static final byte MODULE_TYPE_VMBKP = 0x42;
public static final byte MODULE_TYPE_VMBIN = 0x43;
public static final byte MODULE_TYPE_VMB4PB = 0x44;
public static final byte MODULE_TYPE_VMBDALI = 0x45;
public static final byte MODULE_TYPE_VMB4RYLD_10 = 0x48;
public static final byte MODULE_TYPE_VMB4RYNO_10 = 0x49;
public static final byte MODULE_TYPE_VMB2BLE_10 = 0x4A;
public static final byte MODULE_TYPE_VMB6PB_20 = 0x4C;
public static final byte MODULE_TYPE_VMBEL1_20 = 0x4F;
public static final byte MODULE_TYPE_VMBEL2_20 = 0x50;
public static final byte MODULE_TYPE_VMBEL4_20 = 0x51;
public static final byte MODULE_TYPE_VMBELO_20 = 0x52;
public static final byte MODULE_TYPE_VMBGP1_20 = 0x54;
public static final byte MODULE_TYPE_VMBGP2_20 = 0x55;
public static final byte MODULE_TYPE_VMBGP4_20 = 0x56;
public static final byte MODULE_TYPE_VMBGPO_20 = 0x57;
public static final byte MODULE_TYPE_VMBDALI_20 = 0x5A;
public static final byte MODULE_TYPE_VMBEL4PIR_20 = 0x5C;
public static final byte MODULE_TYPE_VMBGP4PIR_20 = 0x5F;

// Velbus commands
public static final byte COMMAND_PUSH_BUTTON_STATUS = 0x00;
Expand All @@ -161,11 +198,24 @@ public class VelbusBindingConstants {
public static final byte COMMAND_BLIND_UP = 0x05;
public static final byte COMMAND_BLIND_DOWN = 0x06;
public static final byte COMMAND_SET_VALUE = 0x07;
public static final byte COMMAND_SET_DIMVALUE = 0x07;
public static final byte COMMAND_SLIDER_STATUS = 0x0F;
public static final byte COMMAND_RESTORE_LAST_DIMVALUE = 0x11;
public static final byte COMMAND_FORCED_OFF = 0x12;
public static final byte COMMAND_CANCEL_FORCED_OFF = 0x13;
public static final byte COMMAND_FORCED_ON = 0x14;
public static final byte COMMAND_CANCEL_FORCED_ON = 0x15;
public static final byte COMMAND_INHIBIT = 0x16;
public static final byte COMMAND_CANCEL_INHIBIT = 0x17;
public static final byte COMMAND_BLIND_POS = 0x1C;
public static final byte COMMAND_SET_DIMSCENE = (byte) 0x1D;
public static final byte COMMAND_SET_COLOR = (byte) 0x1E;
public static final byte COMMAND_DIMVALUE_STATUS = (byte) 0xA5;
public static final byte COMMAND_SUBTYPE_3 = (byte) 0xA6;
public static final byte COMMAND_SUBTYPE_2 = (byte) 0xA7;
public static final byte COMMAND_SENSOR_RAW_DATA = (byte) 0xA9;
public static final byte COMMAND_LIGHT_VALUE_REQUEST = (byte) 0xAA;
public static final byte COMMAND_POWER_UP = (byte) 0xAB;
public static final byte COMMAND_TEXT = (byte) 0xAC;
public static final byte COMMAND_DAYLIGHT_SAVING_STATUS = (byte) 0xAF;
public static final byte COMMAND_SUBTYPE = (byte) 0xB0;
Expand Down Expand Up @@ -210,7 +260,14 @@ public class VelbusBindingConstants {
public static final byte COMMAND_READ_DATA_FROM_MEMORY = (byte) 0xFD;
public static final byte COMMAND_MEMORY_DATA = (byte) 0xFE;
public static final byte COMMAND_MODULE_TYPE = (byte) 0xFF;

// Useful values
public static final byte ALL_CHANNELS = (byte) 0xFF;
public static final byte ALL_DALI_CHANNELS = (byte) 0x51;
public static final byte SUB_ADDRESS_DISABLED = (byte) 0xFF;
public static final byte VALUE_UNCHANGED = (byte) 0xFF;
public static final byte DALI_SETTING_ACTUAL_LEVEL = (byte) 0x1A;
public static final byte DALI_MAX_VALUE = (byte) 0xFE;

// Module properties
public static final String PORT = "port";
Expand All @@ -226,32 +283,60 @@ public class VelbusBindingConstants {
public static final String MODULE_MEMORY_MAP_VERSION = "memory map version";
public static final String MODULE_BUILD = "build";
public static final String CHANNEL = "CH";
public static final String DALI_ADDRESS = "A";
public static final String VIRTUAL_LIGHT = "VL";
public static final String SUB_ADDRESS = "subaddress";
public static final String DIMSPEED = "dimspeed";

// Channel group ids
public static final String CHANNEL_GROUP_BRIDGE_CLOCK_ALARM = "bridgeClockAlarm";
public static final String CHANNEL_GROUP_MODULE_CLOCK_ALARM = "clockAlarm";
public static final String CHANNEL_GROUP_INPUT = "input";
public static final String CHANNEL_GROUP_FEEDBACK = "feedback";
public static final String CHANNEL_GROUP_BUTTON = "button";
public static final String CHANNEL_GROUP_OUTPUT = "output";
public static final String CHANNEL_GROUP_THERMOSTAT = "thermostat";
public static final String CHANNEL_GROUP_COLOR = "color";
public static final String CHANNEL_GROUP_BRIGHTNESS = "brightness";
public static final String CHANNEL_GROUP_WHITE = "white";
public static final String CHANNEL_GROUP_SCENE = "scene";
public static final String CHANNEL_GROUP_VIRTUAL_LIGHT = "virtual-light";

// Channels ids
public static final String CHANNEL_BRIDGE_CLOCK_ALARM1_ENABLED = "bridgeClockAlarm#clockAlarm1Enabled";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM1_WAKEUP_HOUR = "bridgeClockAlarm#clockAlarm1WakeupHour";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM1_WAKEUP_MINUTE = "bridgeClockAlarm#clockAlarm1WakeupMinute";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM1_BEDTIME_HOUR = "bridgeClockAlarm#clockAlarm1BedtimeHour";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM1_BEDTIME_MINUTE = "bridgeClockAlarm#clockAlarm1BedtimeMinute";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM2_ENABLED = "bridgeClockAlarm#clockAlarm2Enabled";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM2_WAKEUP_HOUR = "bridgeClockAlarm#clockAlarm2WakeupHour";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM2_WAKEUP_MINUTE = "bridgeClockAlarm#clockAlarm2WakeupMinute";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM2_BEDTIME_HOUR = "bridgeClockAlarm#clockAlarm2BedtimeHour";
public static final String CHANNEL_BRIDGE_CLOCK_ALARM2_BEDTIME_MINUTE = "bridgeClockAlarm#clockAlarm2BedtimeMinute";
public static final String CHANNEL_MODULE_CLOCK_ALARM1_ENABLED = "clockAlarm#clockAlarm1Enabled";
public static final String CHANNEL_MODULE_CLOCK_ALARM1_TYPE = "clockAlarm#clockAlarm1Type";
public static final String CHANNEL_MODULE_CLOCK_ALARM1_WAKEUP_HOUR = "clockAlarm#clockAlarm1WakeupHour";
public static final String CHANNEL_MODULE_CLOCK_ALARM1_WAKEUP_MINUTE = "clockAlarm#clockAlarm1WakeupMinute";
public static final String CHANNEL_MODULE_CLOCK_ALARM1_BEDTIME_HOUR = "clockAlarm#clockAlarm1BedtimeHour";
public static final String CHANNEL_MODULE_CLOCK_ALARM1_BEDTIME_MINUTE = "clockAlarm#clockAlarm1BedtimeMinute";
public static final String CHANNEL_MODULE_CLOCK_ALARM2_ENABLED = "clockAlarm#clockAlarm2Enabled";
public static final String CHANNEL_MODULE_CLOCK_ALARM2_TYPE = "clockAlarm#clockAlarm2Type";
public static final String CHANNEL_MODULE_CLOCK_ALARM2_WAKEUP_HOUR = "clockAlarm#clockAlarm2WakeupHour";
public static final String CHANNEL_MODULE_CLOCK_ALARM2_WAKEUP_MINUTE = "clockAlarm#clockAlarm2WakeupMinute";
public static final String CHANNEL_MODULE_CLOCK_ALARM2_BEDTIME_HOUR = "clockAlarm#clockAlarm2BedtimeHour";
public static final String CHANNEL_MODULE_CLOCK_ALARM2_BEDTIME_MINUTE = "clockAlarm#clockAlarm2BedtimeMinute";
public static final String CHANNEL_CLOCK_ALARM1_TYPE = "clockAlarm1Type";
public static final String CHANNEL_CLOCK_ALARM1_ENABLED = "clockAlarm1Enabled";
public static final String CHANNEL_CLOCK_ALARM1_WAKEUP_HOUR = "clockAlarm1WakeupHour";
public static final String CHANNEL_CLOCK_ALARM1_WAKEUP_MINUTE = "clockAlarm1WakeupMinute";
public static final String CHANNEL_CLOCK_ALARM1_BEDTIME_HOUR = "clockAlarm1BedtimeHour";
public static final String CHANNEL_CLOCK_ALARM1_BEDTIME_MINUTE = "clockAlarm1BedtimeMinute";
public static final String CHANNEL_CLOCK_ALARM2_TYPE = "clockAlarm2Type";
public static final String CHANNEL_CLOCK_ALARM2_ENABLED = "clockAlarm2Enabled";
public static final String CHANNEL_CLOCK_ALARM2_WAKEUP_HOUR = "clockAlarm2WakeupHour";
public static final String CHANNEL_CLOCK_ALARM2_WAKEUP_MINUTE = "clockAlarm2WakeupMinute";
public static final String CHANNEL_CLOCK_ALARM2_BEDTIME_HOUR = "clockAlarm2BedtimeHour";
public static final String CHANNEL_CLOCK_ALARM2_BEDTIME_MINUTE = "clockAlarm2BedtimeMinute";

public static final String CHANNEL_THERMOSTAT_CURRENT_TEMPERATURE = "currentTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_HEATING_COMFORT = "heatingModeComfortTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_HEATING_DAY = "heatingModeDayTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_HEATING_NIGHT = "heatingModeNightTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_HEATING_ANTI_FROST = "heatingModeAntiFrostTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_COOLING_COMFORT = "coolingModeComfortTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_COOLING_DAY = "coolingModeDayTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_COOLING_NIGHT = "coolingModeNightTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_COOLING_SAFE = "coolingModeSafeTemperatureSetpoint";
public static final String CHANNEL_THERMOSTAT_OPERATING_MODE = "operatingMode";
public static final String CHANNEL_THERMOSTAT_MODE = "mode";
public static final String CHANNEL_THERMOSTAT_HEATER = "heater";
public static final String CHANNEL_THERMOSTAT_BOOST = "boost";
public static final String CHANNEL_THERMOSTAT_PUMP = "pump";
public static final String CHANNEL_THERMOSTAT_COOLER = "cooler";
public static final String CHANNEL_THERMOSTAT_ALARM1 = "alarm1";
public static final String CHANNEL_THERMOSTAT_ALARM2 = "alarm2";
public static final String CHANNEL_THERMOSTAT_ALARM3 = "alarm3";
public static final String CHANNEL_THERMOSTAT_ALARM4 = "alarm4";

public static final String CHANNEL_OUTPUT = "output";

// Delay
public static final Integer DELAY_SEND_CLOCK_ALARM_UPDATE = 10000;
Expand Down
Loading
Loading