Rev 2945 Rev 2946
Line 366... Line 366...
366 * Application entry point. 366 * Application entry point.
367 */ 367 */
368 int main(void) { 368 int main(void) {
369 uint8_t znaky[20]; 369 uint8_t znaky[20];
370 char prikaz[MAX_DELKA_PRIKAZU + 1]; 370 char prikaz[MAX_DELKA_PRIKAZU + 1];
371 uint8_t uk_pri = 0; 371 uint8_t pocet_znaku = 0;
372 uint8_t zapis = 0; // pokud je prijata '*', zacina se s rozpoznanim prikazu az do '\n' -  
373   372  
374 /* 373 /*
375 * System initializations. 374 * System initializations.
376 * - HAL initialization, this also initializes the configured device drivers 375 * - HAL initialization, this also initializes the configured device drivers
377 * and performs the board-specific initializations. 376 * and performs the board-specific initializations.
Line 437... Line 436...
437 * Zelena led aktivace portu 436 * Zelena led aktivace portu
438 */ 437 */
439   438  
440 palSetPadMode(GPIOB, GPIOB_LED4, PAL_MODE_OUTPUT_PUSHPULL); 439 palSetPadMode(GPIOB, GPIOB_LED4, PAL_MODE_OUTPUT_PUSHPULL);
441 palSetPadMode(GPIOB, GPIOB_LED3, PAL_MODE_OUTPUT_PUSHPULL); 440 palSetPadMode(GPIOB, GPIOB_LED3, PAL_MODE_OUTPUT_PUSHPULL);
442 //test_println("ahoj"); -  
443 /*sdRead(&SD1,znaky,5); -  
444 sdWrite(&SD1,"\n",1); -  
445 sdWrite(&SD1,znaky,2); -  
446 palWritePad(GPIOB, GPIOB_LED4, PAL_HIGH); -  
447 */ 441  
448 /* 442 /*
449 * Creates the example thread. 443 * Creates the example thread.
450 */ 444 */
451 chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL); 445 chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
452   446  
Line 470... Line 464...
470   464  
471 sdRead(&SD1,znaky,1); 465 sdRead(&SD1,znaky,1);
472 /*Kdyz uzivatel stiskne enter -> dekoduj a vykonej prikaz*/ 466 /*Kdyz uzivatel stiskne enter -> dekoduj a vykonej prikaz*/
473 if (znaky[0] == '\r') 467 if (znaky[0] == '\r')
474 { 468 {
475 uk_pri = 0; 469 pocet_znaku = 0;
476 zapis = 0; -  
477 dekodujPrikaz(prikaz); 470 dekodujPrikaz(prikaz);
478 prikaz[0] = 0; 471 prikaz[0] = 0;
479 } 472 }
480 /*Uklada prikaz*/ 473 /*Uklada prikaz*/
481 if (zapis == 1 && uk_pri < MAX_DELKA_PRIKAZU) 474 else if (pocet_znaku < MAX_DELKA_PRIKAZU)
482 { 475 {
483 prikaz[uk_pri++] = znaky[0]; 476 prikaz[pocet_znaku + 1] = 0;
484 prikaz[uk_pri + 1] = 0; 477 prikaz[pocet_znaku++] = znaky[0];
485 } 478 }
486 /*Pokud je prikaz delsi, nez by mel byt, prestane ukladat a upozorni uzivatele*/ 479 /*Pokud je prikaz delsi, nez by mel byt, prestane ukladat a upozorni uzivatele*/
487 else if (zapis == 1 && uk_pri == MAX_DELKA_PRIKAZU) 480 else
488 { 481 {
489 uk_pri = 0; 482 pocet_znaku = 0;
490 zapis = 0; -  
491 dekodujPrikaz(prikaz); 483 dekodujPrikaz(prikaz);
492 } 484 }
493 /*Uzivatel zacal zadavat prikaz*/ -  
494 if(znaky[0] == '*' && zapis == 0) -  
495 zapis = 1; -  
496   -  
497 485 /*
498 if (palReadPad(GPIOA, GPIOA_BUTTON)) 486 if (palReadPad(GPIOA, GPIOA_BUTTON))
499   487  
500 TestThread(&SD1); 488 TestThread(&SD1);
501 chThdSleepMilliseconds(500); 489 chThdSleepMilliseconds(500);
-   490 */
502 } 491 }
503 } 492 }