X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fballboard%2Fmain.h;h=cde4608ae39270acd1353a8240d7d9d33ce40686;hp=36915bd7ea6131ee373ca0bfb0a596951e8303a1;hb=aed049ab6be4e1916457743d53f6b610a21b4854;hpb=8d6a47e9e21a9a31f4bc12d32fb3d11091a4b305 diff --git a/projects/microb2010/ballboard/main.h b/projects/microb2010/ballboard/main.h index 36915bd..cde4608 100755 --- a/projects/microb2010/ballboard/main.h +++ b/projects/microb2010/ballboard/main.h @@ -60,9 +60,7 @@ /** ERROR NUMS */ #define E_USER_I2C_PROTO 195 #define E_USER_SENSOR 196 -#define E_USER_BEACON 197 -#define E_USER_SCANNER 198 -#define E_USER_IMGPROCESS 199 +#define E_USER_ST_MACH 197 #define LED_PRIO 170 #define TIME_PRIO 160 @@ -91,7 +89,7 @@ struct genboard { struct pwm_ng servo2; struct pwm_ng servo3; struct pwm_ng servo4; - + /* ax12 interface */ AX12 ax12; @@ -115,6 +113,7 @@ struct ballboard { #define DO_CS 2 #define DO_BD 4 #define DO_POWER 8 +#define DO_ERRBLOCKING 16 uint8_t flags; /* misc flags */ /* control systems */