mirror of
https://github.com/justcallmekoko/ESP32Marauder.git
synced 2026-07-28 14:47:16 -07:00
Fix v7 battery and wardriving
This commit is contained in:
@@ -5541,6 +5541,7 @@ void WiFiScan::executeWarDrive() {
|
||||
// Weighted US-focused wardriving channel schedule.
|
||||
// 2.4 GHz: 1, 6, 11 prioritized.
|
||||
// 5 GHz: common non-DFS lower/upper UNII channels prioritized.
|
||||
#ifdef HAS_DUAL_BAND
|
||||
static const uint8_t wardrive_channels[] = {
|
||||
161, 157, 153, 149,
|
||||
48, 44, 40, 36,
|
||||
@@ -5557,6 +5558,15 @@ void WiFiScan::executeWarDrive() {
|
||||
// Full 2.4 GHz pass (reversed)
|
||||
14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
|
||||
};
|
||||
#else
|
||||
static const uint8_t wardrive_channels[] = {
|
||||
11, 6, 1,
|
||||
11, 6, 1,
|
||||
|
||||
// Full 2.4 GHz pass (reversed)
|
||||
14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
|
||||
};
|
||||
#endif
|
||||
|
||||
//static uint8_t wardrive_channel_index = 0;
|
||||
|
||||
@@ -5690,7 +5700,11 @@ void WiFiScan::executeWarDrive() {
|
||||
uint8_t scan_channel = wardrive_channels[this->wardrive_channel_index];
|
||||
this->wardrive_channel_index++;
|
||||
|
||||
WiFi.scanNetworks(true, true, false, 80, scan_channel);
|
||||
#ifdef HAS_DUAL_BAND
|
||||
WiFi.scanNetworks(true, true, false, 80, scan_channel);
|
||||
#else
|
||||
WiFi.scanNetworks(true, true, false, 125, scan_channel);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -2823,7 +2823,9 @@
|
||||
#elif defined(MARAUDER_V4) || defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_KIT)
|
||||
#define I2C_SDA 33
|
||||
#define I2C_SCL 22
|
||||
#define HAS_IP5306
|
||||
#define HAS_MAX1704X
|
||||
#undef HAS_AXP2101
|
||||
#undef HAS_IP5306
|
||||
|
||||
#elif defined(MARAUDER_MINI)
|
||||
#define I2C_SDA 33
|
||||
@@ -2832,11 +2834,16 @@
|
||||
#elif defined(MARAUDER_V7)
|
||||
#define I2C_SDA 33
|
||||
#define I2C_SCL 16
|
||||
#define HAS_IP5306
|
||||
#define HAS_MAX1704X
|
||||
#undef HAS_AXP2101
|
||||
#undef HAS_IP5306
|
||||
|
||||
#elif defined(MARAUDER_V7_1)
|
||||
#define I2C_SDA 33
|
||||
#define I2C_SCL 27
|
||||
#define HAS_MAX1704X
|
||||
#undef HAS_AXP2101
|
||||
#undef HAS_IP5306
|
||||
|
||||
#elif defined(MARAUDER_CYD_MICRO)
|
||||
#define I2C_SDA 22
|
||||
|
||||
Reference in New Issue
Block a user