diff --git a/cmvr-es/config/devices/camera/camera.pb.txt b/cmvr-es/config/devices/camera/camera.pb.txt index d44a4715..7aa3d520 100644 --- a/cmvr-es/config/devices/camera/camera.pb.txt +++ b/cmvr-es/config/devices/camera/camera.pb.txt @@ -85,7 +85,7 @@ camera { ip: "192.168.1.64" port: 8000 username: "admin" - password: "admin" + password: "okwy1688" channel: 1 stream_type: 0 link_mode: 0 @@ -98,4 +98,23 @@ camera { buffer_size: 30 } } + cameras { + id: "hikvision_thermal_cam" + hikvision { + ip: "192.168.1.65" + port: 8000 + username: "admin" + password: "okwy1688" + channel: 1 + stream_type: 0 + link_mode: 0 + width: 1920 + height: 1080 + fps: 25 + codec: "H264" + camera_mode: CAMERA_MODE_VIDEO + stream_mode: STREAM_MODE_RGB + buffer_size: 30 + } + } } diff --git a/cmvr-es/config/manager/device_manager.pb.txt b/cmvr-es/config/manager/device_manager.pb.txt index be89324d..be88eee5 100644 --- a/cmvr-es/config/manager/device_manager.pb.txt +++ b/cmvr-es/config/manager/device_manager.pb.txt @@ -72,5 +72,10 @@ device_manager { config_file: "devices/camera/camera.pb.txt" enable: true } - + devices { + id: "hikvision_thermal_cam" + type: DEVICE_TYPE_CAMERA + config_file: "devices/camera/camera.pb.txt" + enable: true + } }