Merge tag 'isLastHolding没初始化' into develop
# Conflicts: # main.c
This commit is contained in:
commit
3243d9cc5b
9
main.c
9
main.c
|
@ -3,7 +3,11 @@
|
|||
#include "keyFSM.h"
|
||||
#include "FSM_public.h"
|
||||
|
||||
<<<<<<< HEAD
|
||||
#define NUM 60
|
||||
=======
|
||||
#define NUM 50
|
||||
>>>>>>> isLastHolding没初始化
|
||||
// KeyIn testin[NUM] = {
|
||||
// Up,Up,Up,Up,Up, Up,pDown,pDown,pDown,Up, pDown,pDown,pDown,pDown,pDown,
|
||||
// pDown,pDown,pDown,Up,Up, pDown,pDown,
|
||||
|
@ -11,10 +15,15 @@
|
|||
|
||||
KeyIn testin[NUM] = {
|
||||
Up,Up,pDown,pDown,Up,
|
||||
<<<<<<< HEAD
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
Up,Up,Up,Up,Up,
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
=======
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
pDown,pDown,pDown,Up,Up,
|
||||
>>>>>>> isLastHolding没初始化
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
pDown,pDown,pDown,pDown,pDown,
|
||||
|
|
Loading…
Reference in New Issue