diff --git a/plan_manage_main/ewp/plan_manage_main.dep b/plan_manage_main/ewp/plan_manage_main.dep index 0f9305c..02559c2 100644 --- a/plan_manage_main/ewp/plan_manage_main.dep +++ b/plan_manage_main/ewp/plan_manage_main.dep @@ -30,66 +30,6 @@ $PROJ_DIR$\..\src\app\main.c $PROJ_DIR$\..\src\app\output.c $PROJ_DIR$\..\src\app\plan_handle.c - $PROJ_DIR$\..\src\include\drivers\include.h - $PROJ_DIR$\..\src\include\drivers\lptmr.h - $PROJ_DIR$\..\src\include\drivers\mcg.h - $PROJ_DIR$\..\src\include\drivers\mcg_cfg.h - $PROJ_DIR$\..\src\include\drivers\pit.h - $PROJ_DIR$\..\src\include\drivers\port.h - $PROJ_DIR$\..\src\include\drivers\rtc.h - $PROJ_DIR$\..\src\include\drivers\SPI.h - $PROJ_DIR$\..\src\include\drivers\systick.h - $PROJ_DIR$\..\src\include\drivers\tick_timer.h - $PROJ_DIR$\..\src\include\drivers\tpm.h - $PROJ_DIR$\..\src\include\drivers\tsi.h - $PROJ_DIR$\..\src\include\drivers\uart.h - $PROJ_DIR$\..\src\include\platforms\freedom.h - $PROJ_DIR$\..\src\include\platforms\tower.h - $PROJ_DIR$\..\src\other\LandzoOLED.c - $PROJ_DIR$\..\src\other\LandzoOLED.h - $PROJ_DIR$\..\Debug\Obj\startup.pbi - $PROJ_DIR$\..\Debug\Obj\stdlib.pbi - $PROJ_DIR$\..\Debug\Obj\queue.pbi - $PROJ_DIR$\..\Debug\Obj\gpio.pbi - $PROJ_DIR$\..\Debug\Obj\mcg.pbi - $PROJ_DIR$\..\Debug\Obj\i2c.pbi - $PROJ_DIR$\..\Debug\Obj\lptmr.pbi - $PROJ_DIR$\..\Debug\Obj\pit.pbi - $TOOLKIT_DIR$\inc\c\stdarg.h - $PROJ_DIR$\..\Debug\Obj\uif.pbi - $PROJ_DIR$\..\Debug\Obj\port.pbi - $PROJ_DIR$\..\Debug\Obj\rtc.pbi - $PROJ_DIR$\..\Debug\Obj\SPI.pbi - $PROJ_DIR$\..\Debug\Obj\systick.pbi - $PROJ_DIR$\..\Debug\Obj\tick_timer.pbi - $PROJ_DIR$\..\Debug\Obj\tpm.pbi - $PROJ_DIR$\..\Debug\Obj\tsi.pbi - $PROJ_DIR$\..\Debug\Obj\knob.o - $PROJ_DIR$\..\Debug\Obj\key.o - $PROJ_DIR$\..\Debug\Obj\isr.o - $PROJ_DIR$\..\Debug\Obj\input.o - $PROJ_DIR$\..\Debug\Obj\tft.o - $PROJ_DIR$\..\Debug\Obj\time.o - $PROJ_DIR$\..\Debug\Obj\plan_handle.o - $PROJ_DIR$\..\Debug\Obj\display.o - $PROJ_DIR$\..\Debug\Obj\simulat_timer.o - $PROJ_DIR$\..\Debug\Obj\output.o - $PROJ_DIR$\..\Debug\Obj\debug.o - $PROJ_DIR$\..\Debug\Obj\flash.o - $PROJ_DIR$\..\Debug\Obj\uart.pbi - $PROJ_DIR$\..\Debug\Obj\LandzoOLED.o - $PROJ_DIR$\..\Debug\Obj\LandzoOLED.pbi - $PROJ_DIR$\..\Debug\Obj\adc.o - $PROJ_DIR$\..\Debug\Obj\dma.o - $PROJ_DIR$\..\Debug\Obj\cmp.o - $PROJ_DIR$\..\Debug\Obj\dac.o - $PROJ_DIR$\..\Debug\Obj\gpio.o - $PROJ_DIR$\..\Debug\Obj\i2c.o - $PROJ_DIR$\..\Debug\Obj\lptmr.o - $PROJ_DIR$\..\Debug\Obj\mcg.o - $PROJ_DIR$\..\Debug\Obj\pit.o - $PROJ_DIR$\..\Debug\Obj\port.o - $PROJ_DIR$\..\Debug\Obj\rtc.o $PROJ_DIR$\..\src\app\pm_init.c $PROJ_DIR$\..\src\app\simulat_timer.c $PROJ_DIR$\..\src\app\tft.c @@ -102,7 +42,6 @@ $PROJ_DIR$\..\src\common\printf.c $PROJ_DIR$\..\src\common\queue.c $PROJ_DIR$\..\src\common\startup.c - $PROJ_DIR$\..\src\common\stdlib.c $PROJ_DIR$\..\src\common\uif.c $PROJ_DIR$\..\src\cpu\arm_cm0.c $PROJ_DIR$\..\src\cpu\crt0.s @@ -149,6 +88,67 @@ $PROJ_DIR$\..\src\include\drivers\gpio.h $PROJ_DIR$\..\src\include\drivers\i2c.h $PROJ_DIR$\..\src\include\drivers\i2c_cfg.h + $PROJ_DIR$\..\src\include\drivers\include.h + $PROJ_DIR$\..\src\include\drivers\lptmr.h + $PROJ_DIR$\..\src\include\drivers\mcg.h + $PROJ_DIR$\..\src\include\drivers\mcg_cfg.h + $PROJ_DIR$\..\src\include\drivers\pit.h + $PROJ_DIR$\..\src\include\drivers\port.h + $PROJ_DIR$\..\src\include\drivers\rtc.h + $PROJ_DIR$\..\src\include\drivers\SPI.h + $PROJ_DIR$\..\src\include\drivers\systick.h + $PROJ_DIR$\..\src\include\drivers\tick_timer.h + $PROJ_DIR$\..\src\include\drivers\tpm.h + $PROJ_DIR$\..\src\include\drivers\tsi.h + $PROJ_DIR$\..\src\include\drivers\uart.h + $PROJ_DIR$\..\src\include\platforms\freedom.h + $PROJ_DIR$\..\src\include\platforms\tower.h + $PROJ_DIR$\..\src\other\LandzoOLED.c + $PROJ_DIR$\..\src\other\LandzoOLED.h + $PROJ_DIR$\..\Debug\Obj\stdlib.pbi + $PROJ_DIR$\..\Debug\Obj\queue.pbi + $PROJ_DIR$\..\Debug\Obj\startup.pbi + $PROJ_DIR$\..\Debug\Obj\lptmr.pbi + $TOOLKIT_DIR$\inc\c\stdarg.h + $PROJ_DIR$\..\Debug\Obj\pit.pbi + $PROJ_DIR$\..\Debug\Obj\i2c.pbi + $PROJ_DIR$\..\Debug\Obj\uif.pbi + $PROJ_DIR$\..\Debug\Obj\mcg.pbi + $PROJ_DIR$\..\Debug\Obj\gpio.pbi + $PROJ_DIR$\..\Debug\Obj\port.pbi + $PROJ_DIR$\..\Debug\Obj\rtc.pbi + $PROJ_DIR$\..\Debug\Obj\SPI.pbi + $PROJ_DIR$\..\Debug\Obj\systick.pbi + $PROJ_DIR$\..\Debug\Obj\tick_timer.pbi + $PROJ_DIR$\..\Debug\Obj\tpm.pbi + $PROJ_DIR$\..\Debug\Obj\tsi.pbi + $PROJ_DIR$\..\Debug\Obj\knob.o + $PROJ_DIR$\..\Debug\Obj\key.o + $PROJ_DIR$\..\Debug\Obj\isr.o + $PROJ_DIR$\..\Debug\Obj\input.o + $PROJ_DIR$\..\Debug\Obj\tft.o + $PROJ_DIR$\..\Debug\Obj\time.o + $PROJ_DIR$\..\Debug\Obj\plan_handle.o + $PROJ_DIR$\..\Debug\Obj\display.o + $PROJ_DIR$\..\Debug\Obj\simulat_timer.o + $PROJ_DIR$\..\Debug\Obj\output.o + $PROJ_DIR$\..\Debug\Obj\debug.o + $PROJ_DIR$\..\Debug\Obj\flash.o + $PROJ_DIR$\..\Debug\Obj\uart.pbi + $PROJ_DIR$\..\Debug\Obj\LandzoOLED.o + $PROJ_DIR$\..\Debug\Obj\LandzoOLED.pbi + $PROJ_DIR$\..\Debug\Obj\adc.o + $PROJ_DIR$\..\Debug\Obj\dma.o + $PROJ_DIR$\..\Debug\Obj\cmp.o + $PROJ_DIR$\..\Debug\Obj\dac.o + $PROJ_DIR$\..\Debug\Obj\gpio.o + $PROJ_DIR$\..\Debug\Obj\i2c.o + $PROJ_DIR$\..\Debug\Obj\lptmr.o + $PROJ_DIR$\..\Debug\Obj\mcg.o + $PROJ_DIR$\..\Debug\Obj\pit.o + $PROJ_DIR$\..\Debug\Obj\port.o + $PROJ_DIR$\..\Debug\Obj\rtc.o + $PROJ_DIR$\..\src\common\stdlib.c $PROJ_DIR$\..\Debug\Obj\queue.o $PROJ_DIR$\..\Debug\Obj\startup.o $PROJ_DIR$\..\Debug\Obj\stdlib.o @@ -241,17 +241,17 @@ ICCARM - 68 + 126 BICOMP - 189 193 192 195 183 196 197 198 24 121 130 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 1 0 + 189 193 192 195 183 196 197 198 82 60 69 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 1 0 ICCARM - 189 193 192 195 183 196 197 198 24 121 130 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 1 0 + 189 193 192 195 183 196 197 198 82 60 69 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 1 0 @@ -264,7 +264,7 @@ ICCARM - 65 + 123 @@ -277,7 +277,7 @@ ICCARM - 69 + 127 @@ -290,7 +290,7 @@ ICCARM - 61 + 119 @@ -303,17 +303,17 @@ ICCARM - 60 + 118 BICOMP - 194 193 192 195 183 196 197 198 199 200 24 121 130 189 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 5 11 1 0 7 + 194 193 192 195 183 196 197 198 199 200 82 60 69 189 59 61 62 63 215 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 5 11 1 0 7 ICCARM - 194 193 192 195 183 196 197 198 199 200 24 121 130 189 120 122 123 124 215 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 5 11 1 0 7 + 194 193 192 195 183 196 197 198 199 200 82 60 69 189 59 61 62 63 215 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 5 11 1 0 7 @@ -326,17 +326,17 @@ ICCARM - 59 + 117 BICOMP - 189 193 192 195 183 196 197 198 24 121 130 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 6 0 + 189 193 192 195 183 196 197 198 82 60 69 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 6 0 ICCARM - 189 193 192 195 183 196 197 198 24 121 130 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 6 0 + 189 193 192 195 183 196 197 198 82 60 69 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 6 0 @@ -349,17 +349,17 @@ ICCARM - 58 + 116 BICOMP - 189 193 192 195 183 196 197 198 24 121 130 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 7 0 + 189 193 192 195 183 196 197 198 82 60 69 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 7 0 ICCARM - 189 193 192 195 183 196 197 198 24 121 130 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 7 0 + 189 193 192 195 183 196 197 198 82 60 69 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 7 0 @@ -378,11 +378,11 @@ BICOMP - 194 193 192 195 183 196 197 198 199 200 126 181 11 189 6 7 129 132 + 194 193 192 195 183 196 197 198 199 200 215 181 11 189 6 7 68 71 12 ICCARM - 194 193 192 195 183 196 197 198 199 200 215 181 11 189 6 7 129 132 + 194 193 192 195 183 196 197 198 199 200 215 181 11 189 6 7 68 71 12 @@ -395,7 +395,7 @@ ICCARM - 67 + 125 @@ -408,33 +408,10 @@ ICCARM - 64 + 122 - - $PROJ_DIR$\..\src\other\LandzoOLED.c - - - BICOMP - 72 - - - ICCARM - 71 - - - - - BICOMP - 40 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 - - - ICCARM - 40 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 - - - $PROJ_DIR$\..\src\app\pm_init.c @@ -450,11 +427,11 @@ BICOMP - 11 189 193 192 195 183 196 197 198 6 7 129 132 1 + 11 189 193 192 195 183 196 197 198 6 7 68 71 1 12 ICCARM - 11 189 193 192 195 183 196 197 198 6 7 129 132 1 + 11 189 193 192 195 183 196 197 198 6 7 68 71 1 12 @@ -467,17 +444,17 @@ ICCARM - 66 + 124 BICOMP - 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 11 0 + 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 11 0 6 ICCARM - 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 11 0 + 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 11 0 6 @@ -490,17 +467,17 @@ ICCARM - 62 + 120 BICOMP - 189 193 192 195 183 196 197 198 153 199 154 194 200 36 121 130 120 122 123 124 215 128 127 37 26 138 129 132 125 131 139 29 24 140 141 142 133 25 28 34 136 137 12 7 6 0 + 189 193 192 195 183 196 197 198 153 199 154 194 200 94 60 69 59 61 62 63 215 67 66 95 84 77 68 71 64 70 78 87 82 79 80 81 72 83 86 92 75 76 12 7 6 0 13 ICCARM - 189 193 192 195 183 196 197 198 153 199 154 194 200 36 121 130 120 122 123 124 215 128 127 37 26 138 129 132 125 131 139 29 24 140 141 142 133 25 28 34 136 137 12 7 6 0 + 189 193 192 195 183 196 197 198 153 199 154 194 200 94 60 69 59 61 62 63 215 67 66 95 84 77 68 71 64 70 78 87 82 79 80 81 72 83 86 92 75 76 12 7 6 0 13 @@ -513,9 +490,19 @@ ICCARM - 63 + 121 + + + BICOMP + 13 189 193 192 195 183 196 197 198 + + + ICCARM + 13 189 193 192 195 183 196 197 198 + + $PROJ_DIR$\..\src\common\alloc.c @@ -532,11 +519,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -555,11 +542,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -578,11 +565,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -601,11 +588,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -624,11 +611,11 @@ BICOMP - 123 + 62 ICCARM - 123 + 62 @@ -647,11 +634,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 49 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 103 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -660,7 +647,7 @@ BICOMP - 43 + 100 ICCARM @@ -670,11 +657,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -683,7 +670,7 @@ BICOMP - 41 + 101 ICCARM @@ -693,34 +680,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 - - - - - $PROJ_DIR$\..\src\common\stdlib.c - - - BICOMP - 42 - - - ICCARM - 145 - - - - - BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 - - - ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -729,7 +693,7 @@ BICOMP - 50 + 106 ICCARM @@ -739,11 +703,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -762,11 +726,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -794,11 +758,11 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -817,11 +781,11 @@ BICOMP - 131 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 139 29 24 140 36 141 142 133 25 28 34 136 137 + 70 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 131 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 139 29 24 140 36 141 142 133 25 28 34 136 137 + 70 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -840,11 +804,11 @@ BICOMP - 132 5 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 71 5 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 132 5 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 71 5 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -857,17 +821,17 @@ ICCARM - 73 + 131 BICOMP - 133 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 25 28 34 136 + 72 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 83 86 92 75 ICCARM - 133 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 25 28 34 136 + 72 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 83 86 92 75 @@ -880,17 +844,17 @@ ICCARM - 75 + 133 BICOMP - 134 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 73 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 134 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 73 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -903,17 +867,17 @@ ICCARM - 76 + 134 BICOMP - 135 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 74 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 135 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 74 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -926,17 +890,17 @@ ICCARM - 74 + 132 BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -945,21 +909,21 @@ BICOMP - 44 + 108 ICCARM - 77 + 135 BICOMP - 140 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 36 141 142 133 25 28 34 136 + 79 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 94 80 81 72 83 86 92 75 ICCARM - 140 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 36 141 142 133 25 28 34 136 + 79 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 94 80 81 72 83 86 92 75 @@ -968,21 +932,21 @@ BICOMP - 46 + 105 ICCARM - 78 + 136 BICOMP - 141 142 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 133 25 28 34 136 + 80 81 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 79 94 72 83 86 92 75 ICCARM - 141 142 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 133 25 28 34 136 + 80 81 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 72 83 86 92 75 @@ -991,21 +955,21 @@ BICOMP - 47 + 102 ICCARM - 79 + 137 BICOMP - 25 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 28 34 136 + 83 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 86 92 75 ICCARM - 25 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 28 34 136 + 83 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 86 92 75 @@ -1014,21 +978,21 @@ BICOMP - 45 + 107 ICCARM - 80 + 138 BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 27 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 85 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 27 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 85 @@ -1037,21 +1001,21 @@ BICOMP - 48 + 104 ICCARM - 81 + 139 BICOMP - 28 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 34 136 137 + 86 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 92 75 76 ICCARM - 28 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 34 136 137 + 86 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 92 75 76 @@ -1060,21 +1024,21 @@ BICOMP - 51 + 109 ICCARM - 82 + 140 BICOMP - 29 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 137 140 36 141 142 133 25 28 34 136 + 87 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 76 79 94 80 81 72 83 86 92 75 ICCARM - 29 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 137 140 36 141 142 133 25 28 34 136 + 87 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 76 79 94 80 81 72 83 86 92 75 @@ -1083,21 +1047,21 @@ BICOMP - 52 + 110 ICCARM - 83 + 141 BICOMP - 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 30 + 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 88 ICCARM - 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 34 136 30 + 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 88 @@ -1106,7 +1070,7 @@ BICOMP - 53 + 111 ICCARM @@ -1116,11 +1080,11 @@ BICOMP - 31 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 89 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 31 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 89 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -1129,7 +1093,7 @@ BICOMP - 54 + 112 ICCARM @@ -1139,11 +1103,11 @@ BICOMP - 32 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 90 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 32 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 90 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -1152,7 +1116,7 @@ BICOMP - 55 + 113 ICCARM @@ -1162,11 +1126,11 @@ BICOMP - 33 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 32 + 91 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 90 ICCARM - 33 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 32 + 91 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 90 @@ -1175,7 +1139,7 @@ BICOMP - 56 + 114 ICCARM @@ -1185,11 +1149,11 @@ BICOMP - 34 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 136 + 92 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 75 ICCARM - 34 24 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 137 140 36 141 142 133 25 28 136 + 92 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 75 @@ -1198,7 +1162,7 @@ BICOMP - 57 + 115 ICCARM @@ -1208,11 +1172,11 @@ BICOMP - 35 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 93 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 35 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 93 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -1221,7 +1185,7 @@ BICOMP - 70 + 128 ICCARM @@ -1231,11 +1195,57 @@ BICOMP - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 126 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 ICCARM - 121 130 189 193 192 195 183 196 197 198 120 122 123 124 215 199 128 127 37 26 138 129 132 125 131 139 29 24 140 36 141 142 133 25 28 34 136 137 + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 + + + + + $PROJ_DIR$\..\src\other\LandzoOLED.c + + + BICOMP + 130 + + + ICCARM + 129 + + + + + BICOMP + 98 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 + + + ICCARM + 98 82 60 69 189 193 192 195 183 196 197 198 59 61 62 63 215 199 67 66 95 84 77 68 71 64 70 78 87 76 79 94 80 81 72 83 86 92 75 + + + + + $PROJ_DIR$\..\src\common\stdlib.c + + + BICOMP + 99 + + + ICCARM + 145 + + + + + BICOMP + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 + + + ICCARM + 60 69 189 193 192 195 183 196 197 198 59 61 62 63 65 67 66 95 84 77 68 71 64 70 78 87 82 79 94 80 81 72 83 86 92 75 76 @@ -1244,7 +1254,7 @@ ILINK - 175 73 209 166 210 75 212 169 76 68 65 74 69 77 78 61 211 60 59 58 71 79 208 80 213 67 81 64 179 82 214 143 83 66 155 165 144 168 156 62 157 63 158 159 160 146 167 177 178 174 176 + 175 131 209 166 210 133 212 169 134 126 123 132 127 135 136 119 211 118 117 116 129 137 208 138 213 125 139 122 179 140 214 143 141 124 155 165 144 168 156 120 157 121 158 159 160 146 167 177 178 174 176 diff --git a/plan_manage_main/ewp/settings/plan_manage_main.dbgdt b/plan_manage_main/ewp/settings/plan_manage_main.dbgdt index ba71258..ed1de7e 100644 --- a/plan_manage_main/ewp/settings/plan_manage_main.dbgdt +++ b/plan_manage_main/ewp/settings/plan_manage_main.dbgdt @@ -19,7 +19,7 @@ - 298272727 + 146272727 @@ -33,8 +33,8 @@ - 11 - + 20011 + 44062754tft_cmd_strtft_cmd_strin_lmtExpressionLocationTypeValue100150100164200 @@ -53,9 +53,9 @@ Build - + TabID-3763-24568ReferencesFind-All-References - 0 + 0 TabID-23733-17524 @@ -63,34 +63,24 @@ Workspace - plan_manage_mainplan_manage_main/srcplan_manage_main/src/appplan_manage_main/src/app/include + plan_manage_mainplan_manage_main/srcplan_manage_main/src/appplan_manage_main/src/app/includeplan_manage_main/src/common - 0 - - - TabID-1714-17527 - Disassembly - Disassembly - - - - - 0 + 0TabID-22318-1392Watch 1WATCH_10 - TextEditorD:\work_soft\iar\arm\arm\doc\infocenter\index.ENU.htmlTextEditor$WS_DIR$\plan_manage_main\src\app\debug.c00000016841684TextEditor$WS_DIR$\plan_manage_main\src\drivers\adc.c000000394394TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\adc.h000000429429TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\include.h000000159159TextEditor$WS_DIR$\plan_manage_main\src\include\common\common.h000000578578TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\port.h000000787787TextEditor$WS_DIR$\plan_manage_main\src\include\cpu\MKL25Z4.h000001612411241TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\uart.h000000383383TextEditor$WS_DIR$\plan_manage_main\src\app\include\debug.h000000356356TextEditor$WS_DIR$\plan_manage_main\src\drivers\SPI.c000000479479TextEditor$WS_DIR$\plan_manage_main\src\app\include\key.h000006543543TextEditor$WS_DIR$\plan_manage_main\src\app\pm_init.c000000238238TextEditor$WS_DIR$\plan_manage_main\src\app\include\knob.h000009496496TextEditor$WS_DIR$\plan_manage_main\src\other\LandzoOLED.h000000528528TextEditor$WS_DIR$\plan_manage_main\src\include\platforms\freedom.h000000542542TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\fire_drivers_cfg.h000003496496TextEditor$WS_DIR$\plan_manage_main\src\app\knob.c000004416331633TextEditor$WS_DIR$\plan_manage_main\src\drivers\mcg.c000003556505650TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\mcg.h000000456456TextEditor$WS_DIR$\plan_manage_main\src\drivers\uart.c0000024391519151TextEditor$WS_DIR$\plan_manage_main\src\common\io.c0000013715715TextEditor$WS_DIR$\plan_manage_main\src\common\printf.c000006119291929TextEditor$WS_DIR$\plan_manage_main\src\app\main.c000008183183TextEditor$WS_DIR$\plan_manage_main\src\app\isr.c0000022576576TextEditor$WS_DIR$\plan_manage_main\src\app\include\isr.h000003435435TextEditor$WS_DIR$\plan_manage_main\src\app\simulat_timer.c000006717151715TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\gpio.h00000015811590TextEditor$WS_DIR$\plan_manage_main\src\app\key.c00000562537253728TextEditor$WS_DIR$\plan_manage_main\src\app\include\config.h0000083563560100000010000001 + TextEditorD:\work_soft\iar\arm\arm\doc\infocenter\index.ENU.htmlTextEditor$WS_DIR$\plan_manage_main\src\app\debug.c00000000TextEditor$WS_DIR$\plan_manage_main\src\drivers\adc.c000000394394TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\adc.h000000429429TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\include.h000000159159TextEditor$WS_DIR$\plan_manage_main\src\include\common\common.h000000578578TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\port.h000000787787TextEditor$WS_DIR$\plan_manage_main\src\include\cpu\MKL25Z4.h000001612411241TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\uart.h000000383383TextEditor$WS_DIR$\plan_manage_main\src\app\include\debug.h00000000TextEditor$WS_DIR$\plan_manage_main\src\drivers\SPI.c000000479479TextEditor$WS_DIR$\plan_manage_main\src\app\include\knob.h00000200TextEditor$WS_DIR$\plan_manage_main\src\other\LandzoOLED.h000000528528TextEditor$WS_DIR$\plan_manage_main\src\drivers\mcg.c000003556505650TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\mcg.h000000456456TextEditor$WS_DIR$\plan_manage_main\src\app\isr.c000000576576TextEditor$WS_DIR$\plan_manage_main\src\app\include\isr.h000000435435TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\gpio.h000000853853TextEditor$WS_DIR$\plan_manage_main\src\app\include\key.h00000300TextEditorD:\work_soft\iar\arm\arm\inc\c\string.h000004025062506TextEditor$WS_DIR$\plan_manage_main\src\include\platforms\freedom.h000000542542TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\fire_drivers_cfg.h000003953953TextEditor$WS_DIR$\plan_manage_main\src\drivers\uart.c0000029589758975TextEditor$WS_DIR$\plan_manage_main\src\app\key.c0000027700TextEditor$WS_DIR$\plan_manage_main\src\common\io.c000000715715TextEditor$WS_DIR$\plan_manage_main\src\common\printf.c000005231613716137TextEditor$WS_DIR$\plan_manage_main\src\app\include\config.h000000689689TextEditor$WS_DIR$\plan_manage_main\src\cpu\vectors.c000007321542154TextEditor$WS_DIR$\plan_manage_main\src\app\pm_init.c000000331331TextEditor$WS_DIR$\plan_manage_main\src\app\simulat_timer.c000006214711471TextEditor$WS_DIR$\plan_manage_main\src\app\tft.c000005370030TextEditor$WS_DIR$\plan_manage_main\src\app\include\tft.h000000149149TextEditor$WS_DIR$\plan_manage_main\src\cpu\crt0.s000000242242TextEditor$WS_DIR$\plan_manage_main\src\app\main.c000006194194TextEditor$WS_DIR$\plan_manage_main\src\app\knob.c000004110511051TextEditor$WS_DIR$\plan_manage_main\src\app\include\time.h000000134134TextEditor$WS_DIR$\plan_manage_main\src\app\time.c0000004574570100000010000001 - iaridepm.enu1debuggergui.enu1armjlink.enu1-2-2676389-2-2259311202344316701305469690428-2-2676257-2-2259311202344316701202344690428-2-22131282-2-212842151003125218941202344316701 + iaridepm.enu1debuggergui.enu1armjlink.enu1-2-2676237-2-2259311202344316701186719690428-2-2676395-2-2200200156250203666310156690428-2-22131282-2-212842151003125218941202344316701 diff --git a/plan_manage_main/ewp/settings/plan_manage_main.dni b/plan_manage_main/ewp/settings/plan_manage_main.dni index d44e65c..615eaaf 100644 --- a/plan_manage_main/ewp/settings/plan_manage_main.dni +++ b/plan_manage_main/ewp/settings/plan_manage_main.dni @@ -9,7 +9,7 @@ TriggerName=main LimitSize=0 ByteLimit=50 [DebugChecksum] -Checksum=-1423666763 +Checksum=2065568720 [CodeCoverage] Enabled=_ 0 [Exceptions] @@ -47,7 +47,7 @@ MultiCoreRunAll=1 CStepIntDis=_ 0 TraceBufferSize=0x00010000 TraceStallIfFIFOFull=0x00000000 -TracePortSize=0x00000000 +TracePortSize=0x00000004 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -66,7 +66,8 @@ Exclusions= [Disassemble mode] mode=0 [Breakpoints2] -Count=0 +Bp0=_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\src\app\main.c}.81.13" 0 0 1 "" 0 "" 0 +Count=1 [Aliases] Count=0 SuppressDialog=0 diff --git a/plan_manage_main/src/app/debug.c b/plan_manage_main/src/app/debug.c index e9f8ad7..e8a6dbf 100644 --- a/plan_manage_main/src/app/debug.c +++ b/plan_manage_main/src/app/debug.c @@ -1,5 +1,5 @@ /* - * debug.c - 调试功能的实现 + * debug.c - Թܵʵ */ #include @@ -15,7 +15,7 @@ volatile float recval_debug_uart[26]; /* - * debug_init() - 初始化调试功能 + * debug_init() - ʼԹ */ void debug_init(void) { @@ -24,11 +24,11 @@ void debug_init(void) } /* - * str_to_fp() - 将字符串转换为浮点数 - * @str: 字符串地址 - * @len: 字符串长度 + * str_to_fp() - ַתΪ + * @str: ַַ + * @len: ַ * - * 这个函数传入的字符串格式应符合c语言标准浮点格式，并且没有'\0' + * ַʽӦcԱ׼ʽû'\0' */ float str_to_fp(char str[], uint8_t len) { @@ -57,7 +57,7 @@ float str_to_fp(char str[], uint8_t len) } /* - * rec_debug_uart() - 接收uart传入的调试信息，并转换为浮点数 + * rec_debug_uart() - uartĵϢתΪ * */ void rec_debug_uart(void) @@ -190,11 +190,11 @@ void rec_debug_uart(void) index = 0; if (ch == '#') { - printf("清除缓存成功\n"); + printf("ɹ\n"); } else { - printf("设置%c为%s\n", ch, str_log); + printf("%cΪ%s\n", ch, str_log); } } return; diff --git a/plan_manage_main/src/app/include/config.h b/plan_manage_main/src/app/include/config.h index 67de150..ad956ad 100644 --- a/plan_manage_main/src/app/include/config.h +++ b/plan_manage_main/src/app/include/config.h @@ -1,5 +1,5 @@ /* - * config.h - 配置整个工程 + * config.h - * */ @@ -10,20 +10,20 @@ /* - * 模拟定时器使用的定时器 + * ģⶨʱʹõĶʱ */ #define SIMULAT_TIMER_PITX PIT1 /* - * 调试模块 + * ģ */ #define DEBUG_UARTX UART1 /* - * 输入模块 + * ģ */ #define UP_KEY_PINX PTE20 #define DOWN_KEY_PINX PTA17 @@ -35,16 +35,16 @@ #define MB_KEY_PINX PTA16 #define MUVB_KEY_PINX PTD6 -#define KNOB_A_PINX PTD3 -#define KNOB_B_PINX PTD4 -#define KNOB_KEY_PINX PTD5 +#define KNOB_A_PINX PTD6 +#define KNOB_B_PINX PTD7 +#define KNOB_KEY_PINX PTD4 // PTD5 /* - * 显示模块 + * ʾģ */ -#define TFT_UARTX UART2 +#define TFT_UARTX UART2 // PTD2,PTD3 diff --git a/plan_manage_main/src/app/include/debug.h b/plan_manage_main/src/app/include/debug.h index 081f4ca..f65f2b3 100644 --- a/plan_manage_main/src/app/include/debug.h +++ b/plan_manage_main/src/app/include/debug.h @@ -1,5 +1,5 @@ /* - * debug.h - 调试 + * debug.h - */ #ifndef DEBUG_H @@ -23,21 +23,21 @@ extern volatile float recval_debug_uart[26]; /* - * debug_init() - 初始化调试功能 + * debug_init() - ʼԹ */ void debug_init(void); /* - * str_to_fp() - 将字符串转换为浮点数 - * @str: 字符串地址 - * @len: 字符串长度 + * str_to_fp() - ַתΪ + * @str: ַַ + * @len: ַ * - * 这个函数传入的字符串格式应符合c语言标准浮点格式，并且没有'\0' + * ַʽӦcԱ׼ʽû'\0' */ float str_to_fp(char str[], uint8_t len); /* - * rec_debug_uart() - 接收uart传入的调试信息，并转换为浮点数 + * rec_debug_uart() - uartĵϢתΪ * */ void rec_debug_uart(void); diff --git a/plan_manage_main/src/app/include/input.h b/plan_manage_main/src/app/include/input.h index 6dcae03..ccd4523 100644 --- a/plan_manage_main/src/app/include/input.h +++ b/plan_manage_main/src/app/include/input.h @@ -1,6 +1,6 @@ /* - * 文件：input.h - * 功能：将外设输入的数据转换为单片机内存中的数据 + * ļinput.h + * ܣתΪƬڴе */ #ifndef INPUT_H diff --git a/plan_manage_main/src/app/include/key.h b/plan_manage_main/src/app/include/key.h index 737761a..584f7c9 100644 --- a/plan_manage_main/src/app/include/key.h +++ b/plan_manage_main/src/app/include/key.h @@ -1,6 +1,6 @@ -/* key.h - 监测并采集按键的输入 - * 共有四种输入，无键，单击，双击，长击。 - * 使用一个定时器每10ms采集一次io状态来实现的。 +/* key.h - Ⲣɼ + * 룬޼˫ + * ʹһʱÿ10msɼһio״̬ʵֵġ */ #ifndef KEY_H @@ -15,7 +15,7 @@ typedef enum key_mean_ /* - * key_type - 按键的种类 + * key_type - */ typedef enum key_type_ { @@ -25,31 +25,32 @@ typedef enum key_type_ /* - * key_init() - 按键模块初始化 + * key_init() - ģʼ * */ void key_init(void); /* - * key_detect() - 检测按键 + * key_detect() - ⰴ * - * 要求每隔10ms调用一次 + * Ҫÿ10msһ */ void key_detect(void); /* - * get_key_mean() - 得到指定的按键信息 + * get_key_mean() - õָİϢ * - * 这个函数中在取得信息后会将对应按键重新标记为N_KEY + * ȡϢὫӦ±ΪN_KEY */ key_mean get_key_mean(key_type key_t); +void clear_key_m(void); diff --git a/plan_manage_main/src/app/include/knob.h b/plan_manage_main/src/app/include/knob.h index 731214b..be9fe38 100644 --- a/plan_manage_main/src/app/include/knob.h +++ b/plan_manage_main/src/app/include/knob.h @@ -1,7 +1,7 @@ /* - * knob.h - 提供旋钮输入的接口函数 + * knob.h - ṩťĽӿں * - * 使用的是一个数字旋钮，利用计数来采集输入 + * ʹõһťüɼ */ #ifndef KNOB_H @@ -14,41 +14,41 @@ /* - * knob_init() - 为旋钮输入而执行的初始化 + * knob_init() - Ϊťִеijʼ * - * 旋钮的检测初始化后默认是禁止的 + * ťļʼĬǽֹ */ void knob_init(void); /* - * knob_enable() - 使能旋钮脉冲检测 + * knob_enable() - ʹť */ void knob_enable(void); /* - * knob_disable() - 禁止旋钮脉冲检测 + * knob_disable() - ֹť */ void knob_disable(void); /* - * knob_clear() - 清除旋钮值 + * knob_clear() - ťֵ */ void knob_clear(void); /* - * get_knob_val() - 返回旋钮值 + * get_knob_val() - ťֵ */ int32_t get_knob_val(void); /* - * knob_detect() - 旋钮检测 + * knob_detect() - ť * - * 这个函数需要在旋钮编码器的A相输出发生沿跳变时调用，即上下沿中断时 + * ҪťAʱãжʱ */ void knob_detect(void); diff --git a/plan_manage_main/src/app/include/pm_init.h b/plan_manage_main/src/app/include/pm_init.h index 8eb8b8c..b6f4b85 100644 --- a/plan_manage_main/src/app/include/pm_init.h +++ b/plan_manage_main/src/app/include/pm_init.h @@ -1,9 +1,9 @@ /* - * pm_init.h - 对整个应用程序的初始化 + * pm_init.h - Ӧóijʼ */ /* - * pm_init() - 初始化 + * pm_init() - ʼ */ void pm_init(void); diff --git a/plan_manage_main/src/app/include/simulat_timer.h b/plan_manage_main/src/app/include/simulat_timer.h index 3df2df1..07adfc1 100644 --- a/plan_manage_main/src/app/include/simulat_timer.h +++ b/plan_manage_main/src/app/include/simulat_timer.h @@ -1,5 +1,5 @@ /* - * simulat_timer.h - 实现一个模拟定时器 + * simulat_timer.h - ʵһģⶨʱ */ #ifndef SIMULAT_TIMER_H @@ -8,7 +8,7 @@ #include /* - * 模拟定时器的数量 + * ģⶨʱ */ #define SIMULAT_TIMER_NUM 3 @@ -16,14 +16,14 @@ typedef struct st_register_ { - uint8_t count; // 定时器计数 - uint32_t cmr; // 比较寄存器 + uint8_t count; // ʱ + uint32_t cmr; // ȽϼĴ struct { - uint8_t ten : 1; // 使能标志 - uint8_t tov : 1; // 溢出标志 - uint8_t tfc : 1; // 自由运行标志 - uint8_t tcf : 1; // 比较标志 + uint8_t ten : 1; // ʹܱ־ + uint8_t tov : 1; // ־ + uint8_t tfc : 1; // б־ + uint8_t tcf : 1; // Ƚϱ־ } flag; } st_register; @@ -35,55 +35,55 @@ typedef enum st_mode_ } st_mode; /* - * st_init() - 初始化实现模拟定时器所需的pit定时器 + * st_init() - ʼʵģⶨʱpitʱ * - * 基础定时为1ms + * ʱΪ1ms */ void st_base_init(void); /* - * st_init() - 初始化一个给定编号的模拟定时器 - * @n: 定时器编号 - * @st_m: 定时模式 - * @cmr_v: 定时器比较值，在非比较模式可以为任意值 + * st_init() - ʼһŵģⶨʱ + * @n: ʱ + * @st_m: ʱģʽ + * @cmr_v: ʱȽֵڷDZȽģʽΪֵ * - * 这个函数返回0表示正常完成了初始化任务，返回~0表示定时器已打开或不存在 + * 0ʾ˳ʼ񣬷~0ʾʱѴ򿪻򲻴 */ uint8_t st_init(uint8_t n, st_mode st_m, uint32_t cmr_v); /* - * st_close() - 关闭一个给定编号的模拟定时器 - * @n: 定时器编号 + * st_close() - رһŵģⶨʱ + * @n: ʱ */ void st_close(uint8_t n); /* - * st_tcf() - 查询tcf位返回 - * @n: 定时器编号 + * st_tcf() - ѯtcfλ + * @n: ʱ * - * 这个函数在没有过比较值的时候返回0，已过比较值得时候返回1，对于不存在或未打开 + * ûйȽֵʱ򷵻0ѹȽֵʱ򷵻1ڲڻδ */ uint8_t st_tcf(uint8_t n); /* - * st_tov() - 查询tov位返回 - * @n: 定时器编号 + * st_tov() - ѯtovλ + * @n: ʱ * - * 这个函数在没有溢出时返回0，没有溢出时返回1，对于不存在或未打开 + * ûʱ0ûʱ1ڲڻδ */ uint8_t st_tov(uint8_t n); /* - * st_count() - 查询当前模拟定时值 - * @n: 定时器编号 + * st_count() - ѯǰģⶨʱֵ + * @n: ʱ * - * 对于不存在或未打开 + * ڲڻδ */ uint32_t st_count(uint8_t n); @@ -92,9 +92,9 @@ uint32_t st_count(uint8_t n); /********************ISR******************/ /* - * st_base() -定时调用以模拟N路定时器 + * st_base() -ʱģN·ʱ * - * 定时的最小间隔等于这个函数被调用的周期 + * ʱСõ */ void st_base(void); diff --git a/plan_manage_main/src/app/include/tft.h b/plan_manage_main/src/app/include/tft.h index de9048b..f8f319c 100644 --- a/plan_manage_main/src/app/include/tft.h +++ b/plan_manage_main/src/app/include/tft.h @@ -1,5 +1,5 @@ /* - * tft.h - tft接口 + * tft.h - tftӿ */ @@ -7,8 +7,20 @@ #define TFT_H +typedef struct input_limit_ +{ + int16_t max; + int16_t min; +} input_limit; + void tft_init(void); +void tft_send_cmd(const char *cmd); + +void tft_left(void); + +void tft_right(void); + void tft_up(void); void tft_down(void); @@ -18,6 +30,10 @@ void tft_ok(void); void tft_ret(void); +int16_t get_value_of_kvp(char *name); + +input_limit tft_input_limit(char *name); + diff --git a/plan_manage_main/src/app/include/time.h b/plan_manage_main/src/app/include/time.h index e69de29..ff702de 100644 --- a/plan_manage_main/src/app/include/time.h +++ b/plan_manage_main/src/app/include/time.h @@ -0,0 +1,11 @@ +/* + * time.h - 时间处理 + */ + +#include + +uint8_t is_leapyear(uint16_t year); + + + +uint8_t get_month_days(uint16_t year, uint8_t month); diff --git a/plan_manage_main/src/app/key.c b/plan_manage_main/src/app/key.c index 5993891..5ab7f4d 100644 --- a/plan_manage_main/src/app/key.c +++ b/plan_manage_main/src/app/key.c @@ -1,17 +1,17 @@ /* - * key.c - 监测并采集按键的输入 + * key.c - Ⲣɼ * - * 共有四种输入，无键，单击，双击，长击。 - * 每10ms需要采集一次io状态。 - * 每增减一个按键，需要设置的有: + * 룬޼˫ + * ÿ10msҪɼһio״̬ + * ÿһҪõ: * - * key_type枚举类型中对应的枚举元素 + * key_typeöжӦöԪ * - * 对应的key_infomation变量 + * Ӧkey_infomation * - * key_init()函数中对应的初始化条目 - * key_detect()函数中对应检测条目 - * get_key_mean()函数中对应获取条目 + * key_init()жӦijʼĿ + * key_detect()жӦĿ + * get_key_mean()жӦȡĿ */ @@ -24,11 +24,11 @@ /* - * key_state - 表示按键的状态 - * key_state_0 初始状态，或者表示第一次单击状态 - * key_state_1 消抖和确认状态，或表示第二次单击状态 - * key_state_2 按键计时状态 - * key_state_3 按键等待释放状态 + * key_state - ʾ״̬ + * key_state_0 ʼ״̬߱ʾһε״̬ + * key_state_1 ȷ״̬ʾڶε״̬ + * key_state_2 ʱ״̬ + * key_state_3 ȴͷ״̬ */ typedef enum key_state_ { @@ -36,7 +36,7 @@ typedef enum key_state_ } key_state; /* - * IO状态符号定义 + * IO״̬Ŷ */ typedef enum state_sign_ { @@ -101,7 +101,7 @@ static volatile key_infomation /* - * key_init() - 按键模块初始化 + * key_init() - ģʼ * */ void key_init(void) @@ -118,7 +118,7 @@ void key_init(void) /* - * 初始化定时器为10ms定时中断，用于按键检测的定时执行 + * ʼʱΪ10msʱжϣڰĶʱִ */ @@ -127,32 +127,32 @@ void key_init(void) /* - * key_read_base - 按键基础读取函数， - * @key_info: 要检测按键的所需信息,必须在是全局变量区中存储的 + * key_read_base - ȡ + * @key_info: ҪⰴϢ,ȫֱд洢 * - * 这个函数返回 N_KEY,S_KEY,L_KEY三种情况 + * N_KEY,S_KEY,L_KEY */ key_mean key_read_base(volatile key_infomation *key_info) { state_sign key_state_io; key_mean key_m = N_KEY; - key_state_io = (*((*key_info).get_state_io))(); // 获取io状态 + key_state_io = (*((*key_info).get_state_io))(); // ȡio״̬ switch((*key_info).state_base) { case key_state_0: if (key_state_io == VALID) { - (*key_info).state_base = key_state_1; // 按键按下后首先进入消抖和按键确 - // 认状态 + (*key_info).state_base = key_state_1; // ºȽͰȷ + // ״̬ } break; case key_state_1: if (key_state_io == VALID) { (*key_info).time_base = 0; - (*key_info).state_base = key_state_2; // 按键如果仍然按下，则消抖完成， - // 状态转换,此时返回无按键事件 + (*key_info).state_base = key_state_2; // Ȼ£ɣ + // ״̬ת,ʱް¼ } else { @@ -162,20 +162,20 @@ key_mean key_read_base(volatile key_infomation *key_info) case key_state_2: if (key_state_io == INVALID) { - key_m = S_KEY; // 此时按键释放说明为一次短操作 + key_m = S_KEY; // ʱͷ˵Ϊһζ̲ (*key_info).state_base = key_state_0; } - else if (++(*key_info).time_base > 100) // 继续按下，计时加10ms，即本函 - // 数调用周期 + else if (++(*key_info).time_base > 100) // £ʱ10ms + // { - key_m = L_KEY; // 按下时间大于1s，返回 长按键 - (*key_info).state_base = key_state_3; // 转换为等待按键释放状态 + key_m = L_KEY; // ʱ1s + (*key_info).state_base = key_state_3; // תΪȴͷ״̬ } break; case key_state_3: if (key_state_io == INVALID) { - (*key_info).state_base = key_state_0; // 按键此时已释放，转换为初始状态 + (*key_info).state_base = key_state_0; // ʱͷţתΪʼ״̬ } break; default: @@ -185,10 +185,10 @@ key_mean key_read_base(volatile key_infomation *key_info) } /* - * key_read - 按键读取函数 - * @key_info: 要检测的按键所需的信息，必须是在全局变量区中存储的 + * key_read - ȡ + * @key_info: ҪİϢȫֱд洢 * - * 这个函数会返回N_KEY,S_KEY,D_KEY，L_KEY四情况 + * ᷵N_KEY,S_KEY,D_KEYL_KEY */ key_mean key_read(volatile key_infomation *key_info) { @@ -201,17 +201,17 @@ key_mean key_read(volatile key_infomation *key_info) case key_state_0: if (key_m_temp == S_KEY) { - (*key_info).time = 0; // 第一次单击状态，仍然返回无键，到下个周期 - // 判断是否出现双击 + (*key_info).time = 0; // һε״̬Ȼ޼¸ + // жǷ˫ (*key_info).state = key_state_1; } else { - key_m = key_m_temp; // 对于非单击，返回原事件 + key_m = key_m_temp; // ڷǵԭ¼ } break; case key_state_1: - if (key_m_temp == S_KEY) // 又一次单击，间隔 < 300ms + if (key_m_temp == S_KEY) // һε < 300ms { key_m = D_KEY; (*key_info).state = key_state_0; @@ -220,8 +220,8 @@ key_mean key_read(volatile key_infomation *key_info) { if (++(*key_info).time > 30) { - key_m = S_KEY; // 300ms内没有再出现单击事件，则返回上一次单 - // 击事件 + key_m = S_KEY; // 300msûٳֵ¼򷵻һε + // ¼ (*key_info).state = key_state_0; } } @@ -234,11 +234,11 @@ key_mean key_read(volatile key_infomation *key_info) /* - * key_detect() - 检测按键 + * key_detect() - ⰴ * - * 这个函数仅在N_KEY状态时记录按键信息，N_KEY是在应用程序获取按键信息的时候同时被设 - * 置的，这样做的目的是保证采集到的按键一定会被执行 - * 要求每隔10ms调用一次 + * N_KEY״̬ʱ¼ϢN_KEYӦóȡϢʱͬʱ + * õģĿDZ֤ɼİһᱻִ + * Ҫÿ10msһ */ void key_detect(void) { @@ -285,9 +285,9 @@ void key_detect(void) /* - * get_key_mean() - 得到指定的按键信息 + * get_key_mean() - õָİϢ * - * 这个函数中在取得信息后会将对应按键重新标记为N_KEY + * ȡϢὫӦ±ΪN_KEY */ key_mean get_key_mean(key_type key_t) { @@ -336,3 +336,17 @@ key_mean get_key_mean(key_type key_t) } return key_m; } + + +void clear_key_m(void) +{ + down_key_info.key_m = N_KEY; + up_key_info.key_m = N_KEY; + ok_key_info.key_m = N_KEY; + ret_key_info.key_m = N_KEY; + ams_key_info.key_m = N_KEY; + wifi_key_info.key_m = N_KEY; + mr_key_info.key_m = N_KEY; + mb_key_info.key_m = N_KEY; + muvb_key_info.key_m = N_KEY; +} diff --git a/plan_manage_main/src/app/knob.c b/plan_manage_main/src/app/knob.c index 799418e..e804882 100644 --- a/plan_manage_main/src/app/knob.c +++ b/plan_manage_main/src/app/knob.c @@ -1,7 +1,7 @@ /* - * knob.c - 提供旋钮输入的接口函数 + * knob.c - ṩťĽӿں * - * 使用的是一个数字旋钮，利用计数来采集输入 + * ʹõһťüɼ */ #include @@ -20,9 +20,9 @@ static volatile int32_t knob_val; /* - * knob_init() - 为旋钮输入而执行的初始化 + * knob_init() - Ϊťִеijʼ * - * 旋钮的检测初始化后默认是禁止的 + * ťļʼĬǽֹ */ void knob_init(void) { @@ -35,7 +35,7 @@ void knob_init(void) /* - * knob_enable() - 使能旋钮脉冲检测 + * knob_enable() - ʹť */ void knob_enable(void) { @@ -44,7 +44,7 @@ void knob_enable(void) } /* - * knob_disable() - 禁止旋钮脉冲检测 + * knob_disable() - ֹť */ void knob_disable(void) { @@ -55,7 +55,7 @@ void knob_disable(void) /* - * knob_clear() - 清除旋钮值 + * knob_clear() - ťֵ */ void knob_clear(void) { @@ -64,7 +64,7 @@ void knob_clear(void) } /* - * get_knob_val() - 返回旋钮值 + * get_knob_val() - ťֵ */ int32_t get_knob_val(void) { @@ -73,9 +73,9 @@ int32_t get_knob_val(void) /* - * knob_detect() - 旋钮检测 + * knob_detect() - ť * - * 这个函数需要在旋钮编码器的A相输出发生沿跳变时调用，即上下沿中断时 + * ҪťAʱãжʱ */ void knob_detect(void) { @@ -87,7 +87,7 @@ void knob_detect(void) { knob_val++; } - else // 即if ((knob_A == 0 && knob_B == 0) || (knob_A == 1 && knob_B == 1)) + else // if ((knob_A == 0 && knob_B == 0) || (knob_A == 1 && knob_B == 1)) { knob_val--; } diff --git a/plan_manage_main/src/app/main.c b/plan_manage_main/src/app/main.c index a3f6ddd..64bab69 100644 --- a/plan_manage_main/src/app/main.c +++ b/plan_manage_main/src/app/main.c @@ -6,6 +6,7 @@ #include "include/simulat_timer.h" #include "include/key.h" #include "include/knob.h" +#include "include/tft.h" void main(void) @@ -21,10 +22,7 @@ void main(void) while (1) { - if (st_tcf(0) == 1) - { - key_detect(); - } + if (st_tcf(1) == 1) { if (log != (knob_v = get_knob_val())) @@ -34,6 +32,45 @@ void main(void) } } + + switch (get_key_mean(UP_KEY)) + { + case N_KEY: + //printf("޼\n"); + break; + case S_KEY: + printf("\n"); + tft_left(); + break; + case D_KEY: + printf("˫\n"); + tft_up(); + break; + case L_KEY: + printf("\n"); + break; + default: + break; + } + switch (get_key_mean(DOWN_KEY)) + { + case N_KEY: + //printf("޼\n"); + break; + case S_KEY: + printf("\n"); + tft_right(); + break; + case D_KEY: + printf("˫\n"); + tft_down(); + break; + case L_KEY: + printf("\n"); + break; + default: + break; + } switch (get_key_mean(OK_KEY)) { case N_KEY: @@ -41,6 +78,25 @@ void main(void) break; case S_KEY: printf("\n"); + tft_ok(); + break; + case D_KEY: + printf("˫\n"); + break; + case L_KEY: + printf("\n"); + break; + default: + break; + } + switch (get_key_mean(RET_KEY)) + { + case N_KEY: + //printf("޼\n"); + break; + case S_KEY: + printf("\n"); + tft_ret(); break; case D_KEY: printf("˫\n"); diff --git a/plan_manage_main/src/app/pm_init.c b/plan_manage_main/src/app/pm_init.c index 840ed81..2eac0c8 100644 --- a/plan_manage_main/src/app/pm_init.c +++ b/plan_manage_main/src/app/pm_init.c @@ -1,15 +1,16 @@ /* - * pm_init.c - 对整个应用程序的初始化 + * pm_init.c - Ӧóijʼ */ #include "include/simulat_timer.h" #include "include/key.h" #include "include/knob.h" #include "include/debug.h" +#include "include/tft.h" /* - * pm_init() - 初始化 + * pm_init() - ʼ */ void pm_init(void) { @@ -17,4 +18,6 @@ void pm_init(void) key_init(); knob_init(); st_base_init(); + tft_init(); + return; } diff --git a/plan_manage_main/src/app/simulat_timer.c b/plan_manage_main/src/app/simulat_timer.c index 02952d9..c61ce29 100644 --- a/plan_manage_main/src/app/simulat_timer.c +++ b/plan_manage_main/src/app/simulat_timer.c @@ -1,38 +1,39 @@ /* - * simulat_timer.h - 实现一个模拟定时器 + * simulat_timer.h - ʵһģⶨʱ */ #include "include.h" #include "include/simulat_timer.h" #include "include/config.h" +#include "include/key.h" static volatile st_register st_r[SIMULAT_TIMER_NUM]; /* - * st_init() - 初始化实现模拟定时器所需的pit定时器 + * st_init() - ʼʵģⶨʱpitʱ * - * 基础定时为1ms + * ʱΪ1ms */ void st_base_init(void) { uint32_t cnt; cnt = bus_clk_khz * 1; - pit_init(SIMULAT_TIMER_PITX, cnt); // 1ms硬件定时中断周期 + pit_init(SIMULAT_TIMER_PITX, cnt); // 1msӲʱж return; } /* - * st_init() - 初始化一个给定编号的模拟定时器 - * @n: 定时器编号 - * @st_m: 定时模式 - * @cmr_v: 定时器比较值，在非比较模式可以为任意值 + * st_init() - ʼһŵģⶨʱ + * @n: ʱ + * @st_m: ʱģʽ + * @cmr_v: ʱȽֵڷDZȽģʽΪֵ * - * 这个函数返回0表示正常完成了初始化任务，返回~0表示定时器已打开或不存在 + * 0ʾ˳ʼ񣬷~0ʾʱѴ򿪻򲻴 */ uint8_t st_init(uint8_t n, st_mode st_m, uint32_t cmr_v) { @@ -58,8 +59,8 @@ uint8_t st_init(uint8_t n, st_mode st_m, uint32_t cmr_v) /* - * st_close() - 关闭一个给定编号的模拟定时器 - * @n: 定时器编号 + * st_close() - رһŵģⶨʱ + * @n: ʱ */ void st_close(uint8_t n) { @@ -68,10 +69,10 @@ void st_close(uint8_t n) } /* - * st_tcf() - 查询tcf位返回 - * @n: 定时器编号 + * st_tcf() - ѯtcfλ + * @n: ʱ * - * 这个函数在没有过比较值的时候返回0，已过比较值得时候返回1，对于不存在或未打开 + * ûйȽֵʱ򷵻0ѹȽֵʱ򷵻1ڲڻδ */ uint8_t st_tcf(uint8_t n) { @@ -90,10 +91,10 @@ uint8_t st_tcf(uint8_t n) } /* - * st_tov() - 查询tov位返回 - * @n: 定时器编号 + * st_tov() - ѯtovλ + * @n: ʱ * - * 这个函数在没有溢出时返回0，没有溢出时返回1，对于不存在或未打开 + * ûʱ0ûʱ1ڲڻδ */ uint8_t st_tov(uint8_t n) { @@ -111,10 +112,10 @@ uint8_t st_tov(uint8_t n) } /* - * st_count() - 查询当前模拟定时值 - * @n: 定时器编号 + * st_count() - ѯǰģⶨʱֵ + * @n: ʱ * - * 对于不存在或未打开 + * ڲڻδ */ uint32_t st_count(uint8_t n) { @@ -123,9 +124,9 @@ uint32_t st_count(uint8_t n) /* - * st_base() -定时调用以模拟N路定时器 + * st_base() -ʱģN·ʱ * - * 定时的最小间隔等于这个函数被调用的周期 + * ʱСõ */ void st_base(void) { @@ -133,21 +134,27 @@ void st_base(void) for (i = 0; i < SIMULAT_TIMER_NUM; i++) { - if (st_r[i].flag.ten == 1) // 使能 + if (st_r[i].flag.ten == 1) // ʹ { - if (++st_r[i].count == 0) // 溢出 + if (++st_r[i].count == 0) // { st_r[i].flag.tov = 1; - } // 溢出 - if (st_r[i].flag.tfc == 1) // 比较 + } // + if (st_r[i].flag.tfc == 1) // Ƚ { if (st_r[i].count == st_r[i].cmr) { st_r[i].count = 0; st_r[i].flag.tcf = 1; } - } // 比较 - } // 使能 + } // Ƚ + } // ʹ } + + if (st_tcf(0) == 1) + { + key_detect(); + } + return; } diff --git a/plan_manage_main/src/app/tft.c b/plan_manage_main/src/app/tft.c index 5801813..177b1f6 100644 --- a/plan_manage_main/src/app/tft.c +++ b/plan_manage_main/src/app/tft.c @@ -1,7 +1,7 @@ /* - * tft.c - tft 显示屏的接口 + * tft.c - tft ʾĽӿ * - * uart hmi方式 + * uart hmiʽ */ #include @@ -14,6 +14,7 @@ #include "include/knob.h" #include "include/key.h" #include "include/config.h" +#include "include/time.h" typedef struct kv_pair_ @@ -41,47 +42,96 @@ typedef enum entry_attr_ R_NUM = 0, RW_NUM, RW_PIC, SW_PAGE } entry_attr; +typedef enum tft_colour_ +{ + TFT_BACK = 65535, TFT_RED = 63488, TFT_PURPLE = 31 +} tft_colour; + + + + static tft_state tft_stt = { 0, 0, 0, 0 }; static uint8_t original_lyt[] = { 0, 1 }; -static uint8_t menu_lyt[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11 }; -static uint8_t obj_set_lyt[] = { 0, 4, 8, 12, 13, 16, 18, 19 }; +static uint8_t menu_lyt[] = { 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }; +static uint8_t obj_set_lyt[] = { 0, 4, 7, 11, 13}; + kv_pair kvp_menu[] = { - { "st_y", 2016, RW_NUM }, { "st_mo", 4, RW_NUM }, { "st_d", 14, RW_NUM }, { "st_mi", 0, RW_NUM }, - { "p1", 0, RW_PIC }, - { "p2", 0, RW_PIC }, - { "p3", 0, RW_PIC }, - { "p4", 0, RW_PIC }, - { "p5", 0, RW_PIC }, + { "st_y", 2016, RW_NUM }, { "st_mo", 4, RW_NUM }, { "st_d", 14, RW_NUM }, { "st_h", 0, RW_NUM }, { "st_mi", 0, RW_NUM }, + { "obj0", 0, SW_PAGE }, + { "obj1", 0, SW_PAGE }, + { "obj2", 0, SW_PAGE }, + { "obj3", 0, SW_PAGE }, + { "obj4", 0, SW_PAGE }, + { "obj5", 0, SW_PAGE }, + { "obj6", 0, SW_PAGE }, + { "obj7", 0, SW_PAGE }, { "note", 0, RW_NUM } }; kv_pair kvp_obj_set[][19] = { { - { "st_y", 2016, RW_NUM }, { "st_mo", 4, RW_NUM }, { "st_d", 14, RW_NUM }, { "st_mi", 0, RW_NUM }, - { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_mi", 0, RW_NUM }, - { "ed_y", 2016, RW_NUM }, { "ed_mo", 4, RW_NUM }, { "ed_d", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, - { "pd", 3, RW_NUM }, - { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, - { "lg_cnt", 0, RW_NUM }, { "wt_cnt", 0, RW_NUM }, - { "note", 0, RW_NUM } - }, - + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, + { "bg_h", 14, RW_NUM }, { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 0 { - { "st_y", 2016, RW_NUM }, { "st_mo", 4, RW_NUM }, { "st_d", 14, RW_NUM }, { "st_mi", 0, RW_NUM }, - { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_mi", 0, RW_NUM }, - { "ed_y", 2016, RW_NUM }, { "ed_mo", 4, RW_NUM }, { "ed_d", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, - { "pd", 3, RW_NUM }, - { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, - { "lg_cnt", 0, RW_NUM }, { "wt_cnt", 0, RW_NUM }, - { "note", 0, RW_NUM } - } + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, + { "bg_h", 14, RW_NUM }, { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 1 + { + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, + { "bg_h", 14, RW_NUM }, { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 2 + { + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_h", 14, RW_NUM }, + { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 3 + { + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_h", 14, RW_NUM }, + { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 4 + { + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_h", 14, RW_NUM }, + { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 5 + { + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_h", 14, RW_NUM }, + { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 6 + { + { "lg_r", 0, RW_PIC}, { "lg_b", 0, RW_PIC }, { "lg_uvb", 0, RW_PIC }, { "water", 0, RW_PIC }, + { "bg_y", 2016, RW_NUM }, { "bg_mo", 4, RW_NUM }, { "bg_d", 14, RW_NUM }, { "bg_h", 14, RW_NUM }, + { "bg_mi", 0, RW_NUM }, + { "ed_h", 14, RW_NUM }, { "ed_mi", 0, RW_NUM }, + { "lg_pd", 3, RW_NUM }, { "lg_cnt", 0, RW_NUM }, + }, // 7 }; -static char tft_cmd_str[10]; +static char tft_cmd_str[20]; /* * @@ -89,6 +139,7 @@ static char tft_cmd_str[10]; void tft_init(void) { uart_init(TFT_UARTX, 9600); + tft_send_cmd("page original"); return; } @@ -104,11 +155,67 @@ void tft_send_cmd(const char *cmd) uart_putchar(TFT_UARTX, 0xff); } +void tft_set_color(uint8_t etn, tft_colour tft_col) +{ + switch (tft_stt.pgn) + { + case ORIGINAL_PG: + break; + case MENU_PG: + switch (kvp_menu[etn].attr) + { + case R_NUM: + case RW_NUM: + sprintf(tft_cmd_str, "%s.bco=%d", kvp_menu[etn].key, tft_col); + tft_send_cmd(tft_cmd_str); + sprintf(tft_cmd_str, "ref %s", kvp_menu[etn].key); + tft_send_cmd(tft_cmd_str); + break; + case RW_PIC: + case SW_PAGE: + sprintf(tft_cmd_str, "%s_sg.bco=%d", kvp_menu[etn].key, tft_col); + tft_send_cmd(tft_cmd_str); + sprintf(tft_cmd_str, "ref %s_sg", kvp_menu[etn].key); + tft_send_cmd(tft_cmd_str); + break; + default: + break; + } + break; + case OBJ_SET_PG: + switch (kvp_obj_set[tft_stt.objn][etn].attr) + { + case R_NUM: + case RW_NUM: + sprintf(tft_cmd_str, "%s.bco=%d", kvp_obj_set[tft_stt.objn][etn].key, tft_col); + tft_send_cmd(tft_cmd_str); + sprintf(tft_cmd_str, "ref %s", kvp_obj_set[tft_stt.objn][etn].key); + tft_send_cmd(tft_cmd_str); + break; + case RW_PIC: + case SW_PAGE: + sprintf(tft_cmd_str, "%s_sg.bco=%d", kvp_obj_set[tft_stt.objn][etn].key, tft_col); + tft_send_cmd(tft_cmd_str); + sprintf(tft_cmd_str, "ref %s_sg", kvp_obj_set[tft_stt.objn][etn].key); + tft_send_cmd(tft_cmd_str); + break; + default: + break; + } + break; + default: + break; + } + return; +} + /* * */ void tft_up(void) { + uint8_t etn_log = tft_stt.etn; + switch (tft_stt.pgn) { case ORIGINAL_PG: @@ -124,6 +231,19 @@ void tft_up(void) tft_stt.ln--; } tft_stt.etn = menu_lyt[tft_stt.ln]; + + switch (kvp_menu[tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; case OBJ_SET_PG: if (tft_stt.ln > 0) @@ -131,6 +251,20 @@ void tft_up(void) tft_stt.ln--; } tft_stt.etn = obj_set_lyt[tft_stt.ln]; + + + switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; default: break; @@ -140,36 +274,67 @@ void tft_up(void) void tft_down(void) { + uint8_t etn_log = tft_stt.etn; + switch (tft_stt.pgn) { case ORIGINAL_PG: - if (tft_stt.ln < sizeof(original_lyt) / sizeof(uint8_t) - 1) + if (tft_stt.ln < sizeof(original_lyt) / sizeof(uint8_t) - 2) { tft_stt.ln++; } tft_stt.etn = original_lyt[tft_stt.ln]; break; case MENU_PG: - if (tft_stt.ln < sizeof(menu_lyt) / sizeof(uint8_t) - 1) + if (tft_stt.ln < sizeof(menu_lyt) / sizeof(uint8_t) - 2) { tft_stt.ln++; } tft_stt.etn = menu_lyt[tft_stt.ln]; + + switch (kvp_menu[tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; case OBJ_SET_PG: - if (tft_stt.ln < sizeof(obj_set_lyt) / sizeof(uint8_t) - 1) + if (tft_stt.ln < sizeof(obj_set_lyt) / sizeof(uint8_t) - 2) { tft_stt.ln++; } tft_stt.etn = obj_set_lyt[tft_stt.ln]; - break; + switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } + break; + default: + break; } return; } void tft_left(void) { + uint8_t etn_log = tft_stt.etn; + switch (tft_stt.pgn) { case ORIGINAL_PG: @@ -189,6 +354,18 @@ void tft_left(void) tft_stt.ln--; } } + switch (kvp_menu[tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; case OBJ_SET_PG: if (tft_stt.etn > 0) @@ -198,6 +375,18 @@ void tft_left(void) tft_stt.ln--; } } + switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; default: break; @@ -207,6 +396,8 @@ void tft_left(void) void tft_right(void) { + uint8_t etn_log = tft_stt.etn; + switch (tft_stt.pgn) { case ORIGINAL_PG: @@ -226,6 +417,19 @@ void tft_right(void) tft_stt.ln++; } } + + switch (kvp_menu[tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; case OBJ_SET_PG: if (tft_stt.etn < obj_set_lyt[sizeof(obj_set_lyt) / sizeof(uint8_t) - 1] - 1) @@ -235,6 +439,19 @@ void tft_right(void) tft_stt.ln++; } } + + switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) + { + case R_NUM: + case RW_NUM: + case RW_PIC: + case SW_PAGE: + tft_set_color(etn_log, TFT_BACK); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } break; default: break; @@ -249,13 +466,13 @@ void refrush_obj(void) switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) { case R_NUM: - sprintf(tft_cmd_str,"%s.txt=\"%d\"", + sprintf(tft_cmd_str,"%s.val=%d", kvp_obj_set[tft_stt.objn][tft_stt.etn].key, kvp_obj_set[tft_stt.objn][tft_stt.etn].value); tft_send_cmd(tft_cmd_str); break; case RW_NUM: - sprintf(tft_cmd_str,"%s.txt=\"%d\"", + sprintf(tft_cmd_str,"%s.val=%d", kvp_obj_set[tft_stt.objn][tft_stt.etn].key, kvp_obj_set[tft_stt.objn][tft_stt.etn].value); tft_send_cmd(tft_cmd_str); @@ -295,6 +512,7 @@ void tft_ret(void) tft_stt.ln = 0; tft_stt.etn = 0; tft_send_cmd("page original"); + tft_set_color(tft_stt.etn, TFT_PURPLE); break; case OBJ_SET_PG: tft_stt.pgn = MENU_PG; @@ -302,6 +520,7 @@ void tft_ret(void) tft_stt.etn = 0; tft_send_cmd("page menu"); refrush_menu(); + tft_set_color(tft_stt.etn, TFT_PURPLE); break; default: break; @@ -310,28 +529,13 @@ void tft_ret(void) } -void tft_ok(void) +void tft_input(void) { + input_limit in_lmt; + int16_t in_v, bg_v; switch (tft_stt.pgn) { case ORIGINAL_PG: - switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) - { - case R_NUM: - break; - case RW_NUM: - break; - case RW_PIC: - break; - case SW_PAGE: - tft_stt.pgn = MENU_PG; - tft_stt.ln = 0; - tft_stt.etn = 0; - tft_send_cmd("page menu"); - break; - default: - break; - } break; case MENU_PG: switch (kvp_menu[tft_stt.etn].attr) @@ -339,17 +543,40 @@ void tft_ok(void) case R_NUM: break; case RW_NUM: + tft_set_color(tft_stt.etn, TFT_RED); + + in_lmt = tft_input_limit(kvp_menu[tft_stt.etn].key); + bg_v = kvp_menu[tft_stt.etn].value; knob_enable(); while (get_key_mean(RET_KEY) == N_KEY) { - kvp_menu[tft_stt.etn].value += get_knob_val(); - sprintf(tft_cmd_str, "%s.txt=\"%d\"", kvp_menu[tft_stt.etn].key, + in_v = bg_v + get_knob_val(); + if (in_v < in_lmt.min) + { + kvp_menu[tft_stt.etn].value = in_lmt.min; + bg_v = in_lmt.min; + knob_clear(); + } + else if (in_v > in_lmt.max) + { + kvp_menu[tft_stt.etn].value = in_lmt.max; + bg_v = in_lmt.max; + knob_clear(); + } + else + { + kvp_menu[tft_stt.etn].value = in_v; + } + sprintf(tft_cmd_str, "%s.val=%d", kvp_menu[tft_stt.etn].key, kvp_menu[tft_stt.etn].value); tft_send_cmd(tft_cmd_str); } knob_disable(); + tft_set_color(tft_stt.etn, TFT_PURPLE); + clear_key_m(); break; case RW_PIC: + tft_set_color(tft_stt.etn, TFT_RED); while (get_key_mean(RET_KEY) == N_KEY) { if (get_key_mean(UP_KEY) == S_KEY || get_key_mean(DOWN_KEY) == S_KEY) @@ -360,36 +587,55 @@ void tft_ok(void) tft_send_cmd(tft_cmd_str); } } + tft_set_color(tft_stt.etn, TFT_PURPLE); + clear_key_m(); break; case SW_PAGE: - tft_stt.pgn = OBJ_SET_PG; - tft_stt.objn = kvp_menu[tft_stt.etn].value; - tft_stt.ln = 0; - tft_stt.etn = 0; - tft_send_cmd("page obj_set"); - refrush_obj(); break; default: break; } + break; case OBJ_SET_PG: switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) { case R_NUM: break; case RW_NUM: + tft_set_color(tft_stt.etn, TFT_RED); + in_lmt = tft_input_limit(kvp_obj_set[tft_stt.objn][tft_stt.etn].key); + bg_v = kvp_obj_set[tft_stt.objn][tft_stt.etn].value; knob_enable(); while (get_key_mean(RET_KEY) == N_KEY) { - kvp_obj_set[tft_stt.objn][tft_stt.etn].value += get_knob_val(); - sprintf(tft_cmd_str,"%s.txt=\"%d\"", - kvp_obj_set[tft_stt.objn][tft_stt.etn].key, + in_v = bg_v + get_knob_val(); + if (in_v < in_lmt.min) + { + kvp_obj_set[tft_stt.objn][tft_stt.etn].value = in_lmt.min; + bg_v = in_lmt.min; + knob_clear(); + } + else if (in_v > in_lmt.max) + { + kvp_obj_set[tft_stt.objn][tft_stt.etn].value = in_lmt.max; + bg_v = in_lmt.max; + knob_clear(); + } + else + { + kvp_obj_set[tft_stt.objn][tft_stt.etn].value = in_v; + } + sprintf(tft_cmd_str, "%s.val=%d", kvp_obj_set[tft_stt.objn][tft_stt.etn].key, kvp_obj_set[tft_stt.objn][tft_stt.etn].value); tft_send_cmd(tft_cmd_str); } knob_disable(); + tft_set_color(tft_stt.etn, TFT_PURPLE); + clear_key_m(); break; case RW_PIC: + tft_set_color(tft_stt.etn, TFT_RED); + while (get_key_mean(RET_KEY) == N_KEY) { if (get_key_mean(UP_KEY) == S_KEY || get_key_mean(DOWN_KEY)) @@ -402,6 +648,79 @@ void tft_ok(void) tft_send_cmd(tft_cmd_str); } } + + tft_set_color(tft_stt.etn, TFT_PURPLE); + clear_key_m(); + break; + case SW_PAGE: + break; + default: + break; + } + break; + default: + break; + } +} + +void tft_ok(void) +{ + switch (tft_stt.pgn) + { + case ORIGINAL_PG: + switch (SW_PAGE) + { + case R_NUM: + break; + case RW_NUM: + break; + case RW_PIC: + break; + case SW_PAGE: + tft_stt.pgn = MENU_PG; + tft_stt.ln = 0; + tft_stt.etn = 0; + tft_send_cmd("page menu"); + tft_set_color(tft_stt.etn, TFT_PURPLE); + break; + default: + break; + } + break; + case MENU_PG: + switch (kvp_menu[tft_stt.etn].attr) + { + case R_NUM: + break; + case RW_NUM: + tft_input(); + break; + case RW_PIC: + tft_input(); + break; + case SW_PAGE: + tft_stt.pgn = OBJ_SET_PG; + tft_stt.objn = kvp_menu[tft_stt.etn].value; + tft_stt.ln = 0; + tft_stt.etn = 0; + tft_send_cmd("page obj_set"); + tft_set_color(tft_stt.etn, TFT_PURPLE); + //refrush_obj(); + break; + default: + break; + } + break; + case OBJ_SET_PG: + switch (kvp_obj_set[tft_stt.objn][tft_stt.etn].attr) + { + case R_NUM: + break; + case RW_NUM: + tft_input(); + break; + case RW_PIC: + tft_input(); break; case SW_PAGE: break; @@ -415,3 +734,100 @@ void tft_ok(void) return; } + + + +int16_t get_value_of_kvp(char *name) +{ + for (int i = 0; i < sizeof(kvp_menu) / sizeof(kv_pair); i++) + { + if (strcmp(name, kvp_menu[i].key) == 0) + { + return kvp_menu[i].value; + } + } + for (int i = 0; i < sizeof(kvp_obj_set[0]) / sizeof(kv_pair); i++) + { + if (strcmp(name, kvp_obj_set[0][i].key) == 0); + { + return kvp_obj_set[0][i].value; + } + } + return ~0; +} + +input_limit tft_input_limit(char *name) +{ + input_limit in_lmt; + if (strcmp(name, "st_y") == 0) + { + in_lmt.min = 1970; + in_lmt.max = 2100; + } + else if (strcmp(name, "st_mo") == 0) + { + in_lmt.min = 1; + in_lmt.max = 12; + } + else if (strcmp(name, "st_d") == 0) + { + in_lmt.min = 1; + in_lmt.max = get_month_days(get_value_of_kvp("st_y"), get_value_of_kvp("st_mo")); + } + else if (strcmp(name, "st_h") == 0) + { + in_lmt.min = 0; + in_lmt.max = 23; + } + else if (strcmp(name, "st_mi") == 0) + { + in_lmt.min = 0; + in_lmt.max = 59; + } + else if (strcmp(name, "bg_y") == 0) + { + in_lmt.min = 1970; + in_lmt.max = 2100; + } + else if (strcmp(name, "bg_mo") == 0) + { + in_lmt.min = 1; + in_lmt.max = 12; + } + else if (strcmp(name, "bg_d") == 0) + { + in_lmt.min = 1; + in_lmt.max = get_month_days(get_value_of_kvp("bg_y"), get_value_of_kvp("bg_mo")); + } + else if (strcmp(name, "bg_h") == 0) + { + in_lmt.min = 0; + in_lmt.max = 23; + } + else if (strcmp(name, "bg_mi") == 0) + { + in_lmt.min = 0; + in_lmt.max = 59; + } + else if (strcmp(name, "bg_mi") == 0) + { + in_lmt.min = 0; + in_lmt.max = 59; + } + else if (strcmp(name, "ed_h") == 0) + { + in_lmt.min = 0; + in_lmt.max = 23; + } + else if (strcmp(name, "ed_mi") == 0) + { + in_lmt.min = 0; + in_lmt.max = 59; + } + else + { + in_lmt.min = 0; + in_lmt.max = 0; + } + return in_lmt; +} diff --git a/plan_manage_main/src/app/time.c b/plan_manage_main/src/app/time.c index e69de29..2f7bcf7 100644 --- a/plan_manage_main/src/app/time.c +++ b/plan_manage_main/src/app/time.c @@ -0,0 +1,31 @@ +/* + * time.c - 时间处理 + */ + +#include "include/time.h" + + + +uint8_t is_leapyear(uint16_t year) +{ + return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0; +} + +uint8_t get_month_days(uint16_t year, uint8_t month) +{ + switch (month) + { + case 4: + case 6: + case 9: + case 11: + return 30; + case 2: + if (is_leapyear(year)) + return 29; + else + return 28; + default: + return 31; + } +} diff --git a/settings/plan_manage.wsdt b/settings/plan_manage.wsdt index 6f329dd..a4ab14a 100644 --- a/settings/plan_manage.wsdt +++ b/settings/plan_manage.wsdt @@ -27,7 +27,7 @@ 251 - 201244 + 20124444062754 @@ -57,7 +57,7 @@ Find-in-Files - TabID-229-19806Debug LogDebug-Log + TabID-229-19806Debug LogDebug-LogTabID-17440-26563ReferencesFind-All-References 0 @@ -65,14 +65,14 @@ - TextEditorD:\work_soft\iar\arm\arm\doc\infocenter\index.ENU.htmlTextEditor$WS_DIR$\plan_manage_main\src\app\debug.c00000016841684TextEditor$WS_DIR$\plan_manage_main\src\drivers\adc.c000000394394TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\adc.h000000429429TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\include.h000000159159TextEditor$WS_DIR$\plan_manage_main\src\include\common\common.h000000578578TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\port.h000000787787TextEditor$WS_DIR$\plan_manage_main\src\include\cpu\MKL25Z4.h000001612411241TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\uart.h000000383383TextEditor$WS_DIR$\plan_manage_main\src\app\include\debug.h000000356356TextEditor$WS_DIR$\plan_manage_main\src\drivers\SPI.c000000479479TextEditor$WS_DIR$\plan_manage_main\src\app\pm_init.c000000238238TextEditor$WS_DIR$\plan_manage_main\src\app\include\knob.h000009496496TextEditor$WS_DIR$\plan_manage_main\src\other\LandzoOLED.h000000528528TextEditor$WS_DIR$\plan_manage_main\src\include\platforms\freedom.h000000542542TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\fire_drivers_cfg.h000003496496TextEditor$WS_DIR$\plan_manage_main\src\app\knob.c000004416331633TextEditor$WS_DIR$\plan_manage_main\src\drivers\mcg.c000003556505650TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\mcg.h000000456456TextEditor$WS_DIR$\plan_manage_main\src\drivers\uart.c000003481024810248TextEditor$WS_DIR$\plan_manage_main\src\common\io.c000000715715TextEditor$WS_DIR$\plan_manage_main\src\common\printf.c000006119291929TextEditor$WS_DIR$\plan_manage_main\src\app\main.c000000964964TextEditor$WS_DIR$\plan_manage_main\src\app\isr.c000000576576TextEditor$WS_DIR$\plan_manage_main\src\app\include\isr.h000000435435TextEditor$WS_DIR$\plan_manage_main\src\app\simulat_timer.c000006717151715TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\gpio.h000000853853TextEditor$WS_DIR$\plan_manage_main\src\app\key.c000002112071207TextEditor$WS_DIR$\plan_manage_main\src\app\include\config.h00000000TextEditor$WS_DIR$\plan_manage_main\src\app\include\key.h0000012654654TextEditor$WS_DIR$\plan_manage_main\src\app\tft.c00000822484248430TextEditor$WS_DIR$\plan_manage_main\src\include\common\stdlib.h000000116116TextEditorD:\work_soft\iar\arm\arm\inc\c\string.h0000040250625060100000010000001 + TextEditorD:\work_soft\iar\arm\arm\doc\infocenter\index.ENU.htmlTextEditor$WS_DIR$\plan_manage_main\src\app\debug.c00000000TextEditor$WS_DIR$\plan_manage_main\src\drivers\adc.c000000394394TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\adc.h000000429429TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\include.h000000159159TextEditor$WS_DIR$\plan_manage_main\src\include\common\common.h000000578578TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\port.h000000787787TextEditor$WS_DIR$\plan_manage_main\src\include\cpu\MKL25Z4.h000001612411241TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\uart.h000000383383TextEditor$WS_DIR$\plan_manage_main\src\app\include\debug.h00000000TextEditor$WS_DIR$\plan_manage_main\src\drivers\SPI.c000000479479TextEditor$WS_DIR$\plan_manage_main\src\app\include\knob.h00000200TextEditor$WS_DIR$\plan_manage_main\src\other\LandzoOLED.h000000528528TextEditor$WS_DIR$\plan_manage_main\src\drivers\mcg.c000003556505650TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\mcg.h000000456456TextEditor$WS_DIR$\plan_manage_main\src\app\isr.c000000576576TextEditor$WS_DIR$\plan_manage_main\src\app\include\isr.h000000435435TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\gpio.h000000853853TextEditor$WS_DIR$\plan_manage_main\src\app\include\key.h00000300TextEditorD:\work_soft\iar\arm\arm\inc\c\string.h000004025062506TextEditor$WS_DIR$\plan_manage_main\src\include\platforms\freedom.h000000542542TextEditor$WS_DIR$\plan_manage_main\src\include\drivers\fire_drivers_cfg.h000003953953TextEditor$WS_DIR$\plan_manage_main\src\drivers\uart.c0000029589758975TextEditor$WS_DIR$\plan_manage_main\src\app\key.c0000027700TextEditor$WS_DIR$\plan_manage_main\src\common\io.c000000715715TextEditor$WS_DIR$\plan_manage_main\src\common\printf.c000005231613716137TextEditor$WS_DIR$\plan_manage_main\src\app\include\config.h000000689689TextEditor$WS_DIR$\plan_manage_main\src\cpu\vectors.c000007321542154TextEditor$WS_DIR$\plan_manage_main\src\app\pm_init.c000000331331TextEditor$WS_DIR$\plan_manage_main\src\app\simulat_timer.c000006214711471TextEditor$WS_DIR$\plan_manage_main\src\app\tft.c000005370030TextEditor$WS_DIR$\plan_manage_main\src\app\include\tft.h000000149149TextEditor$WS_DIR$\plan_manage_main\src\cpu\crt0.s000000242242TextEditor$WS_DIR$\plan_manage_main\src\app\main.c000006194194TextEditor$WS_DIR$\plan_manage_main\src\app\knob.c000004110511051TextEditor$WS_DIR$\plan_manage_main\src\app\include\time.h000000134134TextEditor$WS_DIR$\plan_manage_main\src\app\time.c0000004574570100000010000001 - iaridepm.enu1-2-2570299-2-21589512343896741235156582485-2-23671282-2-21284369100312537576412343896741 + iaridepm.enu1-2-2714299-2-21589512343896741235156729124-2-22231282-2-21284225100312522912412343896741