Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
November 2021 Blimp Competition
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Shahrul Kamil bin Hassan
November 2021 Blimp Competition
Commits
4cccd3fc
Commit
4cccd3fc
authored
4 years ago
by
Zhaoliang Zheng
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/main' into main
parents
5c0af070
2e7b7f43
Branches
Branches containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Control/Feather Code - Aaron/Motor_Basic_Test/Motor_Basic_Test.ino
+31
-0
31 additions, 0 deletions
...eather Code - Aaron/Motor_Basic_Test/Motor_Basic_Test.ino
with
31 additions
and
0 deletions
Code/Control/Feather Code - Aaron/Motor_Basic_Test/Motor_Basic_Test.ino
+
31
−
0
View file @
4cccd3fc
...
@@ -25,6 +25,7 @@ void loop() {
...
@@ -25,6 +25,7 @@ void loop() {
motorVL
->
setSpeed
(
largeVal
);
motorVL
->
setSpeed
(
largeVal
);
motorVL
->
run
(
FORWARD
);
motorVL
->
run
(
FORWARD
);
delay
(
2000
);
delay
(
2000
);
<<<<<<<
HEAD
<<<<<<<
Updated
upstream
<<<<<<<
Updated
upstream
Serial
.
println
(
" Vertical Left - Backward Slow"
);
Serial
.
println
(
" Vertical Left - Backward Slow"
);
motorVL
->
setSpeed
(
smallVal
);
motorVL
->
setSpeed
(
smallVal
);
...
@@ -36,10 +37,18 @@ void loop() {
...
@@ -36,10 +37,18 @@ void loop() {
motorVL
->
run
(
BACKWARD
);
motorVL
->
run
(
BACKWARD
);
delay
(
2000
);
delay
(
2000
);
>>>>>>>
Stashed
changes
>>>>>>>
Stashed
changes
=======
Serial
.
println
(
" Vertical Left - Backward Slow"
);
motorVL
->
setSpeed
(
smallVal
);
motorVL
->
run
(
BACKWARD
);
delay
(
2000
);
Serial
.
println
(
" Vertical Right - Forward Fast"
);
>>>>>>>
main
motorVL
->
setSpeed
(
0
);
motorVL
->
setSpeed
(
0
);
motorVR
->
setSpeed
(
largeVal
);
motorVR
->
setSpeed
(
largeVal
);
motorVR
->
run
(
FORWARD
);
motorVR
->
run
(
FORWARD
);
delay
(
2000
);
delay
(
2000
);
<<<<<<<
HEAD
<<<<<<<
Updated
upstream
<<<<<<<
Updated
upstream
Serial
.
println
(
" Vertical Right - Backward Slow"
);
Serial
.
println
(
" Vertical Right - Backward Slow"
);
motorVR
->
setSpeed
(
smallVal
);
motorVR
->
setSpeed
(
smallVal
);
...
@@ -51,25 +60,39 @@ void loop() {
...
@@ -51,25 +60,39 @@ void loop() {
motorVR
->
run
(
BACKWARD
);
motorVR
->
run
(
BACKWARD
);
delay
(
2000
);
delay
(
2000
);
>>>>>>>
Stashed
changes
>>>>>>>
Stashed
changes
=======
Serial
.
println
(
" Vertical Right - Backward Slow"
);
motorVR
->
setSpeed
(
smallVal
);
motorVR
->
run
(
BACKWARD
);
delay
(
2000
);
Serial
.
println
(
" Horizontal Left - Forward Fast"
);
>>>>>>>
main
motorVR
->
setSpeed
(
0
);
motorVR
->
setSpeed
(
0
);
motorHL
->
setSpeed
(
largeVal
);
motorHL
->
setSpeed
(
largeVal
);
motorHL
->
run
(
FORWARD
);
motorHL
->
run
(
FORWARD
);
delay
(
2000
);
delay
(
2000
);
<<<<<<<
HEAD
<<<<<<<
Updated
upstream
<<<<<<<
Updated
upstream
=======
>>>>>>>
main
Serial
.
println
(
" Horizontal Left - Backward Slow"
);
Serial
.
println
(
" Horizontal Left - Backward Slow"
);
motorHL
->
setSpeed
(
smallVal
);
motorHL
->
setSpeed
(
smallVal
);
motorHL
->
run
(
BACKWARD
);
motorHL
->
run
(
BACKWARD
);
delay
(
2000
);
delay
(
2000
);
Serial
.
println
(
" Horizontal Right - Forward Fast"
);
Serial
.
println
(
" Horizontal Right - Forward Fast"
);
<<<<<<<
HEAD
=======
=======
motorHL
->
setSpeed
(
smallVal
);
motorHL
->
setSpeed
(
smallVal
);
motorHL
->
run
(
BACKWARD
);
motorHL
->
run
(
BACKWARD
);
delay
(
2000
);
delay
(
2000
);
>>>>>>>
Stashed
changes
>>>>>>>
Stashed
changes
=======
>>>>>>>
main
motorHL
->
setSpeed
(
0
);
motorHL
->
setSpeed
(
0
);
motorHR
->
setSpeed
(
largeVal
);
motorHR
->
setSpeed
(
largeVal
);
motorHR
->
run
(
FORWARD
);
motorHR
->
run
(
FORWARD
);
delay
(
2000
);
delay
(
2000
);
<<<<<<<
HEAD
<<<<<<<
Updated
upstream
<<<<<<<
Updated
upstream
Serial
.
println
(
" Horizontal Right - Backward Slow"
);
Serial
.
println
(
" Horizontal Right - Backward Slow"
);
motorHR
->
setSpeed
(
smallVal
);
motorHR
->
setSpeed
(
smallVal
);
...
@@ -82,4 +105,12 @@ void loop() {
...
@@ -82,4 +105,12 @@ void loop() {
motorHR
->
run
(
BACKWARD
);
motorHR
->
run
(
BACKWARD
);
delay
(
2000
);
delay
(
2000
);
>>>>>>>
Stashed
changes
>>>>>>>
Stashed
changes
=======
Serial
.
println
(
" Horizontal Right - Backward Slow"
);
motorHR
->
setSpeed
(
smallVal
);
motorHR
->
run
(
BACKWARD
);
delay
(
2000
);
Serial
.
println
();
Serial
.
println
();
>>>>>>>
main
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment