Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code clean up in m5stickc-listener #334

Merged
merged 5 commits into from
Dec 28, 2023
Merged

Code clean up in m5stickc-listener #334

merged 5 commits into from
Dec 28, 2023

Conversation

Jocke4f
Copy link
Collaborator

@Jocke4f Jocke4f commented Jan 1, 2022

Changes in m5stickc-listener.ino

  • Removed redefined defines that are not used.
  • Changed GetVbatData to GetBatVoltage due to deprecation in M5StickCPlus\src\AXP192.h.
  • Cleaned up faulty log printouts.
  • Added load of Settings screen when network connection is successful.
  • Added printout when configuration times out due to inactivity.

Changes in README.md

  • Updated the readme file to be in line with the code.

Future enhancements could be:

  • Change to proper MAC address in the device name. This is also used in the name of the temporary AP for initial configuration.
  • Add more descriptive information at first startup regarding configuration.

@Jocke4f
Code clean up
3f279a2 
Removed redefined defines that are not used.
Changed GetVbatData to GetBatVoltage due to deprecation.
Cleaned up faulty log printouts.
Added load of Settings screen when network connection is successful.
@josephdadams
Copy link
Owner

Thanks for all this, @Jocke4f !

@Jocke4f
Changed unique identifier from chipid to macAddress
b8988da 
The last three pairs in the MAC address is now used in the both the SSID, WiFi hostname and as type/name in Tally Arbiter.
@Jocke4f
Copy link
Collaborator Author

Jocke4f commented Jan 2, 2022

In the 2nd commit the following enhancements have been included:

  • Parts of the MAC address is now used for the SSID for the configuration, in WiFi hostname and also as type/name in Tally Arbiter.
  • More descriptive text during first time start, i.e., no networking configurations exist.

@josephdadams
Copy link
Owner

This is great!

@josephdadams
Copy link
Owner

Is this ready to merge?

@Jocke4f
Adding WiFi reset & resolving merge conflicts
f978e9a 
Adding WiFi reset after 5 secs button press (missing feature and now the same as for M5 Atom listener).
Resolving branch merging conflicts.
@Jocke4f
Fix in Readme.md
ad0b333 
Fixing merge conflict
@Jocke4f
Merge branch 'master' into listener_clnt_m5stickc_update
5309a2a
@Jocke4f Jocke4f added bug Something isn't working feature A new feature or idea! labels Dec 28, 2023
@Jocke4f
Copy link
Collaborator Author

Jocke4f commented Dec 28, 2023

This PR is now ready to be merged.

Is it not taking into consideration the changes that are planned in #358. Such considerations/adaptations are part of work for that PR when trying to unify the code base.

@josephdadams josephdadams merged commit ac56e93 into josephdadams:master Dec 28, 2023
21 checks passed
@Jocke4f Jocke4f deleted the listener_clnt_m5stickc_update branch January 17, 2024 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MatteoGheza MatteoGheza MatteoGheza approved these changes

Assignees
No one assigned
Labels
bug Something isn't working feature A new feature or idea!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Jocke4f @josephdadams @MatteoGheza