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
save
[aversive.git]
/
projects
/
microb2010
/
ballboard
/
main.c
diff --git
a/projects/microb2010/ballboard/main.c
b/projects/microb2010/ballboard/main.c
index
082b658
..
ed8716b
100755
(executable)
--- a/
projects/microb2010/ballboard/main.c
+++ b/
projects/microb2010/ballboard/main.c
@@
-112,16
+112,21
@@
void bootloader(void)
void do_led_blink(__attribute__((unused)) void *dummy)
{
void do_led_blink(__attribute__((unused)) void *dummy)
{
-#if 1 /* simple blink */
- static uint8_t a=0;
+ static uint8_t a = 0;
- if(a)
- LED1_ON();
- else
- LED1_OFF();
-
- a = !a;
-#endif
+ if (ballboard.flags & DO_ERRBLOCKING) {
+ if (a & 1)
+ LED1_ON();
+ else
+ LED1_OFF();
+ }
+ else {
+ if (a & 4)
+ LED1_ON();
+ else
+ LED1_OFF();
+ }
+ a++;
}
static void main_timer_interrupt(void)
}
static void main_timer_interrupt(void)
@@
-149,7
+154,8
@@
int main(void)
LED1_OFF();
memset(&gen, 0, sizeof(gen));
memset(&ballboard, 0, sizeof(ballboard));
LED1_OFF();
memset(&gen, 0, sizeof(gen));
memset(&ballboard, 0, sizeof(ballboard));
- ballboard.flags = DO_ENCODERS | DO_CS | DO_POWER; // DO_BD
+ ballboard.flags = DO_ENCODERS | DO_CS | DO_POWER |
+ DO_ERRBLOCKING | DO_BD;
/* UART */
uart_init();
/* UART */
uart_init();
@@
-239,6
+245,9
@@
int main(void)
/* ax12 */
ax12_user_init();
/* ax12 */
ax12_user_init();
+ gen.logs[0] = E_USER_ST_MACH;
+ gen.log_level = 5;
+
sei();
printf_P(PSTR("\r\n"));
sei();
printf_P(PSTR("\r\n"));