Rework xScanner to improve user experience

OnlineDynamic · Sep 27, 2021 · d9706a3 · d9706a3
1 parent 2d75cfa
commit d9706a3
Show file tree

Hide file tree

Showing 18 changed files with 11,974 additions and 3,677 deletions.
diff --git a/bin/xScheduleWeb/index.html b/bin/xScheduleWeb/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>xScheduler</title>
+    <title>xSchedule</title>
     <link rel="apple-touch-icon" sizes="57x57" href="img/favcon/apple-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="img/favcon/apple-icon-60x60.png">
     <link rel="apple-touch-icon" sizes="72x72" href="img/favcon/apple-icon-72x72.png">

diff --git a/bin/xScheduleWeb/login.html b/bin/xScheduleWeb/login.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>xLights Scheduler | Login</title>
+    <title>xSchedule | Login</title>
     <!-- Bootstrap core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
@@ -38,7 +38,7 @@ <h1 class="text-center">xLights Scheduler</h1>
     </section>
 
     <footer id="footer">
-      <p>xScheduler</p>
+      <p>xSchedule</p>
     </footer>
 
     <!-- Bootstrap core JavaScript

diff --git a/xScanner/MAC.cpp b/xScanner/MAC.cpp
@@ -8,7 +8,10 @@
 #define MACLOOKUP "MacLookup.txt"
 #endif
 
+#include <mutex>
+
 static std::map<std::string, std::string> macLookup;
+static std::mutex _macMutex;
 
 void ProcessMACLine(const std::string& line)
 {
@@ -45,6 +48,8 @@ void LoadMacLookup()
 
 std::string LookupMacAddress(const std::string mac)
 {
+	std::unique_lock<std::mutex> lock(_macMutex);
+
 	if (macLookup.size() == 0) {
 		LoadMacLookup();
 	}

diff --git a/xScanner/MAC.h b/xScanner/MAC.h
@@ -2,4 +2,8 @@
 
 #include <string>
 
+// MAC Lookup comes from here
+// https://standards.ieee.org/products-services/regauth/index.html
+// http://standards-oui.ieee.org/oui36/oui36.csv
+
 std::string LookupMacAddress(const std::string mac);