merge

2019-07-09 14:16:01 +08:00
parent 8866f43b56
commit cdef78ddde
7 changed files with 62 additions and 47 deletions
--- a/others/include/constants.h
+++ b/others/include/constants.h
@@ -10,8 +10,15 @@
 #define ENEMY_BLUE 0
 #define ENEMY_RED  1

+#define ALLY_BLUE ENEMY_RED
+#define ALLY_RED  ENEMY_BLUE
+
 #define BIG_ENERGY_STATE   'b'
 #define SMALL_ENERGY_STATE 's'
 #define ARMOR_STATE        'a'

+#define FOCUS_PIXAL_8MM  (1488)
+#define FOCUS_PIXAL_5MM  (917)
+#define FOCUS_PIXAL      FOCUS_PIXAL_5MM
+
 #endif /* _CONSTANTS_H */