Skip to content

Commit

Permalink
Merge branch 'prerelease' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
JahazielLem committed Aug 30, 2024
2 parents 1d61713 + 3a07d84 commit d305deb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ hardware/minino-backups/

# Firmware binaries
/**/build/*
/**/build-*
/**/managed_components/
/**/build_files/
/**/build_files.tgz
Expand Down
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ Minino can operate in 6 different technologies:
- [x] Wardriving
- [x] WiFi sniffer
- [x] WiFi deauther
- [x] DOS Attack
- [x] Analizer
- [x] DOS Attack (Control with Console and Minino)
- [x] Analyzer
- [ ] Wireshark integration
### BLE
- [ ] BLE Sniffer
- [x] BLE Spammer
- [x] BLE Spoffing
- [ ] BLE Spoofing
- [x] BLE Trackers Scanner (AirTags, Tile, etc)
- [ ] Wireshark integration
### Zigbee
Expand All @@ -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
Expand All @@ -80,25 +79,28 @@ 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).

## How to contribute <img src="https://electroniccats.com/wp-content/uploads/2018/01/fav.png" height="35"><img src="https://raw.githubusercontent.com/gist/ManulMax/2d20af60d709805c55fd784ca7cba4b9/raw/bcfeac7604f674ace63623106eb8bb8471d844a6/github.gif" height="30">

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

Expand Down
6 changes: 6 additions & 0 deletions firmware/main/general/general_screens.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -256,4 +261,5 @@ void general_screen_display_menu(uint16_t current_option) {
i + ITEMOFFSET, OLED_DISPLAY_NORMAL);
}
}
oled_screen_display_show();
}

0 comments on commit d305deb

Please sign in to comment.