Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
duck
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
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
jp7g21
duck
Commits
814c10e4
Commit
814c10e4
authored
3 years ago
by
Xoaquin Castrelo
Browse files
Options
Downloads
Patches
Plain Diff
Added function to get servo angle.
parent
783e78eb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
emb/servos.cpp
+17
-1
17 additions, 1 deletion
emb/servos.cpp
emb/servos.hpp
+7
-0
7 additions, 0 deletions
emb/servos.hpp
with
24 additions
and
1 deletion
emb/servos.cpp
+
17
−
1
View file @
814c10e4
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
#include
<avr/interrupt.h>
#include
<avr/interrupt.h>
#include
<stdint.h>
#include
<stdint.h>
#define NUM_SERVOS 3
#define MIN_PULSE 999
#define MIN_PULSE 999
#define MAX_PULSE 4999
#define MAX_PULSE 4999
...
@@ -18,6 +17,7 @@ struct Servo
...
@@ -18,6 +17,7 @@ struct Servo
const
uint8_t
pinMask
;
// the pin mask for the servo
const
uint8_t
pinMask
;
// the pin mask for the servo
uint16_t
tempValue
;
// stores a temporary value before it's written to the servo
uint16_t
tempValue
;
// stores a temporary value before it's written to the servo
uint16_t
value
;
// current pulse width value
uint16_t
value
;
// current pulse width value
int16_t
angle
;
// the angle in arc-minutes
};
};
static
Servo
servos
[
NUM_SERVOS
]
=
{
static
Servo
servos
[
NUM_SERVOS
]
=
{
...
@@ -43,7 +43,23 @@ void initServos()
...
@@ -43,7 +43,23 @@ void initServos()
void
setServoAngle
(
uint8_t
servo
,
int16_t
arcMin
)
void
setServoAngle
(
uint8_t
servo
,
int16_t
arcMin
)
{
{
if
(
0
<=
servo
&&
servo
<
NUM_SERVOS
)
if
(
0
<=
servo
&&
servo
<
NUM_SERVOS
)
{
if
(
arcMin
<
-
180
*
60
)
arcMin
=
-
180
*
60
;
else
if
(
arcMin
>
180
*
60
)
arcMin
=
180
*
60
;
servos
[
servo
].
tempValue
=
MIN_PULSE
+
(
int32_t
)
(
arcMin
+
180
*
60
)
*
(
MAX_PULSE
-
MIN_PULSE
)
/
(
360
*
60
);
servos
[
servo
].
tempValue
=
MIN_PULSE
+
(
int32_t
)
(
arcMin
+
180
*
60
)
*
(
MAX_PULSE
-
MIN_PULSE
)
/
(
360
*
60
);
servos
[
servo
].
angle
=
arcMin
;
}
}
int16_t
getServoAngle
(
uint8_t
servo
)
{
if
(
0
<=
servo
&&
servo
<
NUM_SERVOS
)
return
servos
[
servo
].
angle
;
else
return
0
;
}
}
void
updateServos
()
void
updateServos
()
...
...
This diff is collapsed.
Click to expand it.
emb/servos.hpp
+
7
−
0
View file @
814c10e4
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
#include
<stdint.h>
#include
<stdint.h>
#define NUM_SERVOS 3
/**
/**
* Initialises the servos.
* Initialises the servos.
*/
*/
...
@@ -16,6 +18,11 @@ void initServos();
...
@@ -16,6 +18,11 @@ void initServos();
*/
*/
void
setServoAngle
(
uint8_t
servo
,
int16_t
arcMin
);
void
setServoAngle
(
uint8_t
servo
,
int16_t
arcMin
);
/**
* Gets the angle of a servo.
*/
int16_t
getServoAngle
(
uint8_t
servo
);
/**
/**
* Writes the servo values out to the servos.
* Writes the servo values out to the servos.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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