Merge branch 'dev' into 'master'

first version!!

See merge request oriagranat9/Chameleon-Vision!4
This commit is contained in:
ori agranat
2019-08-13 20:08:57 +00:00
15 changed files with 6157 additions and 4151 deletions

View File

@@ -12,11 +12,17 @@ define("port", default=8888, help="run on the given port", type=int)
class ChameleonApplication(tornado.web.Application):
def __init__(self):
handlers = [
# (r"/", MainHandler),
(r"/websocket", ChameleonWebSocket)]
(r"/", MainHandler),
(r"/websocket", ChameleonWebSocket),
(r"/(.*)", tornado.web.StaticFileHandler,
{"path": r"{0}".format(os.path.join(os.path.dirname(__file__), "site"))}),
]
settings = dict(
template_path=os.path.join(os.path.dirname(__file__), "../../Site")
settings = dict({
"template_path": os.path.join(os.path.dirname(__file__), "site"),
"static_path": os.path.join(os.path.dirname(__file__), "site"),
"debug": True
}
)
super(ChameleonApplication, self).__init__(handlers, **settings)

View File

@@ -245,8 +245,8 @@ class VisionHandler(metaclass=Singleton):
return yaw
def run(self):
# NetworkTables.startClientTeam(team=SettingsManager.general_settings.get("team_number", 1577))
NetworkTables.initialize("localhost")
NetworkTables.startClientTeam(team=SettingsManager.general_settings.get("team_number", 1577))
# NetworkTables.initialize("localhost")
cs = CameraServer.getInstance()
port = 5550

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 542 KiB

View File

@@ -0,0 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>Chameleon Vision</title><link href=/css/app.bd8aa8d9.css rel=preload as=style><link href=/js/app.d1ab8cb6.js rel=preload as=script><link href=/js/chunk-vendors.a3ecb371.js rel=preload as=script><link href=/css/app.bd8aa8d9.css rel=stylesheet></head><body><noscript><strong>We're sorry but Chameleon Vision doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.a3ecb371.js></script><script src=/js/app.d1ab8cb6.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -8,23 +8,23 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"iview": "^3.3.0",
"vue": "^2.6.6",
"vue-native-websocket": "^2.0.12",
"vue-router": "^3.0.2",
"vuex": "^3.1.0",
"webpack": "^4.29.6"
"iview": "^3.4.2",
"vue": "^2.6.10",
"vue-native-websocket": "^2.0.13",
"vue-router": "^3.1.2",
"vuex": "^3.1.1",
"webpack": "^4.39.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.5.0",
"@vue/cli-plugin-eslint": "^3.5.0",
"@vue/cli-service": "^3.5.1",
"babel-eslint": "^10.0.1",
"eslint": "^5.8.0",
"eslint-plugin-vue": "^5.0.0",
"@vue/cli-plugin-babel": "^3.10.0",
"@vue/cli-plugin-eslint": "^3.10.0",
"@vue/cli-service": "^3.10.0",
"babel-eslint": "^10.0.2",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.2.3",
"less": "^3.9.0",
"less-loader": "^4.1.0",
"vue-template-compiler": "^2.5.21"
"vue-template-compiler": "^2.6.10"
},
"eslintConfig": {
"root": true,