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

Commit 71acc06

Browse files
committed
Merge branch 'develop'
2 parents e830c07 + cbac0af commit 71acc06

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ Contributions are welcome.
141141
* 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.
142142
* 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.
143143
* 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.
144+
* Feel free to add your github to the contributors array as part of your pull request.
144145

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

156157
Things I probably won't merge in:
157158
* Bulk wifi deauthentication spamming
158-
* Bluetooth spam that potentially disrupts health and fitness trackers, smart watches, etc.
159+
* Bluetooth spam that potentially disrupts health and fitness trackers, smart watches, etc.

m5stick-nemo.ino

+2-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ const String contributors[] PROGMEM = {
189189
"@n0xa",
190190
"@niximkk",
191191
"@unagironin",
192-
"@vladimirpetrov"
192+
"@vladimirpetrov",
193+
"@vs4vijay"
193194
};
194195

195196
int advtime = 0;

0 commit comments

Comments
 (0)