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

fixed formatting warnings #872

Merged
merged 25 commits into from
Apr 11, 2020
Merged

fixed formatting warnings #872

merged 25 commits into from
Apr 11, 2020

Conversation

s-martin
Copy link
Collaborator

No description provided.

@s-martin s-martin added this to the 2.0 milestone Mar 23, 2020
@MiczFlor
Copy link
Owner

Hi @s-martin
what are you trying to improve / fix here?

@s-martin
Copy link
Collaborator Author

Only formatting changes for code style consistency.
Doesn't fix any actual bug.

fredg02 and others added 6 commits March 30, 2020 19:20
* Remove duplicate chown/chmod

* Align stretch install scripts

* Remove stretch-install-spotify.sh script
* Add info about pkg installation 

Fix for #818

* Update README.md
* Update Detect rfidoff function in gpio-buttons.py

Adapted the RFID-Off function to the new gpio-buttons code structure. Works fine with the hardware hack for the USB-rfid reader described here:
#62

The rfidoff event is triggered when the used gpio is pulled down.

* Added Missing "Channel" to rfidoff Action
@MiczFlor
Copy link
Owner

MiczFlor commented Apr 7, 2020

Hi @s-martin can you fix the conflict and merge it yourself? (I think you have the rights to merge?)

@s-martin
Copy link
Collaborator Author

s-martin commented Apr 7, 2020

Yes, will do.

s-martin added 2 commits April 7, 2020 19:34
…into develop

# Conflicts:
#	misc/sampleconfigs/gpio-buttons.py.sample
@MiczFlor
Copy link
Owner

MiczFlor commented Apr 8, 2020

@s-martin
looks like the conflicts are resolved. Will you merge or should I?

@s-martin
Copy link
Collaborator Author

s-martin commented Apr 8, 2020

I just want to reset some commits first. Many are doubled, because I messed up a merge.

@s-martin s-martin merged commit b030ab9 into MiczFlor:develop Apr 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants