godcreator
/
FSM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'isLastHolding没初始化' into develop 

# Conflicts:
#	main.c
This commit is contained in:
godcreator 2024-01-23 23:39:10 +08:00
parent 4858335e33 aa1f93ddbd
commit 3243d9cc5b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.c
View File

@ -3,7 +3,11 @@
#include "keyFSM.h" #include "keyFSM.h"
#include "FSM_public.h" #include "FSM_public.h"
<<<<<<< HEAD
#define NUM 60 #define NUM 60
=======
#define NUM 50
>>>>>>> isLastHolding没初始化
// KeyIn testin[NUM] = { // KeyIn testin[NUM] = {
// Up,Up,Up,Up,Up, Up,pDown,pDown,pDown,Up, pDown,pDown,pDown,pDown,pDown, // Up,Up,Up,Up,Up, Up,pDown,pDown,pDown,Up, pDown,pDown,pDown,pDown,pDown,
// pDown,pDown,pDown,Up,Up, pDown,pDown, // pDown,pDown,pDown,Up,Up, pDown,pDown,
@ -11,10 +15,15 @@
KeyIn testin[NUM] = { KeyIn testin[NUM] = {
Up,Up,pDown,pDown,Up, Up,Up,pDown,pDown,Up,
<<<<<<< HEAD
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,
Up,Up,Up,Up,Up, Up,Up,Up,Up,Up,
pDown,pDown,pDown,pDown,pDown, 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, pDown,pDown,pDown,pDown,pDown,
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,