Merge branch 'main' of https://github.com/bmorcelli/Bruce

.github/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: bmorcelli 
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: brucefw
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: bmorcelliz 
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -1,3 +1,5 @@
+![Bruce Main Menu](./media/bruce_banner.png)
+
 # Bruce
 
 Bruce is meant to be a versatile ESP32 firmware that supports a ton of offensive features focusing to facilitate on Red Team operations.
@@ -87,6 +89,17 @@ For more information on each function supported by Bruce, [read our wiki here](h
 - [x] Clock (New)
 - [x] Restart
 
+# Acknowledgements
+
++ [@bmorcelli](https://github.com/bmorcelli) for new core and a bunch of new features.
++ [@IncursioHack](https://github.com/IncursioHack) for adding RF and RFID modules features.
++ [@Luidiblu](https://github.com/Luidiblu) for logo and UI design assistance.
+
+# Donations
+
+This is free, open-source software. If you'd like to support the development of future projects, or say thanks for this one, you can donate using ko-fi.
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/C0C8Z0IKP)
 
 # Disclaimer
 

src/TV-B-Gone.cpp

@@ -36,7 +36,7 @@ By Anton Grimpelhuber ([email protected])
 #define DEBUGP(x) if (DEBUG == 1) { x ; }
 
 // Shortcut to insert single, non-optimized-out nop
-#define NOP __asm__ __volatile__ ("nop")
+#define NOPP __asm__ __volatile__ ("nop")
 
 // Not used any more on esp8266, so don't bother
 // Tweak this if neccessary to change timing
@@ -81,10 +81,10 @@ void delay_ten_us(uint16_t us) {
   uint8_t timer;
   while (us != 0) {
     for (timer = 0; timer <= DELAY_CNT; timer++) {
-      NOP;
-      NOP;
+      NOPP;
+      NOPP;
     }
-    NOP;
+    NOPP;
     us--;
   }
 }
@@ -143,8 +143,8 @@ void StartTvBGone() {
       offtime = powerCode->times[ti];  // read word 1 - ontime
       ontime = powerCode->times[ti + 1]; // read word 2 - offtime
 
-      rawData[k*2] = ontime * 10;
-      rawData[(k*2)+1] = offtime * 10;
+      rawData[k*2] = offtime * 10;
+      rawData[(k*2)+1] = ontime * 10;
     }
     progressHandler(i, num_codes);
     irsend.sendRaw(rawData, (numpairs*2) , freq);

src/settings.cpp

@@ -301,6 +301,7 @@ int gsetIrTxPin(bool set){
   if(set) {
     options = {
       {"Default", [&]() { result = LED; }},
+      {"M5 IR Mod", [&]() { result = GROVE_SDA; }},
     #ifndef CARDPUTER
       {"G26",     [&]() { result=26; }},
       {"G25",     [&]() { result=25; }},
@@ -332,6 +333,7 @@ int gsetIrRxPin(bool set){
   if(result>36) result = GROVE_SCL;
   if(set) {
     options = {
+      {"M5 IR Mod", [&]() { result = GROVE_SCL; }},
     #ifndef CARDPUTER
       {"G26",     [&]() { result=26; }},
       {"G25",     [&]() { result=25; }},
@@ -408,4 +410,4 @@ int gsetRfRxPin(bool set){
   returnToMenu=true;
   RfRx = result;
   return result;
-}
+}