From 7e278269441ad6f80eccfb3e109d30a2377c5f2f Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Mon, 25 Jan 2021 13:16:42 -0600
Subject: [PATCH] Change device name to friendly name

---
 Lumix.cpp | 22 ++++++++++++++++++++--
 Lumix.h   |  6 +++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Lumix.cpp b/Lumix.cpp
index 10c1a6d..36ef343 100644
--- a/Lumix.cpp
+++ b/Lumix.cpp
@@ -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(){
diff --git a/Lumix.h b/Lumix.h
index 8415a5c..a791182 100644
--- a/Lumix.h
+++ b/Lumix.h
@@ -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();