[ipcamera] Improve support for newer 2k+ Instar cameras (#13773)

* Fix never ending WARN when HIK camera does not support alarm inputs.
* Streamline code.
* Update Instar support for 2k+ Generation.
* Fix alarm codes.
* Add CHANNEL_LAST_EVENT_DATA

Signed-off-by: Matthew Skinner <matt@pcmus.com>
This commit is contained in:
Matthew Skinner
2022-11-26 18:15:29 +11:00
committed by GitHub
parent 698bee7c3e
commit ea134d8215
6 changed files with 67 additions and 17 deletions

View File

@@ -2002,6 +2002,10 @@
<channel id="lastMotionType" typeId="lastMotionType"/>
<channel id="ffmpegMotionControl" typeId="ffmpegMotionControl"/>
<channel id="ffmpegMotionAlarm" typeId="ffmpegMotionAlarm"/>
<channel id="carAlarm" typeId="carAlarm"/>
<channel id="humanAlarm" typeId="humanAlarm"/>
<channel id="animalAlarm" typeId="animalAlarm"/>
<channel id="lastEventData" typeId="lastEventData"/>
<channel id="enableMotionAlarm" typeId="enableMotionAlarm"/>
<channel id="motionAlarm" typeId="motionAlarm"/>
<channel id="externalMotion" typeId="externalMotion"/>
@@ -2520,6 +2524,14 @@
<state readOnly="true"/>
</channel-type>
<channel-type id="animalAlarm" advanced="true">
<item-type>Switch</item-type>
<label>Animal Alarm</label>
<description>An animal has triggered the object detection.</description>
<category>Alarm</category>
<state readOnly="true"/>
</channel-type>
<channel-type id="parkingAlarm" advanced="true">
<item-type>Switch</item-type>
<label>Parking Alarm</label>