Updated Reolink to v3, set CHANNEL_REBOOT to off after turned on,

and ran i18n plugin to generate new ipcamera.properties.

Signed-off-by: Simmon Yau <[email protected]>

bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java

@@ -323,6 +323,7 @@ public void channelRead(@Nullable ChannelHandlerContext ctx, @Nullable Object ms
                     }
                     break;
                 case "/api.cgi?cmd=Reboot":
+                    ipCameraHandler.setChannelState(CHANNEL_REBOOT, OnOffType.OFF);
                     if (!content.contains("\"rspCode\" : 200")) {
                         ipCameraHandler.logger.warn("Reboot failed:\n{}", content);
                     }

bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/i18n/ipcamera.properties

@@ -522,16 +522,16 @@ thing-type.config.ipcamera.onvif.motionOptions.label = Motion Options
 thing-type.config.ipcamera.onvif.motionOptions.description = This gives you direct access to specify your own FFmpeg options to be used for detecting motion.
 thing-type.config.ipcamera.onvif.mp4OutOptions.label = MP4 Out Options
 thing-type.config.ipcamera.onvif.mp4OutOptions.description = This gives you direct access to specify your own FFmpeg options to be used for recording MP4 files.
-thing-type.config.ipcamera.onvif.onvifMediaProfile.label = ONVIF Media Profile
-thing-type.config.ipcamera.onvif.onvifMediaProfile.description = Cameras can supply more than one stream at different resolutions and formats. 0 selects the main-stream and 1 or above are the sub-streams. Sometimes you need to turn on sub-streams in the cameras setup before they can be used.
-thing-type.config.ipcamera.onvif.onvifPort.label = ONVIF Port
-thing-type.config.ipcamera.onvif.onvifPort.description = The port your camera uses for ONVIF connections. This is needed for PTZ movement, alarm events and auto discovery of RTSP and snapshot URLs.
-thing-type.config.ipcamera.onvif.onvifEventServiceType.label = ONVIF event method
+thing-type.config.ipcamera.onvif.onvifEventServiceType.label = ONVIF event method:
 thing-type.config.ipcamera.onvif.onvifEventServiceType.description = ONVIF event method to use. If camera does not report event capabilities, the event method can be forced here.
 thing-type.config.ipcamera.onvif.onvifEventServiceType.option.0 = Auto detect (0)
 thing-type.config.ipcamera.onvif.onvifEventServiceType.option.1 = Disabled (1)
 thing-type.config.ipcamera.onvif.onvifEventServiceType.option.2 = Force PullMessages (2)
 thing-type.config.ipcamera.onvif.onvifEventServiceType.option.3 = Force WSBaseSubscription (3)
+thing-type.config.ipcamera.onvif.onvifMediaProfile.label = ONVIF Media Profile
+thing-type.config.ipcamera.onvif.onvifMediaProfile.description = Cameras can supply more than one stream at different resolutions and formats. 0 selects the main-stream and 1 or above are the sub-streams. Sometimes you need to turn on sub-streams in the cameras setup before they can be used.
+thing-type.config.ipcamera.onvif.onvifPort.label = ONVIF Port
+thing-type.config.ipcamera.onvif.onvifPort.description = The port your camera uses for ONVIF connections. This is needed for PTZ movement, alarm events and auto discovery of RTSP and snapshot URLs.
 thing-type.config.ipcamera.onvif.password.label = Password
 thing-type.config.ipcamera.onvif.password.description = Enter the password for your camera. Leave blank if your camera does not use one.
 thing-type.config.ipcamera.onvif.pollTime.label = Poll Time
@@ -592,16 +592,16 @@ thing-type.config.ipcamera.reolink.mp4OutOptions.label = MP4 Out Options
 thing-type.config.ipcamera.reolink.mp4OutOptions.description = This gives you direct access to specify your own FFmpeg options to be used for recording MP4 files.
 thing-type.config.ipcamera.reolink.nvrChannel.label = NVR Input Channel
 thing-type.config.ipcamera.reolink.nvrChannel.description = Set this to 0 if it is a stand alone camera, or to the input channel number of your NVR that the camera is connected to.
-thing-type.config.ipcamera.reolink.onvifMediaProfile.label = ONVIF Media Profile
-thing-type.config.ipcamera.reolink.onvifMediaProfile.description = Cameras can supply more than one stream at different resolutions and formats. 0 selects the main-stream and 1 or above are the sub-streams. Sometimes you need to turn on sub-streams in the cameras setup before they can be used.
-thing-type.config.ipcamera.reolink.onvifPort.label = ONVIF Port
-thing-type.config.ipcamera.reolink.onvifPort.description = The port your camera uses for ONVIF connections. This is needed for PTZ movement, alarm events and auto discovery of RTSP and snapshot URLs.
-thing-type.config.ipcamera.reolink.onvifEventServiceType.label = ONVIF event method
+thing-type.config.ipcamera.reolink.onvifEventServiceType.label = ONVIF event method:
 thing-type.config.ipcamera.reolink.onvifEventServiceType.description = ONVIF event method to use. If camera does not report event capabilities, the event method can be forced here.
 thing-type.config.ipcamera.reolink.onvifEventServiceType.option.0 = Auto detect (0)
 thing-type.config.ipcamera.reolink.onvifEventServiceType.option.1 = Disabled (1)
 thing-type.config.ipcamera.reolink.onvifEventServiceType.option.2 = Force PullMessages (2)
 thing-type.config.ipcamera.reolink.onvifEventServiceType.option.3 = Force WSBaseSubscription (3)
+thing-type.config.ipcamera.reolink.onvifMediaProfile.label = ONVIF Media Profile
+thing-type.config.ipcamera.reolink.onvifMediaProfile.description = Cameras can supply more than one stream at different resolutions and formats. 0 selects the main-stream and 1 or above are the sub-streams. Sometimes you need to turn on sub-streams in the cameras setup before they can be used.
+thing-type.config.ipcamera.reolink.onvifPort.label = ONVIF Port
+thing-type.config.ipcamera.reolink.onvifPort.description = The port your camera uses for ONVIF connections. This is needed for PTZ movement, alarm events and auto discovery of RTSP and snapshot URLs.
 thing-type.config.ipcamera.reolink.password.label = Password
 thing-type.config.ipcamera.reolink.password.description = Enter the password for your camera. Leave blank if your camera does not use one.
 thing-type.config.ipcamera.reolink.pollTime.label = Poll Time
@@ -778,7 +778,7 @@ channel-type.ipcamera.pirAlarm.description = PIR motion has been detected.
 channel-type.ipcamera.pollImage.label = Poll Image
 channel-type.ipcamera.pollImage.description = This can be used to trigger snapshot updates when an external PIR, button or other form of sensor turns this channel ON.
 channel-type.ipcamera.reboot.label = Reboot
-channel-type.ipcamera.reboot.description = Reboot device.
+channel-type.ipcamera.reboot.description = The camera is rebooted when switched ON
 channel-type.ipcamera.recordingGif.label = GIF Recording
 channel-type.ipcamera.recordingGif.description = Indicates how long the recording will occur for and when the file is created, the channel will change to 0 by itself.
 channel-type.ipcamera.recordingMp4.label = MP4 Recording

bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/thing/thing-types.xml

@@ -2349,7 +2349,7 @@
 		</channels>
 
 		<properties>
-			<property name="thingTypeVersion">2</property>
+			<property name="thingTypeVersion">3</property>
 		</properties>
 
 		<config-description>

bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/update/instructions.xml

@@ -17,15 +17,17 @@
 			<add-channel id="enablePush">
 				<type>ipcamera:enablePush</type>
 			</add-channel>
-			<add-channel id="reboot">
-				<type>ipcamera:reboot</type>
-			</add-channel>
 		</instruction-set>
 		<instruction-set targetVersion="2">
 			<add-channel id="autoTracking">
 				<type>ipcamera:autoTracking</type>
 			</add-channel>
 		</instruction-set>
+		<instruction-set targetVersion="3">
+			<add-channel id="reboot">
+				<type>ipcamera:reboot</type>
+			</add-channel>
+		</instruction-set>
 	</thing-type>
 
 	<thing-type uid="ipcamera:dahua">