From 9209e5307619a90da12a8e359cea9c7972f223f7 Mon Sep 17 00:00:00 2001 From: Sabas Date: Thu, 1 Aug 2024 17:56:30 -0600 Subject: [PATCH 01/12] docs: Update README for v1.1.0.0 Signed-off-by: Sabas --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1d1d466f..e32cdbe7 100644 --- a/README.md +++ b/README.md @@ -48,13 +48,13 @@ Minino can operate in 6 different technologies: - [x] Wardriving - [x] WiFi sniffer - [x] WiFi deauther -- [x] DOS Attack +- [x] DOS Attack (Control with Console and Minino) - [x] Analizer - [ ] Wireshark integration ### BLE - [ ] BLE Sniffer - [x] BLE Spammer -- [x] BLE Spoffing +- [ ] BLE Spoffing - [x] BLE Trackers Scanner (AirTags, Tile, etc) - [ ] Wireshark integration ### Zigbee @@ -64,11 +64,10 @@ Minino can operate in 6 different technologies: - [x] Wireshark integration ### Thread -- [ ] Thread sniffer +- [x] Thread sniffer - [x] Thread broadcast -- [x] GPS tracker - [ ] Wardriving -- [ ] Wireshark integration +- [x] Wireshark integration ### Matter - [ ] Matter protocol support @@ -80,11 +79,14 @@ Minino can operate in 6 different technologies: - [x] GPS Speed - [x] GPS Time - [x] SD -- [x] File Manager Web +- [x] File Manager Web (Local AP and WIFI access) - [ ] File Manager Local - [ ] I2C Scanner - [ ] UART2 +### Settings +- [x] Change screensaver +- [x] Change time screensaver Inspired by projects such as [Amini Project](https://github.com/Ocelot-Offensive-Security/Arsenal) and [USBNugget](https://github.com/HakCat-Tech/USB-Nugget). From 3565597c97c1c3f0a61bf655da4838f901b1e125 Mon Sep 17 00:00:00 2001 From: RocketGod <57732082+RocketGod-git@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:08:06 -0700 Subject: [PATCH 02/12] Update README.md Signed-off-by: RocketGod <57732082+RocketGod-git@users.noreply.github.com> --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e32cdbe7..f0a6b61c 100644 --- a/README.md +++ b/README.md @@ -49,12 +49,12 @@ Minino can operate in 6 different technologies: - [x] WiFi sniffer - [x] WiFi deauther - [x] DOS Attack (Control with Console and Minino) -- [x] Analizer +- [x] Analyzer - [ ] Wireshark integration ### BLE - [ ] BLE Sniffer - [x] BLE Spammer -- [ ] BLE Spoffing +- [ ] BLE Spoofing - [x] BLE Trackers Scanner (AirTags, Tile, etc) - [ ] Wireshark integration ### Zigbee @@ -94,13 +94,13 @@ Inspired by projects such as [Amini Project](https://github.com/Ocelot-Offensive Contributions are welcome! -Please read the document [**Contribution Manual**](https://github.com/ElectronicCats/electroniccats-cla/blob/main/electroniccats-contribution-manual.md) which will show you how to contribute your changes to the project. +Please read the document [**Contribution manual**](https://github.com/ElectronicCats/electroniccats-cla/blob/main/electroniccats-contribution-manual.md) which will show you how to contribute your changes to the project. -✨ Thanks to all our [contributors](https://github.com/ElectronicCats/Minino/graphs/contributors)! ✨ +✨ Thanks to all our [Contributors](https://github.com/ElectronicCats/Minino/graphs/contributors)! ✨ See [**_Electronic Cats CLA_**](https://github.com/ElectronicCats/electroniccats-cla/blob/main/electroniccats-cla.md) for more information. -See the [**community code of conduct**](https://github.com/ElectronicCats/electroniccats-cla/blob/main/electroniccats-community-code-of-conduct.md) for a vision of the community we want to build and what we expect from it. +See the [**Community code of conduct**](https://github.com/ElectronicCats/electroniccats-cla/blob/main/electroniccats-community-code-of-conduct.md) for a vision of the community we want to build and what we expect from it. ## License From 1200ad0c5f6ba1b0a67900c8831eb995b780a3f0 Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 14:52:01 -0600 Subject: [PATCH 03/12] CI: add build firmware --- .github/workflows/build.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..49a645bf --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,23 @@ +name: IDFBuild +on: + push: + pull_request: + workflow_dispatch: + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - name: Test Action + uses: tobozo/idf-builder@v1 + with: + # target_repo: user/esp-idf-project # github repository + # target_repo_ref: main + idf_project_folder: ./firmware + idf_version: v5.4-dev # esp-idf version, must match a tag listed at https://hub.docker.com/r/espressif/idf/tags + idf_target_chip: esp32c6 # any chip supported by the picked version of esp-idf + merged_bin: merged.bin # optional + artifact_name: merged_bin # optional \ No newline at end of file From d67428bdd92e2e0887299c31d90e4c8baf38c1e8 Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 14:59:55 -0600 Subject: [PATCH 04/12] CI: new file --- .github/workflows/build.yml | 68 +++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49a645bf..591788eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,23 +1,57 @@ -name: IDFBuild on: push: pull_request: workflow_dispatch: +permissions: + contents: write +name: Build jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - name: Test Action - uses: tobozo/idf-builder@v1 - with: - # target_repo: user/esp-idf-project # github repository - # target_repo_ref: main - idf_project_folder: ./firmware - idf_version: v5.4-dev # esp-idf version, must match a tag listed at https://hub.docker.com/r/espressif/idf/tags - idf_target_chip: esp32c6 # any chip supported by the picked version of esp-idf - merged_bin: merged.bin # optional - artifact_name: merged_bin # optional \ No newline at end of file + build: + strategy: + fail-fast: true + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v3 + with: + submodules: 'recursive' + fetch-tags: true + fetch-depth: 0 + + - name: Add version + run: git describe --tags | sed 's/-[^-]*$//' > version.txt + + - name: esp-idf build + uses: espressif/esp-idf-ci-action@v1 + with: + esp_idf_version: v5.4 + target: esp32c6 + path: './firmware' + + - name: Rename artifact + run: | + ls -lah + cp build/minino.bin minino-esp32s3.bin + + - name: Archive Firmware Files + uses: actions/upload-artifact@v3 + with: + name: esp32s3-firmware + path: "*-esp32s3.bin" + + release: + needs: build + runs-on: ubuntu-latest + steps: + - name: Download Firmware Files + uses: actions/download-artifact@v2 + with: + path: release + - name: Release Firmware + uses: ncipollo/release-action@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + artifacts: release/*/*.bin + generateReleaseNotes: true + allowUpdates: true \ No newline at end of file From 7953e874cdbbb0acb1758e507513542b06f80590 Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 15:00:55 -0600 Subject: [PATCH 05/12] CI: change SDK version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 591788eb..e2af8b8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: esp-idf build uses: espressif/esp-idf-ci-action@v1 with: - esp_idf_version: v5.4 + esp_idf_version: v5.4-dev target: esp32c6 path: './firmware' From 55acff0f4f7b20ae55d756c3c3505c054d301546 Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 15:08:59 -0600 Subject: [PATCH 06/12] feat: change path CI --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2af8b8e..53673841 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,20 +25,16 @@ jobs: - name: esp-idf build uses: espressif/esp-idf-ci-action@v1 with: + #source https://hub.docker.com/r/espressif/idf/tags esp_idf_version: v5.4-dev target: esp32c6 path: './firmware' - - name: Rename artifact - run: | - ls -lah - cp build/minino.bin minino-esp32s3.bin - - name: Archive Firmware Files uses: actions/upload-artifact@v3 with: - name: esp32s3-firmware - path: "*-esp32s3.bin" + name: minino-firmware + path: "minino.bin" release: needs: build From cd8ac4a5b6a1d0a070fdb16bc458f6ce28c318ef Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 15:16:11 -0600 Subject: [PATCH 07/12] feat: add bins --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53673841..761ee05e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,9 @@ on: - push: + push: +# tags: +# - 'v*' +# branches: main pull_request: - workflow_dispatch: permissions: contents: write @@ -34,7 +36,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: minino-firmware - path: "minino.bin" + path: "./firmware/build/minino.bin ./firmware/build/bootloader/bootloader.bin ./firmware/build/partition_table/partition-table.bin ./firmware/build/ota_data_initial.bin" release: needs: build From e4337556a7b81698b82838df1005e88042b02256 Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 15:22:16 -0600 Subject: [PATCH 08/12] feat: upload full path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 761ee05e..e455285c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: minino-firmware - path: "./firmware/build/minino.bin ./firmware/build/bootloader/bootloader.bin ./firmware/build/partition_table/partition-table.bin ./firmware/build/ota_data_initial.bin" + path: "./firmware/build/" release: needs: build From f51da07f6edced539b3d04cc40d686f7143840c5 Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 15:23:12 -0600 Subject: [PATCH 09/12] feat: update upload-artifact@v4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e455285c..f2dffb5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: path: './firmware' - name: Archive Firmware Files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: minino-firmware path: "./firmware/build/" From 3171923612404bf63724883e016fdc78820828bb Mon Sep 17 00:00:00 2001 From: Sabas Date: Wed, 28 Aug 2024 15:31:07 -0600 Subject: [PATCH 10/12] feat: update download-artifact@v4 --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2dffb5c..93fb5eee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,7 @@ on: push: -# tags: -# - 'v*' -# branches: main + tags: + - 'v*' pull_request: permissions: @@ -43,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Firmware Files - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: release - name: Release Firmware From 090acbc55797d95255ee8e603f23eaa3354e6229 Mon Sep 17 00:00:00 2001 From: Kevin Jahaziel Leon Morales Date: Fri, 30 Aug 2024 11:29:42 -0600 Subject: [PATCH 11/12] feat: Remove builds --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b72c8b24..3857a0d6 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ hardware/minino-backups/ # Firmware binaries /**/build/* +/**/build-* /**/managed_components/ /**/build_files/ /**/build_files.tgz From 3a07d84bd7ff6936b1c0f99c065505328607cefb Mon Sep 17 00:00:00 2001 From: Roberto Arellano Date: Fri, 30 Aug 2024 12:00:58 -0600 Subject: [PATCH 12/12] fix: clear oled buffer in general screens --- firmware/main/general/general_screens.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/firmware/main/general/general_screens.c b/firmware/main/general/general_screens.c index 46908ad0..dac1a734 100644 --- a/firmware/main/general/general_screens.c +++ b/firmware/main/general/general_screens.c @@ -173,6 +173,7 @@ static void general_screen_display_scrolling() { (i - scrolling_option) + (ITEMOFFSET + screen_title), OLED_DISPLAY_NORMAL); } + oled_screen_display_show(); } void general_register_menu(const general_menu_t* ctx) { @@ -214,9 +215,11 @@ void genera_screen_display_card_information(char* title, char* body) { page++; if (strlen(body) > MAX_LINE_CHAR) { oled_screen_display_text_splited(body, &page, OLED_DISPLAY_NORMAL); + oled_screen_display_show(); return; } oled_screen_display_text_center(body, page, OLED_DISPLAY_NORMAL); + oled_screen_display_show(); } void genera_screen_display_notify_information(char* title, char* body) { @@ -227,9 +230,11 @@ void genera_screen_display_notify_information(char* title, char* body) { page++; if (strlen(body) > MAX_LINE_CHAR) { oled_screen_display_text_splited(body, &page, OLED_DISPLAY_NORMAL); + oled_screen_display_show(); return; } oled_screen_display_text_center(body, page, OLED_DISPLAY_NORMAL); + oled_screen_display_show(); } void general_screen_display_menu(uint16_t current_option) { @@ -256,4 +261,5 @@ void general_screen_display_menu(uint16_t current_option) { i + ITEMOFFSET, OLED_DISPLAY_NORMAL); } } + oled_screen_display_show(); } \ No newline at end of file