git.droids-corp.org
/
aversive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vt100: include pgmspace.h as we use PROGMEM macro
[aversive.git]
/
projects
/
microb2010
/
mainboard
/
strat_base.h
diff --git
a/projects/microb2010/mainboard/strat_base.h
b/projects/microb2010/mainboard/strat_base.h
index
d8b61e5
..
efc9af4
100644
(file)
--- a/
projects/microb2010/mainboard/strat_base.h
+++ b/
projects/microb2010/mainboard/strat_base.h
@@
-45,7
+45,7
@@
void strat_hardstop(void);
#define DO_NOT_SET_POS -1000
/* Reset position. If arg == DO_NOT_SET_POS, don't update value for
* it. */
#define DO_NOT_SET_POS -1000
/* Reset position. If arg == DO_NOT_SET_POS, don't update value for
* it. */
-void strat_reset_pos(int16_t x, int16_t y,
int16_t
a);
+void strat_reset_pos(int16_t x, int16_t y,
double
a);
/* decrease gain on angle PID, and go forward until we reach the
* border. */
/* decrease gain on angle PID, and go forward until we reach the
* border. */
@@
-66,6
+66,8
@@
uint8_t strat_obstacle(void);
/* set/get user strat speed */
void strat_set_speed(uint16_t d, uint16_t a);
void strat_get_speed(uint16_t *d, uint16_t *a);
/* set/get user strat speed */
void strat_set_speed(uint16_t d, uint16_t a);
void strat_get_speed(uint16_t *d, uint16_t *a);
+void strat_set_acc(double d, double a);
+void strat_get_acc(double *d, double *a);
/* when user type ctrl-c we can interrupt traj */
void interrupt_traj(void);
/* when user type ctrl-c we can interrupt traj */
void interrupt_traj(void);