Commit Graph

59 Commits

Author SHA1 Message Date
godcreator02 ca211e646a 忘了改了啥了 2024-04-23 15:11:06 +08:00
godcreator02 fb6fcc65dd Merge branch 'feature/修改状态机结构,去掉事件' into develop 2024-04-23 14:57:05 +08:00
godcreator02 585fcf3212 Merge branch 'feature/修改状态机结构,去掉事件' into develop 2024-04-23 14:54:24 +08:00
godcreator02 02f2cb12b6 去掉delay了,28377测试也没问题 2024-04-23 14:53:47 +08:00
godcreator02 168010ad67 28377D按键测试应该没问题了,单击多击长安都ok。最慢319,最快221 2024-04-23 14:32:23 +08:00
godcreator02 b3c9b79aea 按键状态机准备在板子上测试 2024-04-23 14:03:00 +08:00
godcreator02 60bdcfe50b 去掉所有事件,仅用状态表示。目前template测试么问题,按键测试还有段错误,马拉松回来再搞 2024-04-20 21:16:26 +08:00
godcreator02 75ce4d1a9a 没存完,再存一次。回去看状态图结构 2024-04-20 20:05:33 +08:00
godcreator02 23a07ea75e 暂存以下,回去看一眼原来的状态图结构 2024-04-20 20:05:10 +08:00
godcreator 44a434f39b Merge tag '1.3a' into develop
只有template文件里的内容是能用的
2024-04-19 23:37:34 +08:00
godcreator 89400b8802 Merge branch 'release/1.3a' 2024-04-19 23:37:34 +08:00
godcreator bdd83a3cd1 把信号清零放到step里做 2024-04-19 16:11:24 +08:00
godcreator 6503f3c126 状态机区别Data和Signal,Signal优先级更高,生命周期更短 2024-04-19 15:58:28 +08:00
godcreator 9edbabb063 预装载器小改了一下,添加了溢出标志 2024-04-19 13:07:09 +08:00
godcreator f117584608 Merge tag '1.2' into develop 2024-04-19 10:23:38 +08:00
godcreator cf97ddf24a Merge branch 'release/1.2' 2024-04-19 10:23:37 +08:00
godcreator 0456925bf2 更新状态图 2024-01-30 23:09:50 +08:00
godcreator ae55f4b816 小调整 2024-01-30 23:07:08 +08:00
godcreator cae4d5d6ce 小改结构,把template、按键和父子状态机的例子全写好 2024-01-30 23:00:38 +08:00
godcreator 710d823b99 delayaction调整到event上,目前单击214,多击最大293 2024-01-30 20:35:05 +08:00
godcreator d48de807e2 怎么代码下载不进去了 2024-01-30 19:38:48 +08:00
godcreator d9539cea6d 加入父子状态机测试的plecs仿真 2024-01-30 16:28:03 +08:00
godcreator 5201b5769c 重新整理一下文件,父子状态机在28377上也测试ok,访问到子状态机最慢500,只有父状态机230左右 2024-01-30 16:26:38 +08:00
godcreator e73c3dfe17 Merge branch 'feature/父子状态机测试' into develop 2024-01-30 16:18:41 +08:00
godcreator 33b25bb605 把28377文件加过来,测试ok,留了一堆警告先不管 2024-01-30 16:18:28 +08:00
godcreator a6ca70ae76 电脑上能跑了 2024-01-30 16:06:02 +08:00
godcreator 74c357c046 把parentchild的测试复制过来 2024-01-30 15:50:34 +08:00
godcreator 381873a8b3 时间:单击230,多击311 2024-01-30 15:44:19 +08:00
godcreator 5eaac008c5 添加预装载模块,delay函数小改一下 2024-01-30 15:11:15 +08:00
godcreator fff5e8d1d4 Merge tag '1.1' into develop 2024-01-29 22:24:21 +08:00
godcreator 40f3aa6780 Merge branch 'release/1.1' 2024-01-29 22:24:20 +08:00
godcreator c18b289bed 更新状态图 2024-01-29 22:24:06 +08:00
godcreator c47cf78c90 no message 2024-01-29 21:19:23 +08:00
godcreator dcde26a2f3 增加delayaction并且把during和childfsm分开,小修了一下框架。28377中什么也不做198,Down250,多击270不到 2024-01-29 20:32:07 +08:00
godcreator f9ead27104 更新状态图 2024-01-29 14:06:03 +08:00
godcreator 035e403da5 再多划分一个多击的按下消抖状态 2024-01-29 14:04:24 +08:00
godcreator b1b74605b8 增加一个NDEBUG,去掉assert 2024-01-29 11:26:42 +08:00
godcreator 8f17d6c8af 增加一个宏定义可以开启或关闭printf 2024-01-29 11:12:32 +08:00
godcreator ea394221ff 消掉laststate,修改一下状态机框架,还没在DSP测试,不保证正确 2024-01-28 23:43:13 +08:00
godcreator 2c67fede3d Merge branch 'release/给硕哥改的版本' 2024-01-24 23:24:02 +08:00
godcreator 040d04ef64 Merge tag '给硕哥改的版本' into develop 2024-01-24 23:24:02 +08:00
godcreator f8e31e797b 添加状态图 2024-01-24 23:23:28 +08:00
godcreator 1ef33af990 Merge tag '28377测试ok' into develop 2024-01-24 23:19:19 +08:00
godcreator 5133e86de1 Merge branch 'release/28377测试ok' 2024-01-24 23:19:18 +08:00
godcreator dd35c65e76 no message 2024-01-24 23:15:28 +08:00
godcreator 3fe745f71b 上28377测试吧 2024-01-24 10:20:05 +08:00
godcreator 1743321fab 头晕了,lastState=Holding这句不知道加在哪。加在exit Updebouncing的话就回不去Holding,不加在这就会导致lastState=Holding到处传播 2024-01-24 01:26:37 +08:00
godcreator 3243d9cc5b Merge tag 'isLastHolding没初始化' into develop
# Conflicts:
#	main.c
2024-01-23 23:39:10 +08:00
godcreator aa1f93ddbd Merge branch 'hotfix/isLastHolding没初始化' 2024-01-23 23:38:20 +08:00
godcreator 6f4e8c1c89 修好了 2024-01-23 23:38:07 +08:00