mirror of
https://github.com/jwetzell/LumixStick.git
synced 2026-09-04 13:29:43 +00:00
Change device name to friendly name
This commit is contained in:
@@ -5,18 +5,32 @@ Lumix::Lumix(String ip){
|
|||||||
connectionStatus = 0;
|
connectionStatus = 0;
|
||||||
deviceName = "";
|
deviceName = "";
|
||||||
lastKeepAlive = 0;
|
lastKeepAlive = 0;
|
||||||
|
infoUpdatedFlag = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Lumix::infoUpdated(){
|
||||||
|
if(infoUpdatedFlag){
|
||||||
|
infoUpdatedFlag = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Lumix::updateDeviceName(String deviceName){
|
void Lumix::updateDeviceName(String deviceName){
|
||||||
this->deviceName = deviceName;
|
this->deviceName = deviceName;
|
||||||
|
infoUpdatedFlag = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Lumix::updateConnectionStatus(int connectionStatus){
|
void Lumix::updateConnectionStatus(int connectionStatus){
|
||||||
this->connectionStatus = connectionStatus;
|
this->connectionStatus = connectionStatus;
|
||||||
|
infoUpdatedFlag = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Lumix::updateIp(String ip){
|
void Lumix::updateIp(String ip){
|
||||||
this->ip = ip;
|
this->ip = ip;
|
||||||
|
connectionStatus = CAMERA_CONNECTING;
|
||||||
|
deviceName = "";
|
||||||
|
infoUpdatedFlag = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Lumix::isConnected(){
|
bool Lumix::isConnected(){
|
||||||
@@ -48,8 +62,12 @@ int Lumix::getConnectionStatus(){
|
|||||||
return connectionStatus;
|
return connectionStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
String Lumix::getDeviceName(){
|
String Lumix::getFriendlyName(){
|
||||||
return deviceName;
|
if(isConnected()){
|
||||||
|
return deviceName;
|
||||||
|
}else{
|
||||||
|
return ip;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String Lumix::getBaseUrl(){
|
String Lumix::getBaseUrl(){
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ class Lumix {
|
|||||||
String deviceName;
|
String deviceName;
|
||||||
unsigned long lastKeepAlive;
|
unsigned long lastKeepAlive;
|
||||||
|
|
||||||
|
bool infoUpdatedFlag;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Lumix(String ip);
|
Lumix(String ip);
|
||||||
|
|
||||||
@@ -21,6 +23,8 @@ class Lumix {
|
|||||||
void updateConnectionStatus(int connectionStatus);
|
void updateConnectionStatus(int connectionStatus);
|
||||||
void updateIp(String ip);
|
void updateIp(String ip);
|
||||||
|
|
||||||
|
bool infoUpdated();
|
||||||
|
|
||||||
bool isConnected();
|
bool isConnected();
|
||||||
bool isConnecting();
|
bool isConnecting();
|
||||||
bool isDisabled();
|
bool isDisabled();
|
||||||
@@ -28,7 +32,7 @@ class Lumix {
|
|||||||
void update();
|
void update();
|
||||||
|
|
||||||
int getConnectionStatus();
|
int getConnectionStatus();
|
||||||
String getDeviceName();
|
String getFriendlyName();
|
||||||
|
|
||||||
String getBaseUrl();
|
String getBaseUrl();
|
||||||
String getCaptureUrl();
|
String getCaptureUrl();
|
||||||
|
|||||||
Reference in New Issue
Block a user