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
french cup + idf cup
[aversive.git]
/
projects
/
microb2010
/
ballboard
/
commands_ballboard.c
diff --git
a/projects/microb2010/ballboard/commands_ballboard.c
b/projects/microb2010/ballboard/commands_ballboard.c
index
70ae084
..
95ec614
100644
(file)
--- a/
projects/microb2010/ballboard/commands_ballboard.c
+++ b/
projects/microb2010/ballboard/commands_ballboard.c
@@
-105,6
+105,7
@@
static void cmd_event_parsed(void *parsed_result, void *data)
pwm_ng_set(ROLLER_PWM, 0);
pwm_ng_set(FORKTRANS_PWM, 0);
pwm_ng_set(FORKROT_PWM, 0);
pwm_ng_set(ROLLER_PWM, 0);
pwm_ng_set(FORKTRANS_PWM, 0);
pwm_ng_set(FORKROT_PWM, 0);
+ pwm_ng_set(BEACON_PWM, 0);
}
ballboard.flags &= (~bit);
}
}
ballboard.flags &= (~bit);
}
@@
-379,13
+380,15
@@
static void cmd_fork_parsed(void *parsed_result,
fork_deploy();
else if (!strcmp_P(res->arg1, PSTR("pack")))
fork_pack();
fork_deploy();
else if (!strcmp_P(res->arg1, PSTR("pack")))
fork_pack();
- else if (!strcmp_P(res->arg1, PSTR("middle")))
- fork_mid();
+ else if (!strcmp_P(res->arg1, PSTR("mid1")))
+ fork_mid1();
+ else if (!strcmp_P(res->arg1, PSTR("mid2")))
+ fork_mid2();
}
prog_char str_fork_arg0[] = "fork";
parse_pgm_token_string_t cmd_fork_arg0 = TOKEN_STRING_INITIALIZER(struct cmd_fork_result, arg0, str_fork_arg0);
}
prog_char str_fork_arg0[] = "fork";
parse_pgm_token_string_t cmd_fork_arg0 = TOKEN_STRING_INITIALIZER(struct cmd_fork_result, arg0, str_fork_arg0);
-prog_char str_fork_arg1[] = "deploy#pack#mid
dle
";
+prog_char str_fork_arg1[] = "deploy#pack#mid
1#mid2
";
parse_pgm_token_string_t cmd_fork_arg1 = TOKEN_STRING_INITIALIZER(struct cmd_fork_result, arg1, str_fork_arg1);
prog_char help_fork[] = "move fork";
parse_pgm_token_string_t cmd_fork_arg1 = TOKEN_STRING_INITIALIZER(struct cmd_fork_result, arg1, str_fork_arg1);
prog_char help_fork[] = "move fork";