Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cheap yellow display compatibility #496

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Cheap yellow display compatibility #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
458254b
Add files via upload
zRCrackiiN Feb 24, 2024
7305947
Merge pull request #1 from zRCrackiiN/development
zRCrackiiN Feb 24, 2024
860d141
Update esp32_marauder.ino
zRCrackiiN Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions esp32_marauder/Display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ void Display::RunSetup()
#ifdef TFT_SHIELD
uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
//Serial.println(F("Using TFT Shield"));
#elif defined(TFT_SHIELD_CYD)
uint16_t calData[5] = { 350, 3465, 188, 3431, 2 }; // 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
//Serial.println(F("Using TFT DIY"));
Expand Down
3 changes: 3 additions & 0 deletions esp32_marauder/MenuFunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,9 @@ void MenuFunctions::orientDisplay()
#ifdef HAS_ILI9341
#ifdef TFT_SHIELD
uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
#elif defined(TFT_SHIELD_CYD)
uint16_t calData[5] = { 350, 3465, 188, 3431, 2 }; // 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
#endif
Expand Down
39 changes: 35 additions & 4 deletions esp32_marauder/WiFiScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,8 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_
this->wifi_initialized = true;
#ifdef MARAUDER_FLIPPER
flipper_led.attackLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.attackLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.attackLED();
#elif defined(MARAUDER_M5STICKC)
Expand All @@ -670,6 +672,8 @@ bool WiFiScan::shutdownWiFi() {

#ifdef MARAUDER_FLIPPER
flipper_led.offLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.offLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.offLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -697,6 +701,8 @@ bool WiFiScan::shutdownBLE() {

#ifdef MARAUDER_FLIPPER
flipper_led.offLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.offLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.offLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -958,6 +964,8 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1001,6 +1009,8 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1360,6 +1370,11 @@ void WiFiScan::RunInfo()
display_obj.tft.setFreeFont(NULL);
display_obj.tft.setCursor(0, SCREEN_HEIGHT / 3);
display_obj.tft.setTextSize(1);
//
//
//
//
//
display_obj.tft.setTextColor(TFT_CYAN);
display_obj.tft.println(text_table4[20]);
display_obj.tft.println(text_table4[21] + display_obj.version_number);
Expand Down Expand Up @@ -1424,6 +1439,8 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
{
#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1503,6 +1520,8 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
{
#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1644,6 +1663,8 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1837,6 +1858,8 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1896,6 +1919,8 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1940,6 +1965,8 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -1986,6 +2013,8 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -2045,6 +2074,8 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)

#ifdef MARAUDER_FLIPPER
flipper_led.sniffLED();
#elif defined(CHEAP_YELLOW_DISPLAY)
cyd_LED.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -4072,7 +4103,7 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
// Channel - button pressed
if (b == 4) {
if (set_channel > 1) {
Serial.println("Shit channel down");
Serial.println("Shift channel down");
set_channel--;
delay(70);
display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK);
Expand All @@ -4086,7 +4117,7 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
// Channel + button pressed
else if (b == 5) {
if (set_channel < MAX_CHANNEL) {
Serial.println("Shit channel up");
Serial.println("Shift channel up");
set_channel++;
delay(70);
display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK);
Expand Down Expand Up @@ -4280,7 +4311,7 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
// Channel - button pressed
else if (b == 4) {
if (set_channel > 1) {
Serial.println("Shit channel down");
Serial.println("Shift channel down");
set_channel--;
delay(70);
display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK);
Expand All @@ -4296,7 +4327,7 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
// Channel + button pressed
else if (b == 5) {
if (set_channel < MAX_CHANNEL) {
Serial.println("Shit channel up");
Serial.println("Shift channel up");
set_channel++;
delay(70);
display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK);
Expand Down
4 changes: 4 additions & 0 deletions esp32_marauder/WiFiScan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include "Assets.h"
#ifdef MARAUDER_FLIPPER
#include "flipperLED.h"
#elif defined(CHEAP_YELLOW_DISPLAY)
#include "cydLED.h"
#elif defined(XIAO_ESP32_S3)
#include "xiaoLED.h"
#elif defined(MARAUDER_M5STICKC)
Expand Down Expand Up @@ -115,6 +117,8 @@ extern Buffer buffer_obj;
extern Settings settings_obj;
#ifdef MARAUDER_FLIPPER
extern flipperLED flipper_led;
#elif defined(CHEAP_YELLOW_DISPLAY)
extern cydLED cyd_LED;
#elif defined(XIAO_ESP32_S3)
extern xiaoLED xiao_led;
#elif defined(MARAUDER_M5STICKC)
Expand Down
Loading
Loading