Add new-line character to username/password in EvilPortal

esp32_marauder/Display.cpp

@@ -37,7 +37,7 @@ void Display::RunSetup()
   #ifdef HAS_ILI9341
 
     #ifdef TFT_SHIELD
-      uint16_t calData[5] = { 350, 3465, 188, 3431, 2 }; // tft.setRotation(0); // Portrait with TFT Shield
+      uint16_t calData[5] = { 481, 3053, 433, 3296, 3 }; // tft.setRotation(0); // Portrait with TFT Shield
       //Serial.println(F("Using TFT Shield"));
     #else if defined(TFT_DIY)
       uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT

esp32_marauder/EvilPortal.cpp

@@ -299,7 +299,7 @@ void EvilPortal::main(uint8_t scan_mode) {
       String logValue1 =
           "u: " + this->user_name;
       String logValue2 = "p: " + this->password;
-      String full_string = logValue1 + " " + logValue2 + "\n";
+      String full_string = logValue1 + "\n" + logValue2 + "\n";
       Serial.print(full_string);
       buffer_obj.append(full_string);
       #ifdef HAS_SCREEN

esp32_marauder/MenuFunctions.cpp

@@ -1301,7 +1301,7 @@ void MenuFunctions::orientDisplay()
 
   #ifdef HAS_ILI9341
     #ifdef TFT_SHIELD
-      uint16_t calData[5] = { 350, 3465, 188, 3431, 2 }; // tft.setRotation(0); // Portrait with TFT Shield
+      uint16_t calData[5] = { 481, 3053, 433, 3296, 3 }; // tft.setRotation(0); // Portrait with TFT Shield
     #else if defined(TFT_DIY)
       uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
     #endif
@@ -1588,6 +1588,7 @@ void MenuFunctions::RunSetup()
     });
   #endif
 
+
   // Build Wardriving menu
   wardrivingMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
   this->addNodes(&wardrivingMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {

esp32_marauder/WiFiScan.cpp

@@ -1581,7 +1581,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
     display_obj.tft.setRotation(1);
 
     #ifdef TFT_SHIELD
-      uint16_t calData[5] = { 188, 3408, 286, 3498, 1 }; // Landscape TFT Shield
+      uint16_t calData[5] = { 410, 3305, 499, 3045, 0 }; // Landscape TFT Shield
       Serial.println("Using TFT Shield");
     #else if defined(TFT_DIY)
       uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
@@ -1977,7 +1977,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
 
     #ifdef HAS_SCREEN
       #ifdef TFT_SHIELD
-        uint16_t calData[5] = { 188, 3408, 286, 3498, 1 }; // Landscape TFT Shield
+        uint16_t calData[5] = { 410, 3305, 499, 3045, 0 }; // Landscape TFT Shield
         Serial.println("Using TFT Shield");
       #else if defined(TFT_DIY)
         uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
@@ -2061,7 +2061,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
 
     #ifdef HAS_SCREEN
       #ifdef TFT_SHIELD
-        uint16_t calData[5] = { 188, 3408, 286, 3498, 1 }; // Landscape TFT Shield
+        uint16_t calData[5] = { 410, 3305, 499, 3045, 0 }; // Landscape TFT Shield
         //Serial.println("Using TFT Shield");
       #else if defined(TFT_DIY)
         uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY

libraries/NimBLE-Arduino/CHANGELOG.md

@@ -2,71 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.4.1] - 2022-10-23
-
-### Fixed
- - Compile warning removed for esp32c3
- - NimBLEDevice::getPower incorrect value when power level is -3db.
- - Failed pairing when already in progress.
-
-### Changed
- - Revert previous change that forced writing with response when subscribing in favor of allowing the application to decide.
-
-### Added
- - Added NimBLEHIDDevice::batteryLevel.
- - Added NimBLEDevice::setDeviceName allowing for changing the device name while the BLE stack is active.
- - CI build tests.
- - Missing items in CHANGELOG that were not recorded correctly
-
-## [1.4.0] - 2022-07-10
-
-### Fixed
-- Fixed missing data from long notification values.
-- Fixed NimbleCharacteristicCallbacks::onRead not being called when a non-long read command is received.
-
-### Changed
-- Updated NimBLE core to use the v1.4.0 branch of esp-nimble.
-- AD flags are no longer set in the advertisements of non-connectable beacons, freeing up 3 bytes of advertisement room.
-- Config option CONFIG_BT_NIMBLE_DEBUG replaced with CONFIG_BT_NIMBLE_LOG_LEVEL (see src/nimconfig.h for usage)
-- Config option CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT renamed to CONFIG_NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT
-- Config option CONFIG_BT_NIMBLE_TASK_STACK_SIZE renamed to CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
-
-### Added
-- Preliminary support for non-esp devices, NRF51 and NRF52 devices supported with [n-able arduino core](https://github.com/h2zero/n-able-Arduino)
-- Alias added for  `NimBLEServerCallbacks::onMTUChange` to `onMtuChanged` in order to support porting code from original library.
-- `NimBLEAttValue` Class added to reduce and control RAM footprint of characteristic/descriptor values and support conversions from Arduino Strings and many other data types.
-- Bluetooth 5 extended advertising support for capable devices. CODED Phy, 2M Phy, extended advertising data, and multi-advertising are supported, periodic advertising will be implemented in the future.
-
-## [1.3.8] - 2022-04-27
-
-### Fixed
-- Fix compile error with ESP32S3.
-- Prevent a potential crash when retrieving characteristics from a service if the result was successful but no characteristics found.
-
-### Changed
-- Save resources when retrieving descriptors if the characteristic handle is the same as the end handle (no descriptors).
-- Subscribing to characteristic notifications/indications will now always use write with response, as per BLE specifications.
-- `NimBLEClient::discoverAttributes` now returns a bool value to indicate success/failure
-
-## [1.3.7] - 2022-02-15
-
-### Fixed
-
-- Crash when retrieving an attribute that does not exist on the peer.
-- Memory leak when deleting client instances.
-- Compilation errors for esp32s3
-
-## [1.3.6] - 2022-01-18
-
-### Changed
-- When retrieving attributes from a server fails with a 128bit UUID containing the ble base UUID another attempt will be made with the 16bit version of the UUID.
-
-### Fixed
-- Memory leak when services are changed on server devices.
-- Rare crashing that occurs when BLE commands are sent from ISR context using IPC.
-- Crashing caused by uninitialized disconnect timer in client.
-- Potential crash due to uninitialized advertising callback pointer.
-
 ## [1.3.5] - 2022-01-14
 
 ### Added
@@ -102,7 +37,7 @@ All notable changes to this project will be documented in this file.
 ## [1.3.0] - 2021-08-02
 
 ### Added
-- `NimBLECharacteristic::removeDescriptor`: Dynamically remove a descriptor from a characteristic. Takes effect after all connections are closed and sends a service changed indication.
+- `NimBLECharacteristic::removeDescriptor`: Dynamically remove a descriptor from a characterisic. Takes effect after all connections are closed and sends a service changed indication.
 - `NimBLEService::removeCharacteristic`: Dynamically remove a characteristic from a service. Takes effect after all connections are closed and sends a service changed indication
 - `NimBLEServerCallbacks::onMTUChange`: This is callback is called when the MTU is updated after connection with a client.
 - ESP32C3 support
@@ -133,12 +68,12 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - `NimBLECharacteristicCallbacks::onSubscribe` Is now called after the connection is added to the vector.
 - Corrected bonding failure when reinitializing the BLE stack.
-- Writing to a characteristic with a std::string value now correctly writes values with null characters.
-- Retrieving remote descriptors now uses the characteristic end handle correctly.
+- Writing to a characterisic with a std::string value now correctly writes values with null characters.
+- Retrieving remote descriptors now uses the characterisic end handle correctly.
 - Missing data in long writes to remote descriptors.
 - Hanging on task notification when sending an indication from the characteristic callback.
 - BLE controller memory could be released when using Arduino as a component.
-- Compile errors with NimBLE release 1.3.0.
+- Complile errors with NimBLE release 1.3.0.
 
 ## [1.2.0] - 2021-02-08
 
@@ -151,7 +86,7 @@ All notable changes to this project will be documented in this file.
 
 - `NimBLEService::getCharacteristicByHandle`: Get a pointer to the characteristic object with the specified handle.
 
-- `NimBLEService::getCharacteristics`: Get the vector containing pointers to each characteristic associated with this service.
+- `NimBLEService::getCharacteristics`: Get the vector containing pointers to each characteristic associated with this service.  
 Overloads to get a vector containing pointers to all the characteristics in a service with the UUID. (supports multiple same UUID's in a service)
   - `NimBLEService::getCharacteristics(const char *uuid)`
   - `NimBLEService::getCharacteristics(const NimBLEUUID &uuid)`
@@ -193,12 +128,12 @@ Overloads to get a vector containing pointers to all the characteristics in a se
 
 - `NimBLEAdvertising` Transmission power is no longer advertised by default and can be added to the advertisement by calling `NimBLEAdvertising::addTxPower`
 
-- `NimBLEAdvertising` Custom scan response data can now be used without custom advertisement.
+- `NimBLEAdvertising` Custom scan response data can now be used without custom advertisment.
 
-- `NimBLEScan` Now uses the controller duplicate filter.
+- `NimBLEScan` Now uses the controller duplicate filter.  
 
-- `NimBLEAdvertisedDevice` Has been refactored to store the complete advertisement payload and no longer parses the data from each advertisement.
-Instead the data will be parsed on-demand when the user application asks for specific data.
+- `NimBLEAdvertisedDevice` Has been refactored to store the complete advertisement payload and no longer parses the data from each advertisement.  
+Instead the data will be parsed on-demand when the user application asks for specific data.  
 
 ### Fixed
 - `NimBLEHIDDevice` Characteristics now use encryption, this resolves an issue with communicating with devices requiring encryption for HID devices.
@@ -207,84 +142,84 @@ Instead the data will be parsed on-demand when the user application asks for spe
 ## [1.1.0] - 2021-01-20
 
 ### Added
-- `NimBLEDevice::setOwnAddrType` added to enable the use of random and random-resolvable addresses, by asukiaaa
+- `NimBLEDevice::setOwnAddrType` added to enable the use of random and random-resolvable addresses, by asukiaaa  
 
-- New examples for securing and authenticating client/server connections, by mblasee.
+- New examples for securing and authenticating client/server connections, by mblasee.  
 
-- `NimBLEAdvertising::SetMinPreferred` and `NimBLEAdvertising::SetMinPreferred` re-added.
+- `NimBLEAdvertising::SetMinPreferred` and `NimBLEAdvertising::SetMinPreferred` re-added.  
 
-- Conditional checks added for command line config options in `nimconfig.h` to support custom configuration in platformio.
+- Conditional checks added for command line config options in `nimconfig.h` to support custom configuration in platformio.  
 
-- `NimBLEClient::setValue` Now takes an extra bool parameter `response` to enable the use of write with response (default = false).
+- `NimBLEClient::setValue` Now takes an extra bool parameter `response` to enable the use of write with response (default = false).  
 
-- `NimBLEClient::getCharacteristic(uint16_t handle)` Enabling the use of the characteristic handle to be used to find
-the NimBLERemoteCharacteristic object.
+- `NimBLEClient::getCharacteristic(uint16_t handle)` Enabling the use of the characteristic handle to be used to find 
+the NimBLERemoteCharacteristic object.  
 
-- `NimBLEHIDDevice` class added by wakwak-koba.
+- `NimBLEHIDDevice` class added by wakwak-koba.  
 
-- `NimBLEServerCallbacks::onDisconnect` overloaded callback added to provide a ble_gap_conn_desc parameter for the application
-to obtain information about the disconnected client.
+- `NimBLEServerCallbacks::onDisconnect` overloaded callback added to provide a ble_gap_conn_desc parameter for the application  
+to obtain information about the disconnected client.  
 
-- Conditional checks in `nimconfig.h` for command line defined macros to support platformio config settings.
+- Conditional checks in `nimconfig.h` for command line defined macros to support platformio config settings.  
 
 ### Changed
-- `NimBLEAdvertising::start` now returns a bool value to indicate success/failure.
+- `NimBLEAdvertising::start` now returns a bool value to indicate success/failure.  
 
-- Some asserts were removed in `NimBLEAdvertising::start` and replaced with better return code handling and logging.
+- Some asserts were removed in `NimBLEAdvertising::start` and replaced with better return code handling and logging.    
 
-- If a host reset event occurs, scanning and advertising will now only be restarted if their previous duration was indefinite.
+- If a host reset event occurs, scanning and advertising will now only be restarted if their previous duration was indefinite.  
 
 - `NimBLERemoteCharacteristic::subscribe` and `NimBLERemoteCharacteristic::registerForNotify` will now set the callback
-regardless of the existence of the CCCD and return true unless the descriptor write operation failed.
+regardless of the existance of the CCCD and return true unless the descriptor write operation failed.  
 
-- Advertising tx power level is now sent in the advertisement packet instead of scan response.
+- Advertising tx power level is now sent in the advertisement packet instead of scan response.  
 
-- `NimBLEScan` When the scan ends the scan stopped flag is now set before calling the scan complete callback (if used)
-this allows the starting of a new scan from the callback function.
+- `NimBLEScan` When the scan ends the scan stopped flag is now set before calling the scan complete callback (if used)  
+this allows the starting of a new scan from the callback function.  
 
 ### Fixed
-- Sometimes `NimBLEClient::connect` would hang on the task block if no event arrived to unblock.
-A time limit has been added to timeout appropriately.
-
-- When getting descriptors for a characteristic the end handle of the service was used as a proxy for the characteristic end
-handle. This would be rejected by some devices and has been changed to use the next characteristic handle as the end when possible.
-
-- An exception could occur when deleting a client instance if a notification arrived while the attribute vectors were being
-deleted. A flag has been added to prevent this.
-
-- An exception could occur after a host reset event when the host re-synced if the tasks that were stopped during the event did
-not finish processing. A yield has been added after re-syncing to allow tasks to finish before proceeding.
-
-- Occasionally the controller would fail to send a disconnected event causing the client to indicate it is connected
-and would be unable to reconnect. A timer has been added to reset the host/controller if it expires.
+- Sometimes `NimBLEClient::connect` would hang on the task block if no event arrived to unblock.  
+A time limit has been added to timeout appropriately.  
 
-- Occasionally the call to start scanning would get stuck in a loop on BLE_HS_EBUSY, this loop has been removed.
+- When getting descriptors for a characterisic the end handle of the service was used as a proxy for the characteristic end  
+handle. This would be rejected by some devices and has been changed to use the next characteristic handle as the end when possible.  
 
-- 16bit and 32bit UUID's in some cases were not discovered or compared correctly if the device
-advertised them as 16/32bit but resolved them to 128bits. Both are now checked.
+- An exception could occur when deleting a client instance if a notification arrived while the attribute vectors were being  
+deleted. A flag has been added to prevent this.  
+
+- An exception could occur after a host reset event when the host re-synced if the tasks that were stopped during the event did  
+not finish processing. A yield has been added after re-syncing to allow tasks to finish before proceeding.  
+
+- Occasionally the controller would fail to send a disconnected event causing the client to indicate it is connected  
+and would be unable to reconnect. A timer has been added to reset the host/controller if it expires.  
+
+- Occasionally the call to start scanning would get stuck in a loop on BLE_HS_EBUSY, this loop has been removed.  
 
-- `FreeRTOS` compile errors resolved in latest Arduino core and IDF v3.3.
+- 16bit and 32bit UUID's in some cases were not discovered or compared correctly if the device  
+advertised them as 16/32bit but resolved them to 128bits. Both are now checked.  
+
+- `FreeRTOS` compile errors resolved in latest Ardruino core and IDF v3.3.  
 
-- Multiple instances of `time()` called inside critical sections caused sporadic crashes, these have been moved out of critical regions.
+- Multiple instances of `time()` called inside critical sections caused sporadic crashes, these have been moved out of critical regions.  
 
-- Advertisement type now correctly set when using non-connectable (advertiser only) mode.
+- Advertisement type now correctly set when using non-connectable (advertiser only) mode.  
 
-- Advertising payload length correction, now accounts for appearance.
+- Advertising payload length correction, now accounts for appearance.  
 
-- (Arduino) Ensure controller mode is set to BLE Only.
+- (Arduino) Ensure controller mode is set to BLE Only.  
 
 
 ## [1.0.2] - 2020-09-13
 
 ### Changed
 
-- `NimBLEAdvertising::start` Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a
-callback that is invoked when advertising ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
+- `NimBLEAdvertising::start` Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a  
+callback that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
 
 - (Arduino) Maximum BLE connections can now be altered by only changing the value of `CONFIG_BT_NIMBLE_MAX_CONNECTIONS` in `nimconfig.h`.
 Any changes to the controller max connection settings in `sdkconfig.h` will now have no effect when using this library.
 
-- (Arduino) Revert the previous change to fix the advertising start delay. Instead a replacement fix that routes all BLE controller commands from
+- (Arduino) Revert the previous change to fix the advertising start delay. Instead a replacement fix that routes all BLE controller commands from  
 a task running on core 0 (same as the controller) has been implemented. This improves response times and reliability for all BLE functions.