Major overhaul - Githubissues

paviro / MMM-Facial-Recognition-Tools

Tools to setup and train the facial recognition module for the MagicMirror.

43 stars 23 forks source link

Closed randomstring closed 7 years ago

randomstring commented 7 years ago

Merge to one common lib directory
merged in cv3 support from @falgard
merged in smaller picam preview from benkej05
code cleanup: conform to common python style (mostly)
code cleanup: make the code python3 compatible (with exception of raw_input() calls)
set username list from ENV, removed need to change .py file to add list of usernames for testing
move common config code to config.py

I think my work here is done. It's good enough.

paviro commented 7 years ago

Hey there so sorry completely forgot about this... Could you fix the conflicts so I can merge it?

randomstring commented 7 years ago

The 3 conflicts are just files that need to be deleted with "git rm" They are files that got moved to the common /lib directory.

I tried to purge the fix back, but I don't have permission on https://github.com/paviro/MMM-Facial-Recognition-Tools.git/

paviro commented 7 years ago

I could not fix it 😅 But you should have permission to push to the repo :/

randomstring commented 7 years ago

I think I successfully pushed the merge. Github doesn't seem to support 2-factor authentication from the command line. So I resorted to the GUI.