From e33556fd7aa3f7179c856b24230e16c16b48e7b1 Mon Sep 17 00:00:00 2001 From: pr3y Date: Sun, 5 May 2024 19:01:08 -0300 Subject: [PATCH] added shabang and removed delay --- build.sh | 1 + clean.sh | 3 ++- src/dpwo.cpp | 4 ++-- src/dpwo.h | 2 -- src/main.cpp | 2 +- src/wg.cpp | 4 +++- 6 files changed, 9 insertions(+), 7 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 26486e85..21c90117 --- a/build.sh +++ b/build.sh @@ -1,3 +1,4 @@ +#!/bin/bash ~/.local/bin/esptool.py --chip esp32s3 merge_bin --output Bruce3_Cardputer.bin 0x0 .pio/build/m5stack-cardputer/bootloader.bin 0x8000 .pio/build/m5stack-cardputer/partitions.bin 0x10000 .pio/build/m5stack-cardputer/firmware.bin ~/.local/bin/esptool.py --chip esp32 merge_bin --output Bruce3_cplus2.bin 0x1000 .pio/build/m5stack-cplus2/bootloader.bin 0x8000 .pio/build/m5stack-cplus2/partitions.bin 0x10000 .pio/build/m5stack-cplus2/firmware.bin ~/.local/bin/esptool.py --chip esp32 merge_bin --output Bruce3_cplus1_1.bin 0x1000 .pio/build/m5stack-cplus1_1/bootloader.bin 0x8000 .pio/build/m5stack-cplus1_1/partitions.bin 0x10000 .pio/build/m5stack-cplus1_1/firmware.bin diff --git a/clean.sh b/clean.sh index 47c3491d..05da95ca 100644 --- a/clean.sh +++ b/clean.sh @@ -1 +1,2 @@ -rm -f Bruce3_* +#!/bin/bash +rm -f Bruce3_* \ No newline at end of file diff --git a/src/dpwo.cpp b/src/dpwo.cpp index 3e397ccc..8601c2ac 100644 --- a/src/dpwo.cpp +++ b/src/dpwo.cpp @@ -133,7 +133,7 @@ void dpwo_setup() { Serial.println("scanning again"); ap_scanned = WiFi.scanNetworks(); - //TODO: append vulnerable APs and dont repeat the output - + //TODO: append vulnerable APs and dont repeat the output inside a loop + tft.fillScreen(BGCOLOR); } diff --git a/src/dpwo.h b/src/dpwo.h index 808419ca..18a516eb 100644 --- a/src/dpwo.h +++ b/src/dpwo.h @@ -7,5 +7,3 @@ void net_ap(int i); void claro_ap(int i); void dpwo_setup(); - -void dpwo_loop(); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 7e40ef5a..bad7aa87 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -160,7 +160,7 @@ void loop() { options.push_back({"Main Menu", [=]() { displayRedStripe("Main Menu"); }}); delay(200); loopOptions(options,false,true,"WiFi"); - delay(1000); // remover depois, está aqui só por causa do "displayRedStripe" + // delay(1000); // remover depois, está aqui só por causa do "displayRedStripe" break; case 1: // BLE options = { diff --git a/src/wg.cpp b/src/wg.cpp index 97f7c2a0..7871bd61 100644 --- a/src/wg.cpp +++ b/src/wg.cpp @@ -1,3 +1,5 @@ +//TODO: add loop function in webinterface + #include #include "wg.h" #include "globals.h" @@ -139,5 +141,5 @@ void wg_setup() tft.println(local_ip); tft.setTextColor(FGCOLOR, BGCOLOR); Serial.println(local_ip); - + tft.fillScreen(BGCOLOR); } \ No newline at end of file