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.

Sign up for GitHub

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

Jump to bottom

Elevator subsystem #13

Merged
merged 20 commits into from
Feb 3, 2025
Merged

Elevator subsystem #13

merged 20 commits into from
Feb 3, 2025

Conversation

hehongyi0217
Copy link
Contributor

feat:ElevatorSubsystem 框架

Hannahjjj97
Hannahjjj97 requested changes Jan 24, 2025
View reviewed changes
Copy link
Contributor

@Hannahjjj97 Hannahjjj97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

有紅線喔

Hannahjjj97
Hannahjjj97 requested changes Jan 24, 2025
View reviewed changes
Copy link
Contributor

@Hannahjjj97 Hannahjjj97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不要動到 Vendor 喔，這個 branch 是屬於 elevator 的

@kennhung
Copy link
Member

建議整個 branch 重做
然後cherry pick要的commit 就好

kennhung
kennhung requested changes Jan 24, 2025
View reviewed changes
Copy link
Member

@kennhung kennhung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

還是有動到 vendordeps/WPILibNewCommands.json 檔案
應該要完全沒有相關的 Changes

@kennhung kennhung force-pushed the ElevatorSubsystem branch 2 times, most recently from 3fec15f to e3e5c62 Compare January 24, 2025 11:58
@kennhung kennhung mentioned this pull request Jan 24, 2025
Closed
@hehongyi0217
Fix:Remove the Vendor
7baaed5 
移除了有問題的vendor檔案
@hehongyi0217
feat:ElevatorSubsystem
5060d83 
移除了錯誤的Vendor檔案
@Hannahjjj97
Copy link
Contributor

你什麼時候留校啊，要教你 cherry-pick

@Hannahjjj97
Copy link
Contributor

PR 須等程式完整才能使用

@hehongyi0217 hehongyi0217 marked this pull request as draft February 1, 2025 09:57
@BrianHu0925
feat: elevator
614b863 
增加功能 可以按按鈕到三層不同高度 也可以回到初始高度 可以切換成搖桿模式 手動調整高度 並加入limit switch
@BrianHu0925
Copy link
Contributor

打了一個段落 增加了使用PID到四種不同高度的方法 並添加必要常數 寫了一個模式切換的方法 到時候應該可以放到RobotContainer 就能切換按鈕控制或搖桿手動操作模式 加入limit switch 確保超過上限或下限會停止 搖桿控制有平滑過渡的偵測 一次推太多的時候也不會暴衝 那些數值都還可以調 到時候可以放到Constants之類的 統一管理 大概就這樣

@BrianHu0925
Copy link
Contributor

阿對我還沒merge 我想說等你們看完再說

@BrianHu0925
feat: ToDefaultPositionCmd
85a771d 
發現忘記加回到初始位置的 Command 把他加上去
@BrianHu0925
style: formatting
2b6cf10 
嘗試照著 checkstyle 想要的方式改了一些順序
@BrianHu0925
style; formatting
e95da97 
又改了一次
@BrianHu0925
style: formatting
da2bcca 
應該是最後一次了
@BrianHu0925
style: formatting
b5b167c 
他都不一次講完 又改一次順序
@BrianHu0925
style: formatting
795db09
@BrianHu0925
style: formatting
3faa2d1 
最後
@BrianHu0925
Copy link
Contributor

喔耶我把叉叉用掉了

@hehongyi0217
fix:Elevator Subsystem
041ce6a 
修改了命名上的問題
@hehongyi0217
feat:Elevator Subsystem
87d007c 
新增了運行的程式碼
@hehongyi0217 hehongyi0217 marked this pull request as ready for review February 2, 2025 06:58
kennhung
kennhung requested changes Feb 2, 2025
View reviewed changes
Copy link
Member

@kennhung kennhung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

馬達不一定使用 CANSparkMAX
不要把 joystick 傳入 subsystem，應該要包裝 joystick

hehongyi0217 and others added 3 commits February 2, 2025 17:37
@hehongyi0217
fix:ElevatorSubsystem
ed416fe 
移除了應當放在command的程式碼以及註釋留下一些之後可能要改的東西
@BrianHu0925
feat: moveToHeight method
67c2e70 
把他放進了 periodic 就會一直重複執行 我不確定這樣改對不對
@BrianHu0925
style: formatting
9dcda91
@BrianHu0925
Copy link
Contributor

我把 moveToHeight 方法裡面的東東放進了 periodic 然後再改了一下排版 再幫我看一下我這樣寫對不對

@Hannahjjj97 Hannahjjj97 changed the base branch from main to ALGAE-IntakeSubsystem February 3, 2025 11:57
@BrianHu0925 BrianHu0925 merged commit 95687d8 into ALGAE-IntakeSubsystem Feb 3, 2025
5 checks passed
@BrianHu0925 BrianHu0925 mentioned this pull request Feb 4, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennhung kennhung kennhung requested changes

@Hannahjjj97 Hannahjjj97 Hannahjjj97 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hehongyi0217 @kennhung @Hannahjjj97 @BrianHu0925 @felixkuo0504