Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MechaRaptor - Arduino Controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
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
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aerospace and Mechanical Engineering
tlambert
MechaRaptor - Arduino Controller
Compare revisions
8378d295b66d418b8cbf136ca3d0b889fed580c7 to 9f5a079ecb374f6680557f6225aa478eb9050e22
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
am-dept/tlambert/MR-arduino-controller
Select target project
No results found
9f5a079ecb374f6680557f6225aa478eb9050e22
Select Git revision
Branches
dev
main
Tags
v1.0.0
v2.0.0
v2.0.1
v2.0.2
Swap
Target
am-dept/tlambert/MR-arduino-controller
Select target project
am-dept/tlambert/MR-arduino-controller
1 result
8378d295b66d418b8cbf136ca3d0b889fed580c7
Select Git revision
Branches
dev
main
Tags
v1.0.0
v2.0.0
v2.0.1
v2.0.2
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
fix(log): remove bounds to wing angle plots
· 8eb6647a
Thomas Lambert
authored
2 years ago
8eb6647a
feat(runtime): reset timer before entering loop
· 9f5a079e
Thomas Lambert
authored
2 years ago
9f5a079e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
controller/controller.ino
+4
-2
4 additions, 2 deletions
controller/controller.ino
controller/mechaRaptor.json
+8
-8
8 additions, 8 deletions
controller/mechaRaptor.json
with
12 additions
and
10 deletions
controller/controller.ino
View file @
9f5a079e
...
@@ -91,7 +91,7 @@ uint8_t gEsc_val = 0; // ESC angle (to use with the Servo l
...
@@ -91,7 +91,7 @@ uint8_t gEsc_val = 0; // ESC angle (to use with the Servo l
String
gMode
;
// Mode of operation
String
gMode
;
// Mode of operation
uint16_t
gAngleOffset
[]
=
{
0
,
0
,
1
,
0
};
// Encoder offset (prevent wrap-around)
uint16_t
gAngleOffset
[]
=
{
0
,
0
,
1
,
0
};
// Encoder offset (prevent wrap-around)
uint16_t
gMaxWingPos
[]
=
MAX_WING_POS
;
// Encoder maximum recorder position
uint16_t
gMaxWingPos
[]
=
MAX_WING_POS
;
// Encoder maximum recorder position
int
gStartTime
;
// Loop start time
/*******************************************************************************
/*******************************************************************************
ARDUINO SETUP
ARDUINO SETUP
...
@@ -142,6 +142,8 @@ void setup() {
...
@@ -142,6 +142,8 @@ void setup() {
delay
(
1000
);
// Ensure proper initialization
delay
(
1000
);
// Ensure proper initialization
Serial
.
println
(
"[INFO]: Setup OK, starting now..."
);
Serial
.
println
(
"[INFO]: Setup OK, starting now..."
);
delay
(
500
);
delay
(
500
);
gStartTime
=
millis
();
}
}
...
@@ -260,7 +262,7 @@ void SerialPrint(String mode, int potent, int esc_val, unsigned int wing_angles[
...
@@ -260,7 +262,7 @@ void SerialPrint(String mode, int potent, int esc_val, unsigned int wing_angles[
Serial
.
print
(
"/*"
);
// Beginning of data stream
Serial
.
print
(
"/*"
);
// Beginning of data stream
Serial
.
print
(
mode
);
Serial
.
print
(
mode
);
Serial
.
print
(
","
);
Serial
.
print
(
","
);
Serial
.
print
(
millis
()
/
1000.0
);
Serial
.
print
(
(
millis
()
-
gStartTime
)
/
1000.0
);
Serial
.
print
(
","
);
Serial
.
print
(
","
);
Serial
.
print
(
potent
*
5.0
/
1023.0
);
// Converts pot val into proper tension
Serial
.
print
(
potent
*
5.0
/
1023.0
);
// Converts pot val into proper tension
Serial
.
print
(
","
);
Serial
.
print
(
","
);
...
...
This diff is collapsed.
Click to expand it.
controller/mechaRaptor.json
View file @
9f5a079e
...
@@ -155,8 +155,8 @@
...
@@ -155,8 +155,8 @@
"graph"
:
false
,
"graph"
:
false
,
"led"
:
false
,
"led"
:
false
,
"log"
:
false
,
"log"
:
false
,
"max"
:
45
,
"max"
:
0
,
"min"
:
-45
,
"min"
:
0
,
"title"
:
"Left"
,
"title"
:
"Left"
,
"units"
:
"°"
,
"units"
:
"°"
,
"value"
:
"%10"
,
"value"
:
"%10"
,
...
@@ -169,8 +169,8 @@
...
@@ -169,8 +169,8 @@
"graph"
:
false
,
"graph"
:
false
,
"led"
:
false
,
"led"
:
false
,
"log"
:
false
,
"log"
:
false
,
"max"
:
45
,
"max"
:
0
,
"min"
:
-45
,
"min"
:
0
,
"title"
:
"Right"
,
"title"
:
"Right"
,
"units"
:
"°"
,
"units"
:
"°"
,
"value"
:
"%11"
,
"value"
:
"%11"
,
...
@@ -189,8 +189,8 @@
...
@@ -189,8 +189,8 @@
"graph"
:
false
,
"graph"
:
false
,
"led"
:
false
,
"led"
:
false
,
"log"
:
false
,
"log"
:
false
,
"max"
:
45
,
"max"
:
0
,
"min"
:
-45
,
"min"
:
0
,
"title"
:
"Left"
,
"title"
:
"Left"
,
"units"
:
"°"
,
"units"
:
"°"
,
"value"
:
"%12"
,
"value"
:
"%12"
,
...
@@ -203,8 +203,8 @@
...
@@ -203,8 +203,8 @@
"graph"
:
false
,
"graph"
:
false
,
"led"
:
false
,
"led"
:
false
,
"log"
:
false
,
"log"
:
false
,
"max"
:
45
,
"max"
:
0
,
"min"
:
-45
,
"min"
:
0
,
"title"
:
"Right"
,
"title"
:
"Right"
,
"units"
:
"°"
,
"units"
:
"°"
,
"value"
:
"%13"
,
"value"
:
"%13"
,
...
...
This diff is collapsed.
Click to expand it.