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
avant la coupe de belgique
[aversive.git]
/
projects
/
microb2010
/
mainboard
/
main.h
diff --git
a/projects/microb2010/mainboard/main.h
b/projects/microb2010/mainboard/main.h
index
6e3f8ad
..
367718f
100755
(executable)
--- a/
projects/microb2010/mainboard/main.h
+++ b/
projects/microb2010/mainboard/main.h
@@
-53,13
+53,13
@@
#define LED1_OFF() cbi(PORTJ, 2)
#define LED1_TOGGLE() LED_TOGGLE(PORTJ, 2)
#define LED1_OFF() cbi(PORTJ, 2)
#define LED1_TOGGLE() LED_TOGGLE(PORTJ, 2)
-#define LED2_ON() sbi(PORT
L, 7
)
-#define LED2_OFF() cbi(PORT
L, 7
)
-#define LED2_TOGGLE() LED_TOGGLE(PORT
L, 7
)
+#define LED2_ON() sbi(PORT
J, 3
)
+#define LED2_OFF() cbi(PORT
J, 3
)
+#define LED2_TOGGLE() LED_TOGGLE(PORT
J, 3
)
-#define LED3_ON() sbi(PORT
J, 3
)
-#define LED3_OFF() cbi(PORT
J, 3
)
-#define LED3_TOGGLE() LED_TOGGLE(PORT
J, 3
)
+#define LED3_ON() sbi(PORT
L, 7
)
+#define LED3_OFF() cbi(PORT
L, 7
)
+#define LED3_TOGGLE() LED_TOGGLE(PORT
L, 7
)
#define LED4_ON() sbi(PORTL, 6)
#define LED4_OFF() cbi(PORTL, 6)
#define LED4_ON() sbi(PORTL, 6)
#define LED4_OFF() cbi(PORTL, 6)
@@
-201,15
+201,15
@@
struct cobboard {
/* state of ballboard, synchronized through i2c */
struct ballboard {
/* state of ballboard, synchronized through i2c */
struct ballboard {
- uint8_t mode;
+
volatile
uint8_t mode;
uint8_t status;
uint8_t ball_count;
};
extern struct genboard gen;
extern struct mainboard mainboard;
uint8_t status;
uint8_t ball_count;
};
extern struct genboard gen;
extern struct mainboard mainboard;
-extern struct cobboard cobboard;
-extern struct ballboard ballboard;
+extern
volatile
struct cobboard cobboard;
+extern
volatile
struct ballboard ballboard;
/* start the bootloader */
void bootloader(void);
/* start the bootloader */
void bootloader(void);