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
strat db
[aversive.git]
/
projects
/
microb2010
/
mainboard
/
main.h
diff --git
a/projects/microb2010/mainboard/main.h
b/projects/microb2010/mainboard/main.h
index
21c0065
..
ff86dd2
100755
(executable)
--- a/
projects/microb2010/mainboard/main.h
+++ b/
projects/microb2010/mainboard/main.h
@@
-19,6
+19,8
@@
*
*/
*
*/
+/* was mechboard in 2009 */
+
#define LED_TOGGLE(port, bit) do { \
if (port & _BV(bit)) \
port &= ~_BV(bit); \
#define LED_TOGGLE(port, bit) do { \
if (port & _BV(bit)) \
port &= ~_BV(bit); \
@@
-119,7
+121,7
@@
#define I2C_POLL_PRIO 20
#define EEPROM_TIME_PRIO 10
#define I2C_POLL_PRIO 20
#define EEPROM_TIME_PRIO 10
-#define CS_PERIOD 5000L /* in microsecond */
+#define CS_PERIOD 5000L /* in microsecond */
#define CS_HZ (1000000. / CS_PERIOD)
#define NB_LOGS 4
#define CS_HZ (1000000. / CS_PERIOD)
#define NB_LOGS 4
@@
-201,15
+203,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);