Code

Development merge from pool test#1

Code

Open

jheidegger wants to merge 141 commits intoreleasepurduerov/X14-Core:releasefrom developmentpurduerov/X14-Core:developmentCopy head branch name to clipboard

+5,243-5,041

Commits

Commits on Apr 11, 2021

• rewritten slider to use hooks

  ivanscode

  committed
  70451d3

  Copy full SHA for 70451d3

Commits on Apr 12, 2021

• added default props to slider hook

  ivanscode

  committed
  a64f223

  Copy full SHA for a64f223

• ThrustTweaker converted to use hooks

  ivanscode

  committed
  d7937d1

  Copy full SHA for d7937d1

• removed unused node

  ivanscode

  committed
  e5ad85c

  Copy full SHA for e5ad85c

• sliders should be integrated, need testing

  ivanscode

  committed
  10c4834

  Copy full SHA for 10c4834

• post pool test

  ivanscode

  committed
  5e2aeb9

  Copy full SHA for 5e2aeb9

Commits on Apr 13, 2021

• camera rewritten to use hooks

  ivanscode

  committed
  c3d0602

  Copy full SHA for c3d0602

• log rewritten to use hooks

  ivanscode

  committed
  6a914b9

  Copy full SHA for 6a914b9

Commits on Apr 14, 2021

• servo moved to hooks

  ivanscode

  committed
  329c8f3

  Copy full SHA for 329c8f3

• ThrusterCircle moved to hooks

  ivanscode

  committed
  53eda00

  Copy full SHA for 53eda00

• ThrusterInfo moved to hooks

  ivanscode

  committed
  12bb1ce

  Copy full SHA for 12bb1ce

• MainWindow moved to hooks

  ivanscode

  committed
  61ab9cf

  Copy full SHA for 61ab9cf

• tweaker layout fixed

  ivanscode

  committed
  98ad3f6

  Copy full SHA for 98ad3f6

• pool test cleanup

  jheidegger

  committed
  9d14cd1

  Copy full SHA for 9d14cd1

• Merge branch 'development' of https://github.com/purduerov/X13-Core into development

  jheidegger

  committed
  fdad7a2

  Copy full SHA for fdad7a2

• fixed inner git repo

  jheidegger

  committed
  a61b0a8

  Copy full SHA for a61b0a8

• cleaned control and launch files

  jheidegger

  committed
  a4949c9

  Copy full SHA for a4949c9

• initial cleanup

  ivanscode

  committed
  0b2081a

  Copy full SHA for 0b2081a

• removed swp files

  ivanscode

  committed
  b4144b0

  Copy full SHA for b4144b0

• Merge remote-tracking branch 'origin/cleanup' into ros-cleanup

  ivanscode

  committed
  4c26073

  Copy full SHA for 4c26073

Commits on Apr 15, 2021

• added hardware constants again

  jheidegger

  committed
  ad23c94

  Copy full SHA for ad23c94

• thrust_mapping is back

  jheidegger

  committed
  b4994d7

  Copy full SHA for b4994d7

• compensator init

  ivanscode

  committed
  4c844cc

  Copy full SHA for 4c844cc

• ThrusterCircle fix

  ivanscode

  committed
  aaadb61

  Copy full SHA for aaadb61

• colors added

  ivanscode

  committed
  82b9d20

  Copy full SHA for 82b9d20

Commits on Apr 16, 2021

• added maxwidth to cameraframe | compensator now responds to grid layout

  ivanscode

  committed
  e828786

  Copy full SHA for e828786

• to test for servo

  jasonbleasdell

  committed
  7b16fcf

  Copy full SHA for 7b16fcf

• servo completly works now and bounds are set

  jheidegger

  committed
  071bc7c

  Copy full SHA for 071bc7c

Commits on Apr 17, 2021

• Changed slider behavior

  ivanscode

  committed
  13bebb2

  Copy full SHA for 13bebb2

• Merge branch 'compensator' into surface

  ivanscode

  committed
  306d5f3

  Copy full SHA for 306d5f3

• Added CoM sliders

  ivanscode

  committed
  e1fb01e

  Copy full SHA for e1fb01e

Commits on Apr 19, 2021

• Merge pull request #15 from purduerov/servoTesting

  Show description for 21b1f01
  jheidegger

  authored
  21b1f01

  Copy full SHA for 21b1f01

Commits on Apr 21, 2021

• post sunday pool test

  jheidegger

  committed
  e7b2e06

  Copy full SHA for e7b2e06

• moving stuff around

  ivanscode

  committed
  2fc29df

  Copy full SHA for 2fc29df

• resolved

  ivanscode

  committed
  28fda95

  Copy full SHA for 28fda95

• Merge branch 'cleanup' into development

  ivanscode

  committed
  cdb56a5

  Copy full SHA for cdb56a5

• fixed gamepad listener bug

  ivanscode

  committed
  c1dbb21

  Copy full SHA for c1dbb21

• small workouround for procs not dying

  ivanscode

  committed
  97d9558

  Copy full SHA for 97d9558

Commits on Apr 22, 2021

• wip

  ivanscode

  committed
  4b57eac

  Copy full SHA for 4b57eac

• servo fixed

  ivanscode

  committed
  145c66b

  Copy full SHA for 145c66b

• Working trim and CoM

  ivanscode

  committed
  eb6b639

  Copy full SHA for eb6b639

Commits on Apr 23, 2021

• Changed intial starting angle of the servo

  Show description for b3e6b2a
  jasonbleasdell

  authored
  b3e6b2a

  Copy full SHA for b3e6b2a

• Merge pull request #17 from purduerov/jasonbleasdell-patch-1

  Show description for 67b1056
  ivanscode

  authored
  67b1056

  Copy full SHA for 67b1056

Commits on Apr 24, 2021

• post pool test 4/23

  ivanscode

  committed
  5d10c23

  Copy full SHA for 5d10c23

• post pool test april 23

  jheidegger

  committed
  c64f185

  Copy full SHA for c64f185

• Merge branch 'development' of https://github.com/purduerov/X13-Core into development

  jheidegger

  committed
  17b819e

  Copy full SHA for 17b819e

• Slider broken

  ivanscode

  committed
  8fde5b5

  Copy full SHA for 8fde5b5

• changed CoM range

  ivanscode

  committed
  f1d3cec

  Copy full SHA for f1d3cec

• sliders fixed

  ivanscode

  committed
  ffcecb3

  Copy full SHA for ffcecb3

• Merge branch 'profiles' into surface

  ivanscode

  committed
  b35c123

  Copy full SHA for b35c123

• added timestamp to servo

  ivanscode

  committed
  48e0634

  Copy full SHA for 48e0634

• removed dist files

  ivanscode

  committed
  e0734b9

  Copy full SHA for e0734b9

• com update and removed ramping

  jheidegger

  committed
  589c86d

  Copy full SHA for 589c86d

• Merge pull request #18 from purduerov/ros-jonathan

  Show description for 6b8c98d
  ivanscode

  authored
  6b8c98d

  Copy full SHA for 6b8c98d

• Merge pull request #19 from purduerov/surface

  Show description for fffaefe
  jheidegger

  authored
  fffaefe

  Copy full SHA for fffaefe

Commits on Apr 26, 2021

• post pool test

  ivanscode

  committed
  48150a2

  Copy full SHA for 48150a2

Commits on Apr 28, 2021

• ?

  ivanscode

  committed
  c76b3fb

  Copy full SHA for c76b3fb

• Fixed layout | added colors to Log

  ivanscode

  committed
  62f3144

  Copy full SHA for 62f3144

Commits on Apr 29, 2021

• tested for 4/30

  ivanscode

  committed
  97f5e9f

  Copy full SHA for 97f5e9f

Commits on May 1, 2021

• Added tools image

  ivanscode

  committed
  b8c5229

  Copy full SHA for b8c5229

• added the dumb dumb

  jasonbleasdell

  committed
  abb90ea

  Copy full SHA for abb90ea

• Added switch

  ivanscode

  committed
  717d7ad

  Copy full SHA for 717d7ad

• removed duplicate image

  ivanscode

  committed
  4d2a17b

  Copy full SHA for 4d2a17b

• changed the thruste mapper a bit

  jheidegger

  committed
  a71f8e0

  Copy full SHA for a71f8e0

Commits on May 3, 2021

• direct to tools

  

  jheidegg

  committed
  91bd185

  Copy full SHA for 91bd185

• added all solenoid test

  

  jheidegg

  committed
  9476bf6

  Copy full SHA for 9476bf6

• thrusters running with this

  

  jheidegg

  committed
  b6692ba

  Copy full SHA for b6692ba

• Merge pull request #20 from purduerov/jasonMadeDumbServo

  Show description for e0dcab0
  jheidegger

  authored
  e0dcab0

  Copy full SHA for e0dcab0

• Merge pull request #21 from purduerov/thrustdevel

  ivanscode

  authored
  4bfc267

  Copy full SHA for 4bfc267

• Merge pull request #22 from purduerov/tools-rewrite

  Show description for 4594c26
  jheidegger

  authored
  4594c26

  Copy full SHA for 4594c26

Commits on May 7, 2021

• should be working

  ivanscode

  committed
  ce2180f

  Copy full SHA for ce2180f

• Added reverse button

  ivanscode

  committed
  3690310

  Copy full SHA for 3690310

Commits on May 9, 2021

• Hexadecimal CAD IDs and more formats for solenoid state

  grantg012

  committed
  454fefe

  Copy full SHA for 454fefe

Commits on May 12, 2021

• Added a cleaner toggle | WIP on Profiles

  ivanscode

  committed
  9b2f480

  Copy full SHA for 9b2f480

Commits on May 15, 2021

• Add extra testing scripts

  grantg012

  committed
  67b0ae7

  Copy full SHA for 67b0ae7

Commits on May 16, 2021

• Tested on the pi

  grantg012

  committed
  79a5755

  Copy full SHA for 79a5755

Commits on May 19, 2021

• Merge pull request #23 from purduerov/grant-test-code

  Show description for f77cefc
  ivanscode

  authored
  f77cefc

  Copy full SHA for f77cefc

Commits on May 29, 2021

• latest and greatest

  ivanscode

  committed
  3309e04

  Copy full SHA for 3309e04

Commits on Jul 24, 2021

• Add script to receive CAN messages

  grantg012

  committed
  9d6a4d5

  Copy full SHA for 9d6a4d5

• Work the existing code just worked

  

  jheidegg

  committed
  5228fc2

  Copy full SHA for 5228fc2

Commits on Aug 4, 2021

• button setup

  

  Ivan Kouzmine

  authored and

  Ivan Kouzmine

  committed
  c67ae18

  Copy full SHA for c67ae18

• cv init

  ivanscode

  committed
  7e1bcb6

  Copy full SHA for 7e1bcb6

Commits on Aug 5, 2021

• Merge branch 'add-to-thrusters' into surface-dev

  ivanscode

  committed
  b9bddc0

  Copy full SHA for b9bddc0

• Merge pull request #24 from purduerov/surface-dev

  Show description for 9922f51
  ivanscode

  authored
  9922f51

  Copy full SHA for 9922f51

• Swapped Y translation sign

  ivanscode

  committed
  e36952a

  Copy full SHA for e36952a

• Added frame capture logic

  ivanscode

  committed
  3e7d357

  Copy full SHA for 3e7d357

• Fixed fine mode button

  ivanscode

  committed
  89a7223

  Copy full SHA for 89a7223

• Added Save Frame button

  ivanscode

  committed
  787939a

  Copy full SHA for 787939a

• Added fine mode scale slider

  ivanscode

  committed
  1b7d491

  Copy full SHA for 1b7d491

• Moved all controls under Profiles

  ivanscode

  committed
  85fb7e7

  Copy full SHA for 85fb7e7

• working yeet mode and fine mode scaling

  

  jheidegg

  committed
  13a666f

  Copy full SHA for 13a666f

• yeet mode and fine mode scaling added

  ivanscode

  committed
  5cb9343

  Copy full SHA for 5cb9343

• Added profiles for ThrustTweaker

  ivanscode

  committed
  a272dae

  Copy full SHA for a272dae

• Profiles fully implemented

  ivanscode

  committed
  99e6ca6

  Copy full SHA for 99e6ca6

• Camera frame fills vertical space and not blocked by other streams

  ivanscode

  committed
  03359aa

  Copy full SHA for 03359aa

• Added camera rotation persistence

  ivanscode

  committed
  e8680cf

  Copy full SHA for e8680cf

• Added several configurations to Profiles

  ivanscode

  committed
  47fdb75

  Copy full SHA for 47fdb75

• rail setup

  ivanscode

  committed
  59f450a

  Copy full SHA for 59f450a

• frames saved on button click

  ivanscode

  committed
  8f941c2

  Copy full SHA for 8f941c2

• test run

  ivanscode

  committed
  d649cb0

  Copy full SHA for d649cb0

• add cv to gitignore

  ivanscode

  committed
  f1046c1

  Copy full SHA for f1046c1

• post test

  ivanscode

  committed
  234e464

  Copy full SHA for 234e464

• possible COM fix

  ivanscode

  committed
  40a3abd

  Copy full SHA for 40a3abd

Commits on Aug 8, 2021

• Print the interpretation of telemetry data

  grantg012

  committed
  96a5ab9

  Copy full SHA for 96a5ab9

Commits on Aug 21, 2021

• Make the code CLEAN

  grantg012

  committed
  5c0193c

  Copy full SHA for 5c0193c

• Merge pull request #25 from purduerov/grant-can-rx

  Show description for af5a534
  ivanscode

  authored
  af5a534

  Copy full SHA for af5a534

Commits on Sep 22, 2021

• pi thrust control

  

  jheidegg

  committed
  073b884

  Copy full SHA for 073b884

• merge conflict

  

  jheidegg

  committed
  c0d7f63

  Copy full SHA for c0d7f63

Commits on Sep 29, 2021

• Updated ReadMe

  babelman20

  committed
  e736de3

  Copy full SHA for e736de3

• Fixed README update

  babelman20

  committed
  f153142

  Copy full SHA for f153142

• Merge pull request #2 from purduerov/X14-10-feature-BranchLearning

  Show description for 41f7f9e
  jheidegger

  authored
  41f7f9e

  Copy full SHA for 41f7f9e

• added pi_temp_node

  

  Torin1914

  committed
  e184707

  Copy full SHA for e184707

Commits on Oct 13, 2021

• removed outdated tf library. ready to test it on the pi and figure out how much I broke it

  

  Torin1914

  committed
  f2ae64d

  Copy full SHA for f2ae64d

• commented out some more stuff

  

  Torin1914

  committed
  c20cc61

  Copy full SHA for c20cc61

Commits on Oct 14, 2021

• Update pi_temp_node.py

  Torin1914

  authored
  4b0b404

  Copy full SHA for 4b0b404

• Merge pull request #3 from purduerov/X14-11-feature-pi_temp_node

  Show description for 567c6ce
  jheidegger

  authored
  567c6ce

  Copy full SHA for 567c6ce

• Merge pull request #4 from purduerov/X14-14-feature-imu-fix

  Show description for 7c5f44a
  jheidegger

  authored
  7c5f44a

  Copy full SHA for 7c5f44a

Commits on Oct 16, 2021

• Create README.md

  Hunter314

  authored
  f4f7e0b

  Copy full SHA for f4f7e0b

• Added ROS node for ESC data

  babelman20

  committed
  441f762

  Copy full SHA for 441f762

• Changed run order and added redundancy for rospy shutdown checks

  babelman20

  committed
  c77214a

  Copy full SHA for c77214a

• Stop running when stopped please

  babelman20

  committed
  466de55

  Copy full SHA for 466de55

• please stop when killed

  babelman20

  committed
  c20091d

  Copy full SHA for c20091d

• Ready for integration

  babelman20

  committed
  d31c787

  Copy full SHA for d31c787

Commits on Oct 18, 2021

• Merge pull request #5 from purduerov/surface

  Show description for e17b17c
  jheidegger

  authored
  e17b17c

  Copy full SHA for e17b17c

• Merge pull request #6 from purduerov/X14-5-feature-ESCdata

  Show description for 3287997
  jheidegger

  authored
  3287997

  Copy full SHA for 3287997

• Update rov_velocity_command.msg

  jheidegger

  authored
  a8fe297

  Copy full SHA for a8fe297

• Added ispoolcentric

  Hunter314

  committed
  0fd8064

  Copy full SHA for 0fd8064

• ROV velocity fix

  Hunter314

  committed
  c1eebfa

  Copy full SHA for c1eebfa

Commits on Dec 23, 2021

• Should be working version of slider component

  TenGui

  committed
  741788f

  Copy full SHA for 741788f

• Working version w/ enter key added

  TenGui

  committed
  2c87498

  Copy full SHA for 2c87498

• Added WIP clean-up

  TenGui

  committed
  6ad6509

  Copy full SHA for 6ad6509

• Cleaned Up Slider Component w/ sub Functional Components

  TenGui

  committed
  ffb9edb

  Copy full SHA for ffb9edb

• Cleaned up Slider Component with functional components

  TenGui

  committed
  90c57c9

  Copy full SHA for 90c57c9

Commits on Jan 15, 2022

• Merge pull request #7 from purduerov/X14-48-ServoComponentInput

  Show description for 04b9f85
  Hunter314

  authored
  04b9f85

  Copy full SHA for 04b9f85

Commits on Mar 10, 2022

• Update thrust_mapping.py

  Show description for 9f6a94f
  Hunter314

  authored
  9f6a94f

  Copy full SHA for 9f6a94f

• Update thrust_mapping.py

  Show description for 9119c84
  Hunter314

  authored
  9119c84

  Copy full SHA for 9119c84

Commits on Apr 9, 2022

• soleniod code

  jheidegger

  committed
  198e6b0

  Copy full SHA for 198e6b0

Commits on Apr 11, 2022

• added variable ip changing to compros

  jheidegger

  committed
  d2be954

  Copy full SHA for d2be954

• Merge branch 'development' of https://github.com/purduerov/X14-Core into development

  jheidegger

  committed
  7f39821

  Copy full SHA for 7f39821

Commits on Apr 20, 2022

• Pool test April 17

  jheidegger

  committed
  7ac324a

  Copy full SHA for 7ac324a

• Merge branch 'development' of https://github.com/purduerov/X14-Core into development

  jheidegger

  committed
  e3d84c9

  Copy full SHA for e3d84c9