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.

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

Implementing optional parameter restart to tmr:start() #3111

Merged
merged 5 commits into from
Aug 29, 2020

Conversation

vsky279
Copy link
Contributor

@vsky279 vsky279 commented May 16, 2020

Fixes #3020.

  • This PR is for the dev branch rather than for master.
  • This PR is compliant with the other contributing guidelines as well (if not, please describe why).
  • I have thoroughly tested my contribution.
  • The code changes are reflected in the documentation at docs/*.

Implements the solution discussed in #3020 as wrapped up by @HHHartmann

Also removes unecessary check of lua_newuserdata result (also in ads1115 module).

Copy link
Member

@nwf nwf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nits; otherwise LGTM.

app/modules/ads1115.c Outdated Show resolved Hide resolved
app/modules/tmr.c Outdated Show resolved Hide resolved
app/modules/tmr.c Outdated Show resolved Hide resolved
@TerryE
Copy link
Collaborator

TerryE commented May 16, 2020

Lukas, I tidied up tmr.c (= quite a lot of rework) for my #3078. If you don't mind, it's going to be a lot easier to add in this couple of changes rather than having to do a three-way merge. Thanks.

@vsky279
Copy link
Contributor Author

vsky279 commented May 17, 2020

Of course not. Go ahead.

app/modules/tmr.c Outdated Show resolved Hide resolved
app/modules/tmr.c Outdated Show resolved Hide resolved
@vsky279
Copy link
Contributor Author

vsky279 commented Jun 18, 2020

Oups. A bit of fight with @marcelstoer in commits. I hope the result is fine.

@marcelstoer
Copy link
Member

I hope the result is fine.

As #1168 is now closed we maybe shouldn't argue about it but replacing spaces with tabs is a move in the wrong direction IMO.

I'm happy to merge this though.

@vsky279
Copy link
Contributor Author

vsky279 commented Jul 19, 2020

spaces -> tabs - I only made it consistent with the rest of the file where tabs are used.
In the following PR we can replace tabs to spaces for good.

@marcelstoer marcelstoer merged commit d72ea91 into nodemcu:dev Aug 29, 2020
vsky279 added a commit to vsky279/nodemcu-firmware that referenced this pull request Nov 21, 2020
@vsky279 vsky279 deleted the tmr branch August 27, 2021 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants