Merge pull request #184 from justcallmekoko/master

Bring develop up to date with master
RogueMaster · Dec 9, 2022 · 3d58f29 · 3d58f29
2 parents 157ae7a + 985ac8a
commit 3d58f29
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -138,7 +138,7 @@ jobs:
 
       - name: Rename Marauder Multi Board bin
         run: |
-          mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.multiboardS3.bin
+          mv ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin
          
       - name: Configure TFT_eSPI and configs.h for OG Marauder
         run: |
@@ -299,13 +299,13 @@ jobs:
           asset_content_type: application/bin
 
       - name: Upload MultiboardS3 Asset
-        id: upload-flipper-release-asset 
+        id: upload-mutliboardS3-release-asset 
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.mutliboardS3.bin
+          asset_path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin
           asset_name: esp32_marauder.mutliboardS3.bin
           asset_content_type: application/bin
 

diff --git a/FlashFiles/FlipperZeroDevBoard/boot_app0.bin b/FlashFiles/FlipperZeroDevBoard/boot_app0.bin
diff --git a/FlashFiles/FlipperZeroDevBoard/esp32_marauder.ino.bootloader.bin b/FlashFiles/FlipperZeroDevBoard/esp32_marauder.ino.bootloader.bin
diff --git a/FlashFiles/FlipperZeroDevBoard/esp32_marauder.ino.partitions.bin b/FlashFiles/FlipperZeroDevBoard/esp32_marauder.ino.partitions.bin
diff --git a/FlashFiles/FlipperZeroMultiBoardS3/boot_app0.bin b/FlashFiles/FlipperZeroMultiBoardS3/boot_app0.bin
diff --git a/FlashFiles/FlipperZeroMultiBoardS3/esp32_marauder.ino.bootloader.bin b/FlashFiles/FlipperZeroMultiBoardS3/esp32_marauder.ino.bootloader.bin
diff --git a/FlashFiles/FlipperZeroMultiBoardS3/esp32_marauder.ino.partitions.bin b/FlashFiles/FlipperZeroMultiBoardS3/esp32_marauder.ino.partitions.bin
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <!---[![Build Status](https://travis-ci.com/justcallmekoko/ESP32Marauder.svg?branch=master)](https://travis-ci.com/justcallmekoko/ESP32Marauder)--->
 <!---Shields/Badges https://shields.io/--->
 
-# ESP32 Marauder v0.9.17
+# ESP32 Marauder v0.9.19
 <p align="center"><img alt="Marauder logo" src="https://github.com/justcallmekoko/ESP32Marauder/blob/master/pictures/marauder3L.jpg?raw=true" width="300"></p>
 <p align="center">
   <b>A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32</b>

diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
@@ -486,6 +486,8 @@ void CommandLine::runCommand(String input) {
           Serial.println("SD card is not connected. Cannot perform SD Update");
           return;
         }
+        wifi_scan_obj.currentScanMode = OTA_UPDATE;
+        sd_obj.runUpdate();
       }
     }
   }