Merge branch 'master' of https://github.com/lloi7/RM_auto-aim

# Conflicts: # main.cpp
2019-07-12 16:00:21 +08:00
parent d494182740 1e9924be93
commit 7ac1f82769
14 changed files with 12528 additions and 12521 deletions
--- a/others/include/constants.h
+++ b/others/include/constants.h
@@ -16,6 +16,7 @@
 #define BIG_ENERGY_STATE   'b'
 #define SMALL_ENERGY_STATE 's'
 #define ARMOR_STATE        'a'
+#define INIT_STATE          0

 #define FOCUS_PIXAL_8MM  (1488)
 #define FOCUS_PIXAL_5MM  (917)