X-Git-Url: http://git.piffa.net/web?a=blobdiff_plain;f=esempi%2Failerons_state_rgb%2Failerons_state_rgb.ino;fp=esempi%2Failerons_state_rgb%2Failerons_state_rgb.ino;h=f83dda60f274ac9f1f01c96047f008e5ce28286e;hb=e14e2e3645375c5f8d465f535b58c810e426a9fc;hp=1ec982e1b31a2f9d43dead0ee45031afc49368c7;hpb=5b38ddfa00f7c92607b220adc874107fba2bda0e;p=aerei

diff --git a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
index 1ec982e..f83dda6 100644
--- a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
+++ b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
@@ -132,6 +132,10 @@ sxin:
             ailstate = middle;
         }
         else if (ail < mid_point - deviation) {
+<<<<<<< HEAD
+            now = millis() ;
+=======
+>>>>>>> 5b38ddfa00f7c92607b220adc874107fba2bda0e
             ailstate = dxin;
         } ;
         break;
@@ -152,6 +156,10 @@ dxin:
             ailstate = middle;
         }
         else if (ail > mid_point + deviation) {
+<<<<<<< HEAD
+            now = millis() ;
+=======
+>>>>>>> 5b38ddfa00f7c92607b220adc874107fba2bda0e
             ailstate = dxin;
         } ;
         break;