Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Implement controllers for rudder and sail actuation mechanisms #78

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open

Implement controllers for rudder and sail actuation mechanisms #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
766efb3
Initial PID Controller Class implementation and testing
stevenxu27 Dec 1, 2023
b2fba8d
step function testing
stevenxu27 Dec 1, 2023
ce69ed4
Add TODO comments
DFriend01 Dec 3, 2023
3ab326b
Properties Change
stevenxu27 Dec 3, 2023
4e573e1
Derivative and last_error changes
stevenxu27 Dec 3, 2023
b0ae91f
integral, list changes
stevenxu27 Dec 3, 2023
8543ac2
Final implementation changes
stevenxu27 Dec 3, 2023
c6600ec
Reformatting and adding types
DFriend01 Dec 3, 2023
e43ed0e
Change error computation to target - current for consistency
DFriend01 Dec 3, 2023
0da3a27
PID Controller testing
stevenxu27 Dec 3, 2023
b5ad5b6
Set integral sum to zero in reset
DFriend01 Dec 3, 2023
6ee15d9
Update notebook with new template robot arm
DFriend01 Dec 3, 2023
392c138
PID Notebook Implementation
stevenxu27 Dec 3, 2023
8f5eb24
Move import statement
DFriend01 Dec 3, 2023
b612f70
Achieved a steady state error
DFriend01 Dec 3, 2023
e508d2d
Deleted concurrency code
stevenxu27 Feb 27, 2024
26c9aac
Wrong branch
stevenxu27 Feb 27, 2024
09246b0
Deleted concurrency code that cancels in progress jobs
stevenxu27 Feb 27, 2024
1107d82
In-progress controller implementation
stevenxu27 Mar 6, 2024
537e355
Finished implementation of Controllers, need to complete testing
stevenxu27 Mar 8, 2024
2d83ab3
Basic tests and controller fixes - test software not working
stevenxu27 Mar 9, 2024
a8a6bf8
Deleted PID Controller Files
stevenxu27 Mar 9, 2024
da3afdd
Changes before the merge - no errors
stevenxu27 Mar 9, 2024
a07f573
Merge branch 'main' into user/stevenxu27/68-Rudder-and-Sail-Controllers
eomielan Mar 9, 2024
d485f9a
Testing changes
stevenxu27 Mar 9, 2024
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
5 changes: 0 additions & 5 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ on:
pull_request:
workflow_dispatch:

# Cancel in-progress runs for the current workflow
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
# CI for all UBCSailbot repositories defined in one place
# Runs another workflow: https://docs.github.com/en/actions/using-workflows/reusing-workflows#calling-a-reusable-workflow
Expand Down
169 changes: 0 additions & 169 deletions boat_simulator/nodes/low_level_control/control.py
View file
Open in desktop

This file was deleted.

Loading
Loading