فهرست منبع

Change the timer trigger to embedded keypad for nextion

Per Mårtensson 4 سال پیش
والد
کامیت
84ad82eedf
2فایلهای تغییر یافته به همراه38 افزوده شده و 15 حذف شده
  1. BIN
      nextion/currentranger.HMI
  2. 38 15
      src/main.cpp

BIN
nextion/currentranger.HMI


+ 38 - 15
src/main.cpp

@@ -143,7 +143,7 @@ uint8_t nex_timer_d0=0;
 uint8_t nex_timer_d1=0;
 uint8_t nex_timer_d2=0;
 uint8_t nex_timer_d3=0;
-uint8_t nex_timer_set=0;
+float nex_timer_set=0;
 uint8_t nex_timer_output=0;
 uint32_t nex_timer_start=0;
 uint32_t nex_timer_stop=0;
@@ -689,10 +689,6 @@ void loop() {
     }
     if (nex_timer_run )
     {
-        
-
-        Serial.println(currentout);
-        Serial.println(current_test);
         if (nex_timer_set!=0){
           if (current_test>nex_timer_set){
             nex_timer_run =false;
@@ -1175,10 +1171,7 @@ void trigger17(){
     myNex.writeNum("tna.bco",NEX_BLUE) ;
   else 
     myNex.writeNum("tna.bco",NEX_LIGHT_GREY) ;
-  myNex.writeNum("dec0.val",nex_timer_d0 );
-  myNex.writeNum("dec1.val",nex_timer_d1 );
-  myNex.writeNum("dec2.val",nex_timer_d2 );
-  myNex.writeNum("dec3.val",nex_timer_d3 );
+
   if (nex_timer_run){
     myNex.writeNum("starttimer.bco",NEX_BLUE);
     myNex.writeNum("stoptimer.bco",NEX_LIGHT_GREY);
@@ -1284,11 +1277,7 @@ void trigger35()
     }
   }
 }
-void update_current_limit()
-{
-  nex_timer_set= nex_timer_d0*1000+nex_timer_d1*100+nex_timer_d2*10+nex_timer_d3;
-  Beep(20, false);
-}
+
 
 void chronometer(void){   //This function print:   "New: Actual time"
   unsigned long currentMillis = millis();  
@@ -1323,19 +1312,51 @@ void chronometer(void){   //This function print:   "New: Actual time"
   }
   myNex.writeStr("timertext.txt",String(hours)+mins_o+String(mins)+secs_o+String(secs));
 }
+void trigger81()
+{
+  nex_timer_set= myNex.readNumber("timervalue.val");
 
+  if( nex_timer_range==0) 
+  {
+    myNex.writeNum("tma.bco",NEX_BLUE) ;
+    nex_timer_set=nex_timer_set*1000000;
+  }
+  else 
+    myNex.writeNum("tma.bco",NEX_LIGHT_GREY) ;
+  if( nex_timer_range==1) {
+    myNex.writeNum("tua.bco",NEX_BLUE) ;
+    nex_timer_set=nex_timer_set*1000;
+  }else 
+    myNex.writeNum("tua.bco",NEX_LIGHT_GREY) ;
+  if( nex_timer_range==2) 
+    myNex.writeNum("tna.bco",NEX_BLUE) ;
+  else 
+    myNex.writeNum("tna.bco",NEX_LIGHT_GREY) ;
+
+  if (nex_timer_run){
+    myNex.writeNum("starttimer.bco",NEX_BLUE);
+    myNex.writeNum("stoptimer.bco",NEX_LIGHT_GREY);
+  }else{
+    myNex.writeNum("stoptimer.bco",NEX_BLUE);
+    myNex.writeNum("starttimer.bco",NEX_LIGHT_GREY);  
+  }
+  myNex.writeStr("timercurrent.txt",nex_timer_current);
+}
 
 void trigger82()
 {
   nex_timer_range=0;
+  nex_timer_set= myNex.readNumber("timervalue.val")*1000000;
   myNex.writeNum("tma.bco",NEX_BLUE);
   myNex.writeNum("tua.bco",NEX_LIGHT_GREY);
   myNex.writeNum("tna.bco",NEX_LIGHT_GREY);
+
   Beep(20, false);
 }
 void trigger83()
 {
   nex_timer_range=1;
+  nex_timer_set= myNex.readNumber("timervalue.val")*1000;
   myNex.writeNum("tma.bco",NEX_LIGHT_GREY);
   myNex.writeNum("tua.bco",NEX_BLUE);
   myNex.writeNum("tna.bco",NEX_LIGHT_GREY);
@@ -1344,6 +1365,7 @@ void trigger83()
 void trigger84()
 {
   nex_timer_range=2;
+  nex_timer_set= myNex.readNumber("timervalue.val");
   myNex.writeNum("tma.bco",NEX_LIGHT_GREY);
   myNex.writeNum("tua.bco",NEX_LIGHT_GREY);
   myNex.writeNum("tna.bco",NEX_BLUE);
@@ -1351,7 +1373,8 @@ void trigger84()
 }
 void trigger85()
 {
-  myNex.writeNum("starttimer.bco",NEX_BLUE);
+ 
+ myNex.writeNum("starttimer.bco",NEX_BLUE);
   myNex.writeNum("stoptimer.bco",NEX_LIGHT_GREY);
   nex_timer_current="";
   myNex.writeStr("timercurrent.txt",nex_timer_current);