Mercurial > ~darius > hgwebdir.cgi > stm32temp
comparison main.c @ 44:f1cc171b06b5
Remove useless delay test. Add GPIO PE2 changes to make testing arbitary delays possible.
author | Daniel O'Connor <darius@dons.net.au> |
---|---|
date | Tue, 02 Apr 2013 10:54:20 +1030 |
parents | a38003b97de6 |
children | 6466e8720e04 |
comparison
equal
deleted
inserted
replaced
43:b4440f9f6d47 | 44:f1cc171b06b5 |
---|---|
206 flashcmd(argc - 1, argv + 1); | 206 flashcmd(argc - 1, argv + 1); |
207 } else if (!strcmp("tc", argv[0])) { | 207 } else if (!strcmp("tc", argv[0])) { |
208 tempctrl_cmd(argc - 1, argv + 1); | 208 tempctrl_cmd(argc - 1, argv + 1); |
209 } else if (!strcmp("pwm", argv[0])) { | 209 } else if (!strcmp("pwm", argv[0])) { |
210 lcd_setpwm(atoi(argv[1])); | 210 lcd_setpwm(atoi(argv[1])); |
211 } else if (!strcmp("timing", argv[0])) { | |
212 fputs("Timing..\r\n", stdout); | |
213 delay(10000); | |
214 fputs("Done\r\n", stdout); | |
215 } else if (!strcmp("circ", argv[0])) { | 211 } else if (!strcmp("circ", argv[0])) { |
216 if (argc != 5) { | 212 if (argc != 5) { |
217 fputs("Unable to parse circ args\r\n", stdout); | 213 fputs("Unable to parse circ args\r\n", stdout); |
218 goto out; | 214 goto out; |
219 } | 215 } |
247 y1 = atoi(argv[4]); | 243 y1 = atoi(argv[4]); |
248 c = lcd_parsecol(argv[5][0]); | 244 c = lcd_parsecol(argv[5][0]); |
249 | 245 |
250 lcd_line(x, y, x1, y1, c); | 246 lcd_line(x, y, x1, y1, c); |
251 } else if (!strcmp("delay", argv[0])) { | 247 } else if (!strcmp("delay", argv[0])) { |
252 GPIO_InitTypeDef GPIO_InitStructure; | |
253 | |
254 GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2; | |
255 GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; | |
256 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; | |
257 GPIO_Init(GPIOE, &GPIO_InitStructure); | |
258 | |
259 for (x = 0; x < 100; x++) { | 248 for (x = 0; x < 100; x++) { |
260 GPIO_SetBits(GPIOE, GPIO_Pin_2); | 249 GPIO_SetBits(GPIOE, GPIO_Pin_2); |
261 delay(30); | 250 delay(30); |
262 GPIO_ResetBits(GPIOE, GPIO_Pin_2); | 251 GPIO_ResetBits(GPIOE, GPIO_Pin_2); |
263 delay(60); | 252 delay(60); |
264 } | 253 } |
254 } else if (!strcmp("cyc", argv[0])) { | |
255 if (argc != 2) { | |
256 fputs("Incorrect number of arguments\r\n", stdout); | |
257 goto out; | |
258 } | |
259 | |
260 GPIO_SetBits(GPIOE, GPIO_Pin_2); | |
261 delay(atoi(argv[1])); | |
262 GPIO_ResetBits(GPIOE, GPIO_Pin_2); | |
263 | |
264 fputs("Done\r\n", stdout); | |
265 } else if (!strcmp("rs", argv[0])) { | 265 } else if (!strcmp("rs", argv[0])) { |
266 printf("Reset got %d\r\n", OWTouchReset()); | 266 printf("Reset got %d\r\n", OWTouchReset()); |
267 } else if (!strcmp("sr", argv[0])) { | 267 } else if (!strcmp("sr", argv[0])) { |
268 uint8_t ROM[8]; | 268 uint8_t ROM[8]; |
269 int8_t i; | 269 int8_t i; |
347 maxerr = err; | 347 maxerr = err; |
348 } | 348 } |
349 printf("Max err = %.3f\r\n", maxerr); | 349 printf("Max err = %.3f\r\n", maxerr); |
350 } else if (!strcmp("assert", argv[0])) { | 350 } else if (!strcmp("assert", argv[0])) { |
351 assert(0 == 1); | 351 assert(0 == 1); |
352 } else if (!strcmp("cyc", argv[0])) { | |
353 if (argc != 2) { | |
354 fputs("Incorrect number of arguments\r\n", stdout); | |
355 goto out; | |
356 } | |
357 | |
358 delay(atoi(argv[1])); | |
359 | |
360 fputs("Done\r\n", stdout); | |
361 } else if (!strcmp("zz", argv[0])) { | 352 } else if (!strcmp("zz", argv[0])) { |
362 NVIC_SystemReset(); | 353 NVIC_SystemReset(); |
363 } else { | 354 } else { |
364 printf("Unknown command\r\n"); | 355 printf("Unknown command\r\n"); |
365 } | 356 } |