Diff: main_PM.cpp

Revision:

73:6c5f3c9cc90e

Parent:

66:ebc2a21cd514

Child:

76:e8f994ca108f

--- a/main_PM.cpp	Tue Jun 02 13:53:13 2020 +0000
+++ b/main_PM.cpp	Wed Jun 03 18:58:39 2020 +0000
@@ -90,7 +90,8 @@
 void mov_z_mais() {for(int i = 0; i < 4; i++){eixoz =     hor[i];wait(t_motor);coord_z += (5.625*5/32)/360;est_z = 0;}}
 int emergency = 0;
 //Funcao de emergencia por interrupcao
-void emergencia(){TextLCD lcd(D4, D5, D6, D7, D8, D9); 
+void emergencia(){TextLCD lcd(D4, D5, D6, D7, D8, D9);
+        emergency = 1;
         rele1 = 0;
         rele2 = 0;
         eixox = 0b0000;
@@ -99,15 +100,14 @@
         lcd.cls();
         lcd.printf("EMERGENCIA ACIONADA");
         lcd.locate(2,2);
-        lcd.printf("Operacao pausada");
-        emergency = 1;}
+        lcd.printf("Operacao pausada");}
 
 void solta_emergencia(){TextLCD lcd(D4, D5, D6, D7, D8, D9);
         rele1 = 1;
         rele2 = 1;
         emergency = 0;
         lcd.cls();
-        lcd.locate(0,2);
+        lcd.locate(2,0);
         lcd.printf("Pressione 0 para");
         lcd.locate(5,1); lcd.printf("continuar");}
 
@@ -173,8 +173,9 @@
         lcd.locate(0,3);
         lcd.printf("A - proximo");
         printf("\n%i", emergency);
-    if(emergency == 0){     
+     
     while(1) {
+    if(emergency == 0){
         tecla = pega_tecla();         
         printf("\n%s",status_tela);
         printf("\n%c",tecla);