Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tcs experimental sd #65

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,5 @@ venv.bak/
# mypy
.mypy_cache/

*.deb
*.deb
*.json
2 changes: 1 addition & 1 deletion 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.
26 changes: 13 additions & 13 deletions client/src/img/ui/gripper-closed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 19 additions & 13 deletions client/src/img/ui/gripper-opened.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/src/js/view/components/settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const Settings = ({ state, actions }) =>
<div class="settings_categories">
<div role='button' class={categoryClass(state.settings.category, 'general')} onmousedown={() => actions.settings.setVisibleCategory('general')}>General</div>
{/* <li class={categoryClass(state.settings.category, 'network')} onmousedown={() => actions.settings.setVisibleCategory('network')}>Network</li> */}
<div role='button' class={categoryClass(state.settings.category, 'manipulator')} onmousedown={() => actions.settings.setVisibleCategory('manipulator')}>Manipulator</div>
<div role='button' class={categoryClass(state.settings.category, 'manipulator')} onmousedown={() => actions.settings.setVisibleCategory('manipulator')}>Addons</div>
<div role='button' class={categoryClass(state.settings.category, 'preprogram')} onmousedown={() => actions.settings.setVisibleCategory('preprogram')}>Pre-program</div>
{/* <li class={categoryClass(state.settings.category, 'debug')} onmousedown={() => actions.settings.setVisibleCategory('debug')}>Debug</li> */}
<div role='button' class={categoryClass(state.settings.category, 'clupi')} onmousedown={() => actions.settings.setVisibleCategory('clupi')}>Experimental</div>
Expand Down
6 changes: 3 additions & 3 deletions client/src/js/view/components/settings/settings-about.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ export const SettingsAbout = ({ state }) =>
}
</div>
<p>
Please refer to docs.turtlerover.com to know more about the control options and the Rover maintenance.
Feel free to contact us if you have any issue. We're constantly improving the UI, but it's still a long way to go.
We'd love to have you participate in the project and get any feedback!
Please refer to docs.turtlerover.com to know more about the control options and the Rover maintenance.</p><p>
We're constantly improving the UI and we'd love to have you participate in the project.
Feel free to contact us if you have any issue. In the meantime, have fun!
</p>
<span>Turtle Team</span>
<span>[email protected]</span>
Expand Down
4 changes: 3 additions & 1 deletion client/src/js/view/components/settings/settings-general.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import { ButtonHold } from '../elements/button-hold';

export const SettingsGeneral = ({ actions }) =>
<div class="settings_content">
<ButtonHold text='SHUTDOWN' setValue={() => actions.system.shutdown()} />
<ButtonHold text='SHUTDOWN' setValue={() => actions.system.shutdown()} />
<br></br>
<ButtonHold text='REBOOT' setValue={() => actions.system.reboot()} />
<br></br>
<ButtonHold text='Restart stream' setValue={() => actions.stream.start()} />
</div>;
Binary file removed docs/inverse kinematics.xlsx
Binary file not shown.