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

Toggle Controls Panel #460

Merged
merged 38 commits into from
Nov 1, 2023
Merged

Toggle Controls Panel #460

merged 38 commits into from
Nov 1, 2023

Conversation

ChuChuCodes0414
Copy link
Contributor

@ChuChuCodes0414 ChuChuCodes0414 commented Sep 30, 2023

This is a panel that allows you to enable or disable controls.

Several other changes are packaged with this PR.

  1. The .eslintrc.yaml config file was converted to JSON.
  2. The "endOfLine": "auto" rule was added for prettier/prettier. This resolves the lint error [eslint] Delete CR [prettier/prettier]" that is introduced by Windows machines.
  3. Rules were added to enforce that comments begin with a space and begin with a capital letter.

Closes #441.

@ChuChuCodes0414 ChuChuCodes0414 linked an issue Sep 30, 2023 that may be closed by this pull request
6 tasks
@ChuChuCodes0414 ChuChuCodes0414 self-assigned this Sep 30, 2023
@ChuChuCodes0414 ChuChuCodes0414 added the gui Related to robot GUI label Sep 30, 2023
@ChuChuCodes0414 ChuChuCodes0414 added this to the Fall 2023 milestone Sep 30, 2023
@maxwellmlin maxwellmlin self-assigned this Sep 30, 2023
@maxwellmlin maxwellmlin marked this pull request as draft September 30, 2023 20:32
@maxwellmlin maxwellmlin changed the title Toggle controls panel Toggle Controls Panel Sep 30, 2023
maxwellmlin and others added 20 commits October 28, 2023 09:28
Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>
* Set default button state to disabled

* Initial framework

* Always show all 4 rows

* Update READMEs

* Refactor hardcoded topic types

* Rename variable

* modified labeling in detection visualizer class

* Made camera hard reset executable

* Only update on camera_relay_status publish

* Move button setEnable to clock

* Finished 4 tasks in RQT Launch Plugin Improvements issue, haven't tested the last two yet

* looked over everything with Rico for CV

* Removed unnecessary translations

* Added launch args for show class name and show confidence to simulate detection

* finished testing for remove_nodes_manually and running_status_column

* fixed sonar.launch

* hello

* minor changes

* minor changes

* Remove relay from table

* Remove relay from table

* Fix hardcoded topic names

* Remove relay topics on close

* Move button to right

* added test_id

* fixed the launch sonar file by adding port

* Finished remaining tasks in RQT Launch Plugin Improvements

* Revert: use relay in table

* Refactor

* fixed bug

* finished incorporating new class & confidence args

* Refactor

* Update default button state

* Revert to original width

* Final cleanup

* Took care of active threads before the widget is closed

* Updated readme file

* added comments to modified code

* changed all instances of camelCase to snake_case

* Implemented functionality to create and remove subscribers when topic becomes active and inactive

* fixed lint errors

* Removed unnecessary models

* Added colors to 2023 models

* Make CV interface load topics from file

* Deleted extra file

* Added extra docker line

* Fixed weights file name of yolov7-tiny

* fixed linter

* fixed subscribers

* Exclude sonar from automatic testing

* added string for oogway

* 1Hz publishing; normally closed relay change

* testing non-smach movement

* updated readme for new relay config

* Pool Test CV Sonar Fixes (#428)

* Removed debug code

* Fixed cv sonar sync issue

* Changed using_sonar to default to True

* Initial changes

* Fix linting

* Finish

* the table updates when display all nodes is checked

* Changed sensor widget to use desired power action

* Resolve merge conflict?

* Created sensors.launch file and removed service call from depthai_spatial_detection

* initialize relay timer

* relay timer

* Passed sonar image upstream

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Changed default sonar settings

* Fixed sensor widget

* Updated sonar topic name

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Added polar images

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added query for sonar image publisher

* nonsense

* Revert "Merge remote-tracking branch 'origin/cv-launch-plugin' into pool-test-apr-22"

This reverts commit 8715133.

* this is the coolest commit ever

* Manually patch remote_launch fix

* Fix typos in buoy task

* Fix typos in buoy task

* Please stop replacing our working code with test code

* Changes made at pool test

* Added main yolov8n and yolov7-tiny models

* Implement custom_autodiscovery

* Update docs

* Ensure active topic thruster_controls publishes to

* linted code

* Add nmap to dockerfile

* Add readme2

* Update README2.md

* Update README2.md

* update

* Update rm2.md

* Update README2.md

* Readme2.md

* Swap x, y; negate z

* deleted pressure sensor error message

* imu quat changes

* added fixes to robot_localization

* example pressure sensor

* Thruster temp

* Sh scripts

* Remove comma

* Add depth to sensor_fusion

* Change air pressure

* Sync

* Comment out thruster publish log

* Pool test changes (global state works!)

* Fix state by negating y_vel

* Change baud rate

* remove ?

* added dual serial thruster code

* stuff

* dual arduino, consistent thruster speeds, pressure included

* Update README.md

* Update test_state_publisher.py

* Update README.md with dual_upload

* the best readme

* cleaned arduino code, arduino readme

* Rename pressure_converter to pressure_stamper

* Delete

* noted pressure stamping in readme

* CV sonar syncing

* Flipped bottom thrusters in oogway config

* Disabled all Z inputs to state except pressure sensor

* Changes to PID constants to hold depth

* Sonar update

* Jank code to move to CV in test state publisher

* updated angle algorithm

* Fixed minor issue with angle offset calculation

* Added constant sonar sweeping

* task_planning code

* Part 1 of Big Changes to CV Task Planning

* adding task planning

* Added vectornav package

* unflipped bottom thrusters

* Adjusted velocity PID

* Adjusted local pose goal in test state publisher

* Commented IMU out of data pub

* Added hard cap to pressure sensor

* Changed IMU sensor fusion config to use vectornav

* commit test_state_publisher.py

* Position PID

Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>

* Test state pub

* Add usb camera

* Add sensors, vectornav

* Remove velocity pid

* Fix sonar

* Fix arduino connect?

* Add record sh

* Gate task

* bugfix

* commit record

* comp stuff

* Added y offset angle

* Updated sonar message

* Fix tmux run.sh

* Save changes before pool test

* Using camera for robot y

* Forgot tuples are immutable lol

* Updated tmux script

* New arduino

* Negated sonar Y

* Changed sonar range to 5

* Removed unused code and updated cv gate

* Revert "Change controls to use ROS Actions (#383)"

This reverts commit 3850fbb.

* Move in steps

* Use topics

* Use topics not actions

* REMOVE SONAR

* Test state with topics

* Increase roll, pitch

* taskplanning

* Fixed deg to rad conversion

* test state publisher updates

* fixed bug for desired_state.py

* move through gate with style

* fixed dead reckon gate with style

* Updated CV GUI perspective file

* Add

* hello

* serial pressure reader

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* Removed pressure arduino from offboard comms launch file and added new pressure script to data pub launch file

* Changed pressure sensor topic to sensors/depth

* arduino serial for pressure, no ros

* changed port

* arduino no longer disconnects

* updated readme for data pub and offboard comms

* checkout to master for all non-depth changes

* removed files

* forgot to re-change actual changes

* other data_pub changes removed

* removed pressure_stamper changes from pr

* fixed comments and deleted IMU files

* added FTDI string for pressrue sensor

* fuck the linter

* fuck the linter x2

* fuck the linter x3

* fuck the linter x4

---------

Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Cthulhu <--global>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
@vedarshshah vedarshshah marked this pull request as ready for review November 1, 2023 15:42
@vedarshshah vedarshshah merged commit 5620202 into master Nov 1, 2023
15 checks passed
@vedarshshah vedarshshah deleted the toggle-controls-panel branch November 1, 2023 15:44
maxwellmlin added a commit that referenced this pull request Nov 4, 2023
* Initial template

* Update version

* Implement toggle-controls-panel

Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>

* Fix numerous bugs relating to context

* Use MUI Alert

* Update

* Cross-platform install script

* Add final print

* Add linebreak between extensions

* Fix alert not showing up bug

* Update component names

* add todo

* Cross platform

* Typo

* Lint

* added disabling if context.callService not available

* Arduino disconnect fix -- migrated one ROS node to raw serial (#464)

* Set default button state to disabled

* Initial framework

* Always show all 4 rows

* Update READMEs

* Refactor hardcoded topic types

* Rename variable

* modified labeling in detection visualizer class

* Made camera hard reset executable

* Only update on camera_relay_status publish

* Move button setEnable to clock

* Finished 4 tasks in RQT Launch Plugin Improvements issue, haven't tested the last two yet

* looked over everything with Rico for CV

* Removed unnecessary translations

* Added launch args for show class name and show confidence to simulate detection

* finished testing for remove_nodes_manually and running_status_column

* fixed sonar.launch

* hello

* minor changes

* minor changes

* Remove relay from table

* Remove relay from table

* Fix hardcoded topic names

* Remove relay topics on close

* Move button to right

* added test_id

* fixed the launch sonar file by adding port

* Finished remaining tasks in RQT Launch Plugin Improvements

* Revert: use relay in table

* Refactor

* fixed bug

* finished incorporating new class & confidence args

* Refactor

* Update default button state

* Revert to original width

* Final cleanup

* Took care of active threads before the widget is closed

* Updated readme file

* added comments to modified code

* changed all instances of camelCase to snake_case

* Implemented functionality to create and remove subscribers when topic becomes active and inactive

* fixed lint errors

* Removed unnecessary models

* Added colors to 2023 models

* Make CV interface load topics from file

* Deleted extra file

* Added extra docker line

* Fixed weights file name of yolov7-tiny

* fixed linter

* fixed subscribers

* Exclude sonar from automatic testing

* added string for oogway

* 1Hz publishing; normally closed relay change

* testing non-smach movement

* updated readme for new relay config

* Pool Test CV Sonar Fixes (#428)

* Removed debug code

* Fixed cv sonar sync issue

* Changed using_sonar to default to True

* Initial changes

* Fix linting

* Finish

* the table updates when display all nodes is checked

* Changed sensor widget to use desired power action

* Resolve merge conflict?

* Created sensors.launch file and removed service call from depthai_spatial_detection

* initialize relay timer

* relay timer

* Passed sonar image upstream

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Changed default sonar settings

* Fixed sensor widget

* Updated sonar topic name

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Added polar images

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added query for sonar image publisher

* nonsense

* Revert "Merge remote-tracking branch 'origin/cv-launch-plugin' into pool-test-apr-22"

This reverts commit 8715133.

* this is the coolest commit ever

* Manually patch remote_launch fix

* Fix typos in buoy task

* Fix typos in buoy task

* Please stop replacing our working code with test code

* Changes made at pool test

* Added main yolov8n and yolov7-tiny models

* Implement custom_autodiscovery

* Update docs

* Ensure active topic thruster_controls publishes to

* linted code

* Add nmap to dockerfile

* Add readme2

* Update README2.md

* Update README2.md

* update

* Update rm2.md

* Update README2.md

* Readme2.md

* Swap x, y; negate z

* deleted pressure sensor error message

* imu quat changes

* added fixes to robot_localization

* example pressure sensor

* Thruster temp

* Sh scripts

* Remove comma

* Add depth to sensor_fusion

* Change air pressure

* Sync

* Comment out thruster publish log

* Pool test changes (global state works!)

* Fix state by negating y_vel

* Change baud rate

* remove ?

* added dual serial thruster code

* stuff

* dual arduino, consistent thruster speeds, pressure included

* Update README.md

* Update test_state_publisher.py

* Update README.md with dual_upload

* the best readme

* cleaned arduino code, arduino readme

* Rename pressure_converter to pressure_stamper

* Delete

* noted pressure stamping in readme

* CV sonar syncing

* Flipped bottom thrusters in oogway config

* Disabled all Z inputs to state except pressure sensor

* Changes to PID constants to hold depth

* Sonar update

* Jank code to move to CV in test state publisher

* updated angle algorithm

* Fixed minor issue with angle offset calculation

* Added constant sonar sweeping

* task_planning code

* Part 1 of Big Changes to CV Task Planning

* adding task planning

* Added vectornav package

* unflipped bottom thrusters

* Adjusted velocity PID

* Adjusted local pose goal in test state publisher

* Commented IMU out of data pub

* Added hard cap to pressure sensor

* Changed IMU sensor fusion config to use vectornav

* commit test_state_publisher.py

* Position PID

Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>

* Test state pub

* Add usb camera

* Add sensors, vectornav

* Remove velocity pid

* Fix sonar

* Fix arduino connect?

* Add record sh

* Gate task

* bugfix

* commit record

* comp stuff

* Added y offset angle

* Updated sonar message

* Fix tmux run.sh

* Save changes before pool test

* Using camera for robot y

* Forgot tuples are immutable lol

* Updated tmux script

* New arduino

* Negated sonar Y

* Changed sonar range to 5

* Removed unused code and updated cv gate

* Revert "Change controls to use ROS Actions (#383)"

This reverts commit 3850fbb.

* Move in steps

* Use topics

* Use topics not actions

* REMOVE SONAR

* Test state with topics

* Increase roll, pitch

* taskplanning

* Fixed deg to rad conversion

* test state publisher updates

* fixed bug for desired_state.py

* move through gate with style

* fixed dead reckon gate with style

* Updated CV GUI perspective file

* Add

* hello

* serial pressure reader

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* Removed pressure arduino from offboard comms launch file and added new pressure script to data pub launch file

* Changed pressure sensor topic to sensors/depth

* arduino serial for pressure, no ros

* changed port

* arduino no longer disconnects

* updated readme for data pub and offboard comms

* checkout to master for all non-depth changes

* removed files

* forgot to re-change actual changes

* other data_pub changes removed

* removed pressure_stamper changes from pr

* fixed comments and deleted IMU files

* added FTDI string for pressrue sensor

* fuck the linter

* fuck the linter x2

* fuck the linter x3

* fuck the linter x4

---------

Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Cthulhu <--global>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>

* dual upload removed tabs (#467)

Co-authored-by: Michael Bryant <mcb115@duke.edu>

* Delete

* Update to template

* Update deps

* Add watch

* Fix ts bug

* Change eslint to json and add endofline auto

* Update actions

* Add comment linting

* Fix lint bug

* Format

* Add comments

* Finish

* Finish

* Format

* Address PR

* Type response and error on failure

* Increase comments

* Update comments

* Update comments

* Use box instead of div

---------

Co-authored-by: Maxwell Lin <28914712+maxwellmlin@users.noreply.github.com>
Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>
Co-authored-by: DRC <hello@duke-robotics.com>
Co-authored-by: Nathanael Ren <nr189@duke.edu>
Co-authored-by: Michael Bryant <76832019+mbryant2025@users.noreply.github.com>
Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>
maxwellmlin added a commit that referenced this pull request Nov 4, 2023
* Initial template

* Update version

* Implement toggle-controls-panel

Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>

* Fix numerous bugs relating to context

* Use MUI Alert

* Update

* Cross-platform install script

* Add final print

* Add linebreak between extensions

* Fix alert not showing up bug

* Update component names

* add todo

* Cross platform

* Typo

* Lint

* added disabling if context.callService not available

* Arduino disconnect fix -- migrated one ROS node to raw serial (#464)

* Set default button state to disabled

* Initial framework

* Always show all 4 rows

* Update READMEs

* Refactor hardcoded topic types

* Rename variable

* modified labeling in detection visualizer class

* Made camera hard reset executable

* Only update on camera_relay_status publish

* Move button setEnable to clock

* Finished 4 tasks in RQT Launch Plugin Improvements issue, haven't tested the last two yet

* looked over everything with Rico for CV

* Removed unnecessary translations

* Added launch args for show class name and show confidence to simulate detection

* finished testing for remove_nodes_manually and running_status_column

* fixed sonar.launch

* hello

* minor changes

* minor changes

* Remove relay from table

* Remove relay from table

* Fix hardcoded topic names

* Remove relay topics on close

* Move button to right

* added test_id

* fixed the launch sonar file by adding port

* Finished remaining tasks in RQT Launch Plugin Improvements

* Revert: use relay in table

* Refactor

* fixed bug

* finished incorporating new class & confidence args

* Refactor

* Update default button state

* Revert to original width

* Final cleanup

* Took care of active threads before the widget is closed

* Updated readme file

* added comments to modified code

* changed all instances of camelCase to snake_case

* Implemented functionality to create and remove subscribers when topic becomes active and inactive

* fixed lint errors

* Removed unnecessary models

* Added colors to 2023 models

* Make CV interface load topics from file

* Deleted extra file

* Added extra docker line

* Fixed weights file name of yolov7-tiny

* fixed linter

* fixed subscribers

* Exclude sonar from automatic testing

* added string for oogway

* 1Hz publishing; normally closed relay change

* testing non-smach movement

* updated readme for new relay config

* Pool Test CV Sonar Fixes (#428)

* Removed debug code

* Fixed cv sonar sync issue

* Changed using_sonar to default to True

* Initial changes

* Fix linting

* Finish

* the table updates when display all nodes is checked

* Changed sensor widget to use desired power action

* Resolve merge conflict?

* Created sensors.launch file and removed service call from depthai_spatial_detection

* initialize relay timer

* relay timer

* Passed sonar image upstream

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Changed default sonar settings

* Fixed sensor widget

* Updated sonar topic name

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Added polar images

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added query for sonar image publisher

* nonsense

* Revert "Merge remote-tracking branch 'origin/cv-launch-plugin' into pool-test-apr-22"

This reverts commit 8715133.

* this is the coolest commit ever

* Manually patch remote_launch fix

* Fix typos in buoy task

* Fix typos in buoy task

* Please stop replacing our working code with test code

* Changes made at pool test

* Added main yolov8n and yolov7-tiny models

* Implement custom_autodiscovery

* Update docs

* Ensure active topic thruster_controls publishes to

* linted code

* Add nmap to dockerfile

* Add readme2

* Update README2.md

* Update README2.md

* update

* Update rm2.md

* Update README2.md

* Readme2.md

* Swap x, y; negate z

* deleted pressure sensor error message

* imu quat changes

* added fixes to robot_localization

* example pressure sensor

* Thruster temp

* Sh scripts

* Remove comma

* Add depth to sensor_fusion

* Change air pressure

* Sync

* Comment out thruster publish log

* Pool test changes (global state works!)

* Fix state by negating y_vel

* Change baud rate

* remove ?

* added dual serial thruster code

* stuff

* dual arduino, consistent thruster speeds, pressure included

* Update README.md

* Update test_state_publisher.py

* Update README.md with dual_upload

* the best readme

* cleaned arduino code, arduino readme

* Rename pressure_converter to pressure_stamper

* Delete

* noted pressure stamping in readme

* CV sonar syncing

* Flipped bottom thrusters in oogway config

* Disabled all Z inputs to state except pressure sensor

* Changes to PID constants to hold depth

* Sonar update

* Jank code to move to CV in test state publisher

* updated angle algorithm

* Fixed minor issue with angle offset calculation

* Added constant sonar sweeping

* task_planning code

* Part 1 of Big Changes to CV Task Planning

* adding task planning

* Added vectornav package

* unflipped bottom thrusters

* Adjusted velocity PID

* Adjusted local pose goal in test state publisher

* Commented IMU out of data pub

* Added hard cap to pressure sensor

* Changed IMU sensor fusion config to use vectornav

* commit test_state_publisher.py

* Position PID

Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>

* Test state pub

* Add usb camera

* Add sensors, vectornav

* Remove velocity pid

* Fix sonar

* Fix arduino connect?

* Add record sh

* Gate task

* bugfix

* commit record

* comp stuff

* Added y offset angle

* Updated sonar message

* Fix tmux run.sh

* Save changes before pool test

* Using camera for robot y

* Forgot tuples are immutable lol

* Updated tmux script

* New arduino

* Negated sonar Y

* Changed sonar range to 5

* Removed unused code and updated cv gate

* Revert "Change controls to use ROS Actions (#383)"

This reverts commit 3850fbb.

* Move in steps

* Use topics

* Use topics not actions

* REMOVE SONAR

* Test state with topics

* Increase roll, pitch

* taskplanning

* Fixed deg to rad conversion

* test state publisher updates

* fixed bug for desired_state.py

* move through gate with style

* fixed dead reckon gate with style

* Updated CV GUI perspective file

* Add

* hello

* serial pressure reader

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* Removed pressure arduino from offboard comms launch file and added new pressure script to data pub launch file

* Changed pressure sensor topic to sensors/depth

* arduino serial for pressure, no ros

* changed port

* arduino no longer disconnects

* updated readme for data pub and offboard comms

* checkout to master for all non-depth changes

* removed files

* forgot to re-change actual changes

* other data_pub changes removed

* removed pressure_stamper changes from pr

* fixed comments and deleted IMU files

* added FTDI string for pressrue sensor

* fuck the linter

* fuck the linter x2

* fuck the linter x3

* fuck the linter x4

---------

Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Cthulhu <--global>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>

* dual upload removed tabs (#467)

Co-authored-by: Michael Bryant <mcb115@duke.edu>

* Delete

* Update to template

* Update deps

* Add watch

* Fix ts bug

* Change eslint to json and add endofline auto

* Update actions

* Add comment linting

* Fix lint bug

* Format

* Add comments

* Finish

* Finish

* Format

* Address PR

* Type response and error on failure

* Increase comments

* Update comments

* Update comments

* Use box instead of div

---------

Co-authored-by: Maxwell Lin <28914712+maxwellmlin@users.noreply.github.com>
Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>
Co-authored-by: DRC <hello@duke-robotics.com>
Co-authored-by: Nathanael Ren <nr189@duke.edu>
Co-authored-by: Michael Bryant <76832019+mbryant2025@users.noreply.github.com>
Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>
maxwellmlin added a commit that referenced this pull request Nov 4, 2023
* Initial template

* Update version

* Implement toggle-controls-panel

Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>

* Fix numerous bugs relating to context

* Use MUI Alert

* Update

* Cross-platform install script

* Add final print

* Add linebreak between extensions

* Fix alert not showing up bug

* Update component names

* add todo

* Cross platform

* Typo

* Lint

* added disabling if context.callService not available

* Arduino disconnect fix -- migrated one ROS node to raw serial (#464)

* Set default button state to disabled

* Initial framework

* Always show all 4 rows

* Update READMEs

* Refactor hardcoded topic types

* Rename variable

* modified labeling in detection visualizer class

* Made camera hard reset executable

* Only update on camera_relay_status publish

* Move button setEnable to clock

* Finished 4 tasks in RQT Launch Plugin Improvements issue, haven't tested the last two yet

* looked over everything with Rico for CV

* Removed unnecessary translations

* Added launch args for show class name and show confidence to simulate detection

* finished testing for remove_nodes_manually and running_status_column

* fixed sonar.launch

* hello

* minor changes

* minor changes

* Remove relay from table

* Remove relay from table

* Fix hardcoded topic names

* Remove relay topics on close

* Move button to right

* added test_id

* fixed the launch sonar file by adding port

* Finished remaining tasks in RQT Launch Plugin Improvements

* Revert: use relay in table

* Refactor

* fixed bug

* finished incorporating new class & confidence args

* Refactor

* Update default button state

* Revert to original width

* Final cleanup

* Took care of active threads before the widget is closed

* Updated readme file

* added comments to modified code

* changed all instances of camelCase to snake_case

* Implemented functionality to create and remove subscribers when topic becomes active and inactive

* fixed lint errors

* Removed unnecessary models

* Added colors to 2023 models

* Make CV interface load topics from file

* Deleted extra file

* Added extra docker line

* Fixed weights file name of yolov7-tiny

* fixed linter

* fixed subscribers

* Exclude sonar from automatic testing

* added string for oogway

* 1Hz publishing; normally closed relay change

* testing non-smach movement

* updated readme for new relay config

* Pool Test CV Sonar Fixes (#428)

* Removed debug code

* Fixed cv sonar sync issue

* Changed using_sonar to default to True

* Initial changes

* Fix linting

* Finish

* the table updates when display all nodes is checked

* Changed sensor widget to use desired power action

* Resolve merge conflict?

* Created sensors.launch file and removed service call from depthai_spatial_detection

* initialize relay timer

* relay timer

* Passed sonar image upstream

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Changed default sonar settings

* Fixed sensor widget

* Updated sonar topic name

* Fixed sonar_publisher.py

* Fixed sonar_publisher.py

* Added polar images

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added polar images

* Added polar images

* Fixed RemoteLaunchInfo issue

* Added query for sonar image publisher

* nonsense

* Revert "Merge remote-tracking branch 'origin/cv-launch-plugin' into pool-test-apr-22"

This reverts commit 8715133.

* this is the coolest commit ever

* Manually patch remote_launch fix

* Fix typos in buoy task

* Fix typos in buoy task

* Please stop replacing our working code with test code

* Changes made at pool test

* Added main yolov8n and yolov7-tiny models

* Implement custom_autodiscovery

* Update docs

* Ensure active topic thruster_controls publishes to

* linted code

* Add nmap to dockerfile

* Add readme2

* Update README2.md

* Update README2.md

* update

* Update rm2.md

* Update README2.md

* Readme2.md

* Swap x, y; negate z

* deleted pressure sensor error message

* imu quat changes

* added fixes to robot_localization

* example pressure sensor

* Thruster temp

* Sh scripts

* Remove comma

* Add depth to sensor_fusion

* Change air pressure

* Sync

* Comment out thruster publish log

* Pool test changes (global state works!)

* Fix state by negating y_vel

* Change baud rate

* remove ?

* added dual serial thruster code

* stuff

* dual arduino, consistent thruster speeds, pressure included

* Update README.md

* Update test_state_publisher.py

* Update README.md with dual_upload

* the best readme

* cleaned arduino code, arduino readme

* Rename pressure_converter to pressure_stamper

* Delete

* noted pressure stamping in readme

* CV sonar syncing

* Flipped bottom thrusters in oogway config

* Disabled all Z inputs to state except pressure sensor

* Changes to PID constants to hold depth

* Sonar update

* Jank code to move to CV in test state publisher

* updated angle algorithm

* Fixed minor issue with angle offset calculation

* Added constant sonar sweeping

* task_planning code

* Part 1 of Big Changes to CV Task Planning

* adding task planning

* Added vectornav package

* unflipped bottom thrusters

* Adjusted velocity PID

* Adjusted local pose goal in test state publisher

* Commented IMU out of data pub

* Added hard cap to pressure sensor

* Changed IMU sensor fusion config to use vectornav

* commit test_state_publisher.py

* Position PID

Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>

* Test state pub

* Add usb camera

* Add sensors, vectornav

* Remove velocity pid

* Fix sonar

* Fix arduino connect?

* Add record sh

* Gate task

* bugfix

* commit record

* comp stuff

* Added y offset angle

* Updated sonar message

* Fix tmux run.sh

* Save changes before pool test

* Using camera for robot y

* Forgot tuples are immutable lol

* Updated tmux script

* New arduino

* Negated sonar Y

* Changed sonar range to 5

* Removed unused code and updated cv gate

* Revert "Change controls to use ROS Actions (#383)"

This reverts commit 3850fbb.

* Move in steps

* Use topics

* Use topics not actions

* REMOVE SONAR

* Test state with topics

* Increase roll, pitch

* taskplanning

* Fixed deg to rad conversion

* test state publisher updates

* fixed bug for desired_state.py

* move through gate with style

* fixed dead reckon gate with style

* Updated CV GUI perspective file

* Add

* hello

* serial pressure reader

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* yes

* Removed pressure arduino from offboard comms launch file and added new pressure script to data pub launch file

* Changed pressure sensor topic to sensors/depth

* arduino serial for pressure, no ros

* changed port

* arduino no longer disconnects

* updated readme for data pub and offboard comms

* checkout to master for all non-depth changes

* removed files

* forgot to re-change actual changes

* other data_pub changes removed

* removed pressure_stamper changes from pr

* fixed comments and deleted IMU files

* added FTDI string for pressrue sensor

* fuck the linter

* fuck the linter x2

* fuck the linter x3

* fuck the linter x4

---------

Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Cthulhu <--global>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>

* dual upload removed tabs (#467)

Co-authored-by: Michael Bryant <mcb115@duke.edu>

* Delete

* Update to template

* Update deps

* Add watch

* Fix ts bug

* Change eslint to json and add endofline auto

* Update actions

* Add comment linting

* Fix lint bug

* Format

* Add comments

* Finish

* Finish

* Format

* Address PR

* Type response and error on failure

* Increase comments

* Update comments

* Update comments

* Use box instead of div

---------

Co-authored-by: Maxwell Lin <28914712+maxwellmlin@users.noreply.github.com>
Co-authored-by: Nathanael Ren <nathanaelren@users.noreply.github.com>
Co-authored-by: Mason Wu <mmmmason@users.noreply.github.com>
Co-authored-by: calvinlchen <calvinlchen@users.noreply.github.com>
Co-authored-by: roguerreiro <roguerreiro@users.noreply.github.com>
Co-authored-by: Hung Le <viethungle-vt1401@users.noreply.github.com>
Co-authored-by: DRC <hello@duke-robotics.com>
Co-authored-by: Nathanael Ren <nr189@duke.edu>
Co-authored-by: Michael Bryant <76832019+mbryant2025@users.noreply.github.com>
Co-authored-by: Maxwell Lin <maxwellmlin@gmail.com>
Co-authored-by: Rico Zhu <ricozhuthegreat@hotmail.com>
Co-authored-by: Amir Ergashev <amir.ergashev@duke.edu>
Co-authored-by: Oogway <bot@duke-robotics.com>
Co-authored-by: gummydumpling-2001 <69725888+gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Ethan Horowitz <ethan.horowitz@duke.edu>
Co-authored-by: Will-Denton <wildenton@outlook.com>
Co-authored-by: Brokemia <37253216+Brokemia@users.noreply.github.com>
Co-authored-by: Vedarsh Shah <vedarsh.shah@gmail.com>
Co-authored-by: Michael Bryant <mcb115@duke.edu>
Co-authored-by: Rico Zhu <33135503+ricohasgithub@users.noreply.github.com>
Co-authored-by: Will Denton <92223701+Will-Denton@users.noreply.github.com>
Co-authored-by: vedarshshah <vedarshshah@users.noreply.github.com>
Co-authored-by: gummydumpling-2001 <gummydumpling-2001@users.noreply.github.com>
Co-authored-by: Will Denton <Will-Denton@users.noreply.github.com>
Co-authored-by: AndrewCouncil <andrew.p.council@gmail.com>
Co-authored-by: wrd10 <wrd10@duke.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gui Related to robot GUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Toggle Controls Panel
6 participants