Merge branch 'master' of github.com:thirtythreeforty/neolink into protocol_updates
This commit is contained in:
21 files changed
+616
-402
No files matched your search
+1
-2
@@ -2,7 +2,6 @@ use lazy_static::lazy_static;
|
||||
use regex::Regex;
|
||||
use serde::Deserialize;
|
||||
use std::clone::Clone;
|
||||
use std::net::SocketAddr;
|
||||
use std::time::Duration;
|
||||
use validator::{Validate, ValidationError};
|
||||
use validator_derive::Validate;
|
||||
@@ -45,7 +44,7 @@ pub struct CameraConfig {
|
||||
pub name: String,
|
||||
|
||||
#[serde(rename = "address")]
|
||||
pub camera_addr: SocketAddr,
|
||||
pub camera_addr: String,
|
||||
|
||||
pub username: String,
|
||||
pub password: Option<String>,
|
||||
|
||||
Reference in new issue
Block a user