Revision 57:270b6c82d071, committed 2018-05-23

Comitter:

digo1234

Date:

Wed May 23 13:40:44 2018 +0000

Parent:

56:5aedf3b4e184

Child:

58:c600f21ab6f9

Commit message:

Ihm incorporada funcional;

Changed in this revision

--- a/main.cpp	Tue May 22 18:43:54 2018 +0000
+++ b/main.cpp	Wed May 23 13:40:44 2018 +0000
@@ -3,13 +3,13 @@
  * @file    main.cpp
  * @author  Davide Aliprandi, STMicroelectronics
  * @version V1.0.0
- * @date    October 14th, 2015
+ * @date    October 14th, 1025
  * @brief   mbed test application for the STMicroelectronics X-NUCLEO-IHM01A1
  *          Motor Control Expansion Board: control of 2 motors.
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
+ * <h2><center>&copy; COPYRIGHT(c) 1025 STMicroelectronics</center></h2>
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -60,12 +60,12 @@
 /* Definitions ---------------------------------------------------------------*/
 
 /* Number of steps. */
-#define STEPS 3200
+#define STEPS 3101
 
 /* Delay in milliseconds. */
 #define DELAY_1 20
-#define DELAY_2 200
-#define DELAY_3 2000
+#define DELAY_2 101
+#define DELAY_3 1010
 
 /* Speed in pps (Pulses Per Second).
    In Full Step mode: 1 pps = 1 step/s).
@@ -469,8 +469,23 @@
             lcd.printf("2-INICIAR PROGRAMA");
             menu=0;
             }
-        else {    
+        else {
+            lcd.cls();
+            lcd.setAddress(3,0);
+            lcd.printf("TEM CERTEZA QUE");
+            lcd.setAddress(0,2);
+            lcd.printf("DESEJA INICIAR PROGRAMA?");
+            lcd.setAddress(0,3);
+            lcd.printf("1-SIM");
+            lcd.setAddress(10,3);
+            lcd.printf("2-NAO"); 
+            menu=103;
+            safe = 1;
+            }
+        }
+    if (botao1 && menu == 103 && safe == 0) {
         lcd.setAddress(0,0);
+        lcd.cls();
         lcd.printf("AGUARDE...");
         vai_caminho_desejado(listaX, listaY, listaZ, index);
         wait_ms(DELAY_2);
@@ -483,7 +498,21 @@
         lcd.printf("2-INICIAR PROGRAMA"); 
         menu=0;
         }
-        }
+        
+    if (botao2 && menu == 103 && safe == 0) {
+            lcd.cls();
+            lcd.setAddress(0,0);
+            lcd.printf("NAO HA PONTOS SALVOS");
+            wait(2);
+            lcd.cls();
+            lcd.setAddress(3,0);
+            lcd.printf("MENU PRINCIPAL");
+            lcd.setAddress(0,2);
+            lcd.printf("1-SALVAR PONTOS");
+            lcd.setAddress(0,3);
+            lcd.printf("2-INICIAR PROGRAMA");
+            menu=0;
+            }
 // vai para tela de salvar pontos       
     if (botao1 && menu == 0 && safe == 0){
         for (int i=0; i<11;i++){
@@ -612,11 +641,11 @@
             lcd.printf("1-INICIAR PROGRAMA");
             lcd.setAddress(0,3);
             lcd.printf("2-VOLTAR A SALVAR");
-            menu=200;
+            menu=101;
             safe = 1;
         }  
 // salva ponto de retirada         
-    if (botao1 && menu==200 && safe == 0){
+    if (botao1 && menu==101 && safe == 0){
             lcd.cls();
             lcd.setAddress(0,0);
             lcd.printf("SALVE SEU PONTO");
@@ -624,11 +653,11 @@
             lcd.printf("DE RETIRADA");
             lcd.setAddress(0,4);
             lcd.printf("1-SALVAR PONTO");
-            menu= 201;
+            menu= 102;
             safe = 1;
         }    
 // volta a salvar pontos        
-    if (botao2 && menu==200 && safe == 0){
+    if (botao2 && menu==101 && safe == 0){
             lcd.cls();
             menu=index;
             lcd.setCursor(TextLCD::CurOff_BlkOff);
@@ -644,22 +673,12 @@
             } 
                     
 // executa o programa e volta para tela inicial         
-    if (botao1 && menu==201 && safe == 0){
+    if (botao1 && menu==102 && safe == 0){
         salva_posicao();
         lcd.cls();
         lcd.setAddress(0,0);
         lcd.printf("AGUARDE...");
         vai_caminho_desejado(listaX, listaY, listaZ, index);    
-        /*while (vai_caminho_desejado(listaX, listaY, listaZ, index)){
-            lcd.setAddress(0,0);
-            lcd.printf("AGUARDE   ");
-            lcd.setAddress(0,0);
-            lcd.printf("AGUARDE.  ");
-            lcd.setAddress(0,0);
-            lcd.printf("AGUARDE.. ");
-            lcd.setAddress(0,0);
-            lcd.printf("AGUARDE...");
-            }*/
         lcd.cls();
         lcd.setAddress(3,0);
         lcd.printf("MENU PRINCIPAL");
@@ -670,6 +689,16 @@
         menu=0;
         safe = 1;
         }        
+   /* if (botao2 && menu == 0 && safe == 0) {
+        lcd.cls();
+        lcd.setAddress(3,0);
+        lcd.printf("TEM CERTEZA QUE");
+        lcd.setAddress(0,2);
+        lcd.printf("DESEJA INICIAR PROGRAMA?");
+        lcd.setAddress(0,3);
+        lcd.printf("2-INICIAR PROGRAMA"); 
+        menu=0;
+        safe = 1;*/
             
             
         }