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