Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
stsdc committed Nov 29, 2018
2 parents ec52fdf + d154c83 commit 9908f4a
Show file tree
Hide file tree
Showing 72 changed files with 2,377 additions and 632 deletions.
28 changes: 18 additions & 10 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
{
"plugins": [["transform-react-jsx", { "pragma": "h" }]],
"presets": [
[
"env",
{
"targets": {
"browsers": ["last 2 versions"]
}
}
"plugins": [
["transform-react-jsx", {
"pragma": "h"
}],
["transform-runtime", {
"polyfill": false,
"regenerator": true
}]
],
"presets": [
[
"env",
{
"targets": {
"browsers": ["last 2 versions"]
}
}
]
]
]
}
19 changes: 15 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@
"atob": true,
"history": true,
"location": true,
"addEventListener": true
"addEventListener": true,
"localStorage": true
},
"rules": {
"no-undef": "error",
"no-unused-vars": [2, {
"varsIgnorePattern": "h"
}],
"linebreak-style": "off",
"indent": ["error", 4],

"prefer-template": "off",
"indent": ["error", 4, { "SwitchCase": 1 }],
"consistent-return": "off",
"no-param-reassign": [2, { "props": false }],
"react/jsx-indent": ["error", 4],
"react/jsx-indent-props": ["error", 4],
"react/no-unknown-property": "off",
Expand All @@ -30,6 +33,7 @@
"react/prop-types": 0,
"react/jsx-filename-extension": [1, {"extensions": [".js", ".jsx"]}],
"react/jsx-uses-vars": 2,
"react/jsx-one-expression-per-line": "off",

"no-use-before-define": "off",
"jsx-quotes": "off",
Expand All @@ -43,7 +47,14 @@
"import/no-dynamic-require": 0,
"import/no-extraneous-dependencies": 0,
"import/prefer-default-export": 0,
"strict": 0
"strict": 0,
"global-require":"off",
"jsx-a11y/interactive-supports-focus":"off",
"no-else-return": "off",
"jsx-a11y/no-noninteractive-element-interactions": "warn",
"jsx-a11y/media-has-caption": "off",
"object-curly-newline": "off",
"no-unused-expressions": [ "error", {"allowTernary": true}]
}

}
4 changes: 0 additions & 4 deletions .jshintrc

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@

## How to build
* Run `yarn install`
* Run `npm run build`
* Run `yarn build` to build productional files. There is also `yarn watch` command, it will watch for any changes in files and rebuild project
* Run `utils/make_deb.sh`
* Install Python dependencies `sudo pip3 install -r requirements.txt`

## How streaming works
Streaming is done with [UV4L](https://www.linux-projects.org/uv4l/) drivers and [WebRTC streaming server](https://www.linux-projects.org/uv4l/webrtc-extension/). UV4L comes preinstalled with [TurtleOS](https://github.com/TurtleRover/TurtleOS).
### Stream troubleshooting
There are still some problems with streaming and we are working to fix them. If stream doesn't work on your device, you may try to experiment with `/etc/uv4l/uv4l-uvc.conf`, especially with `webrtc-enable-hw-codec` option and [`force_hw_vcodec`](https://github.com/TurtleRover/tcs/blob/984120b8469f603650f3c6f979bfc96e2dcbbbde/client/src/js/core/stream.js#L72) in `core/stream.js`. If you find any solution to your problem with streaming - please let us know or create a pull request.

Binary file removed client/src/img/cursor.cur
Binary file not shown.
Binary file removed client/src/img/cursor.png
Binary file not shown.
18 changes: 10 additions & 8 deletions client/src/img/ui/dot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
148 changes: 148 additions & 0 deletions client/src/img/ui/joystick.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9908f4a

Please sign in to comment.