Merge branch 'master' into dev

This commit is contained in:
ori
2019-05-01 12:10:46 -07:00
6 changed files with 52 additions and 13 deletions

View File

@@ -10,7 +10,8 @@ if __name__ == "__main__":
# SettingsManager()
CamerasHandler.init_camera()
VisionHandler().run()
#VisionHandler().run()
SettingsManager().save_settings()
tornado.options.parse_command_line()
app = ChameleonApplication()