Updated Serial to print as table

samdenty · Aug 1, 2017 · bbf5a78 · bbf5a78
1 parent f45dbb7
commit bbf5a78
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 34 deletions.
diff --git a/arduino/Wi-PWN/Settings.cpp b/arduino/Wi-PWN/Settings.cpp
@@ -190,7 +190,6 @@ void Settings::save() {
   for (int i = 0; i < pinNamesLen; i++) EEPROM.write(pinNamesAdr + i, pinNames[i]);
   EEPROM.commit();
 
-  Serial.println("Running!!!!!!!!");
   int i=0;
   while (i < 6)
   {  
@@ -205,35 +204,20 @@ void Settings::save() {
 }
 
 void Settings::info() {
+  Serial.println("");
   Serial.println("Settings:");
-  Serial.println("SSID: '" + ssid + "' (characters=" + (String)ssidLen + ") (hidden="+(String)ssidHidden+") (channel="+(String)apChannel+")");
-  Serial.println("Password: '" + password + "' (" + (String)passwordLen + " characters)");
-  Serial.println("Default MAC AP: " + defaultMacAP.toString());
-  Serial.println("Saved MAC AP: " + macAP.toString());
-  Serial.println("MAC AP random: " + (String)isMacAPRand);
-  Serial.println("Scan hidden APs: " + (String)apScanHidden);
-  Serial.println("Deauth reason: " + (String)(int)deauthReason);
-  Serial.println("Attack timeout: " + (String)attackTimeout);
-  Serial.println("Attack packet rate: " + (String)attackPacketRate);
-  Serial.println("Client scan time: " + (String)clientScanTime);
-  Serial.println("Attack SSID encrypted: " + (String)attackEncrypted);
-  Serial.println("Use built-in LED: " + (String)useLed);
-  Serial.println("Channel hopping: " + (String)channelHop);
-  Serial.println("Multiple APs: " + (String)multiAPs);
-  Serial.println("Multiple Attacks: " + (String)multiAttacks);
-  Serial.println("Mac change interval: " + (String)macInterval);
-  Serial.println("1s beacon interval: " + (String)beaconInterval);
-  Serial.println("LED Pin: " + (String)ledPin);
-  Serial.println("Dark mode: " + (String)darkMode);
-  Serial.println("simplify: " + (String)simplify);
-  Serial.println("new user: " + (String)newUser);
-  Serial.println("Pin state: " + (String)pins);
-  Serial.println("Pin names: " + (String)pinNames);
-  Serial.println("Detector- channel: " + (String)detectorChannel);
-  Serial.println("Detector- all channels: " + (String)detectorAllChannels);
-  Serial.println("Detector- alert pin: " + (String)alertPin);
-  Serial.println("Detector- invert alert pin: " + (String)invertAlertPin);
-  Serial.println("Detector- scan time: " + (String)detectorScanTime);
+  Serial.println("  SSID            : '" + ssid + "'\t\t\t|  characters='" + (String)ssidLen + "'\t\t|  hidden='"+(String)ssidHidden+"'\t|  channel='"+(String)apChannel+"'\t|");
+  Serial.println("  Password        : '" + password + "'\t\t|  characters='" + (String)passwordLen + "'\t\t|");
+  Serial.println("  Scan            : hidden-networks='" + (String)apScanHidden + "'\t\t|  client-scan-time='" + (String)clientScanTime + "'\t|");
+  Serial.println("  Attack          : timeout='" + (String)attackTimeout + "'\t\t|  packet_rate='" + (String)attackPacketRate + "'\t\t|  deauth_reason='" + (String)(int)deauthReason + "'");
+  Serial.println("  Interface       : dark-mode='" + (String)darkMode + "'\t\t|  new-user='" + (String)newUser + "'\t\t|  simplify='" + (String)simplify + "'");
+  Serial.println("  LED Indicator   : enable='" + (String)useLed + "'\t\t\t|  pin='" + (String)ledPin + "'\t\t|");
+  Serial.println("  MAC AP          : default='" + defaultMacAP.toString()+"'\t|  saved='" + macAP.toString()+"'\t|  random='" + (String)isMacAPRand + "'");
+  Serial.println("  Beacons         : mac-change-interval='" + (String)multiAttacks + "'\t|  " + "WPA2='" + (String)attackEncrypted + "'\t\t|  1s-interval='" + (String)beaconInterval + "");
+  Serial.println("  Deauth Detector : all-channels='" + (String)detectorAllChannels + "'\t\t|  channel='" + (String)detectorChannel + "'\t\t|  alert-pin='" + (String)alertPin + "'\t|  invert-pin='" + (String)invertAlertPin + "'\t|  scan-time='" + (String)detectorScanTime + "'");
+  Serial.println("  Other           : channel-hopping='" + (String)channelHop + "'\t\t|  multiple-aps='" + (String)multiAPs + "'\t\t|  multiple-attacks='" + (String)multiAttacks + "'");
+  Serial.println("  PIN Control     : state='" + (String)pins + "'\t\t|  names='" + (String)pinNames + "'");
+  Serial.println("");
 }
 
 size_t Settings::getSize() {

diff --git a/web_server/html/setup.html b/web_server/html/setup.html
@@ -181,17 +181,14 @@
             padding-bottom: 15px;
             overflow-y: initial;
         }
-
         .main-wrap {
             overflow: initial;
             top: 0 !important;
         }
-
         footer,
         .reboot-container {
             display: none;
         }
-
         @media (min-width:850px) {
             .container {
                 position: fixed;
@@ -203,7 +200,6 @@
                 transform: -ms-translate(-50%, -50%)
             }
         }
-
         .success-svg {
             opacity: 1;
             height: 90px;
@@ -215,10 +211,20 @@
         #spinner-container .success-svg {
             display: none;
         }
-
         .container {
             min-height: initial;
         }
+        html {
+            overflow: scroll;
+            overflow-x: hidden;
+        }
+        ::-webkit-scrollbar {
+            width: 0px;
+            background: transparent;
+        }
+        ::-webkit-scrollbar-thumb {
+            background: #FF0000;
+        }
         </style>
     </div>
 </body>