Skip to content
This repository has been archived by the owner on Aug 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
n0xa committed Jan 27, 2024
2 parents e830c07 + cbac0af commit 71acc06
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ Contributions are welcome.
* Pliease look at the GitHub Issues for the project. There are feature suggestions and bugs reported there, and I'd appreciate PRs that address those.
* When submitting a Pull Request, please target the develop branch. The easiest way to do this is to fork ALL branches, or to simply create a "develop" branch in your own fork, then use GitHub to Sync your develop branch.
* Take note of how certain hardware (like the LED and RTC) are defined and gated in the code and try to stick to those patterns. Also, use the definitions for FGCOLOR, BGCOLOR, TEXT_SIZE* and the DISP alias when outputting things to the built-in display.
* Feel free to add your github to the contributors array as part of your pull request.

Things I'd like help on:
* Improved localization/translations of the menu, not just NEMO Portal HTML.
Expand All @@ -155,4 +156,4 @@ Things I'd like help on:

Things I probably won't merge in:
* Bulk wifi deauthentication spamming
* Bluetooth spam that potentially disrupts health and fitness trackers, smart watches, etc.
* Bluetooth spam that potentially disrupts health and fitness trackers, smart watches, etc.
3 changes: 2 additions & 1 deletion m5stick-nemo.ino
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ const String contributors[] PROGMEM = {
"@n0xa",
"@niximkk",
"@unagironin",
"@vladimirpetrov"
"@vladimirpetrov",
"@vs4vijay"
};

int advtime = 0;
Expand Down

0 comments on commit 71acc06

Please sign in to comment.