badgeteam / ESP32-platform-firmware

Universal badge platform for ESP32 based devices! Runs on the event badges from SHA2017, HackerHotel 2019, Disobey 2019, CampZone 2019, Disobey 2020 and more!
https://badge.team
40 stars 42 forks source link

Merging CZ19/Pixel into master #234

Closed tjclement closed 3 years ago

tjclement commented 3 years ago

Making a draft PR to look into needed changes

tjclement commented 3 years ago

Huge PR, but the relevant parts for a merge are not too bad. It's intended to get CZ19/Pixel merged back into master, and share the changes made for it. I think for the PR we have to focus on only 3 things (because the others are just python_module changes that don't change anything for other badges):

@renzenicolai what do you think?

renzenicolai commented 3 years ago

LGTM, strangely enough I think this whole PR can be merged without breaking any of the other badges.

There is a merge conflict that needs to be solved, but after that feel free to hit that merge button :smile:

lgtm-com[bot] commented 3 years ago

This pull request introduces 31 alerts and fixes 18 when merging b88f07969b77f25e4207fda22e2c34c26e35656d into 6e28dbc0d222e1c7ba53ba4a0450cc43581e3d4e - view on LGTM.com

new alerts:

fixed alerts: