From 5f697c1ee0d74574fd34f214d0a490d4695f0dd8 Mon Sep 17 00:00:00 2001 From: Andrea Manni Date: Sun, 5 Feb 2017 02:30:22 +0100 Subject: [PATCH] ERRATA --- esempi/ailerons_state_rgb/ailerons_state_rgb.ino | 6 ------ 1 file changed, 6 deletions(-) diff --git a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino index f83dda6..1759067 100644 --- a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino +++ b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino @@ -132,10 +132,7 @@ sxin: ailstate = middle; } else if (ail < mid_point - deviation) { -<<<<<<< HEAD now = millis() ; -======= ->>>>>>> 5b38ddfa00f7c92607b220adc874107fba2bda0e ailstate = dxin; } ; break; @@ -156,10 +153,7 @@ dxin: ailstate = middle; } else if (ail > mid_point + deviation) { -<<<<<<< HEAD now = millis() ; -======= ->>>>>>> 5b38ddfa00f7c92607b220adc874107fba2bda0e ailstate = dxin; } ; break; -- 2.39.2