From 590a1cd942ff56bf230773a0126ec0ae74661edb Mon Sep 17 00:00:00 2001 From: jphelirc Date: Sun, 28 Nov 2010 11:16:38 +0000 Subject: [PATCH] CLI stepping leds git-svn-id: https://arducopter.googlecode.com/svn/trunk@974 f9c3cf11-9bcb-44bc-f272-b75c42450872 --- ArducopterNG/Arducopter.h | 1 + ArducopterNG/ArducopterNG.pde | 2 +- ArducopterNG/CLI.pde | 3 +++ ArducopterNG/Functions.pde | 25 +++++++++++++++++++++++-- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ArducopterNG/Arducopter.h b/ArducopterNG/Arducopter.h index 5c393a4f93..5c634241cb 100644 --- a/ArducopterNG/Arducopter.h +++ b/ArducopterNG/Arducopter.h @@ -327,6 +327,7 @@ int gled_speed; long cli_timer; byte cli_status = LOW; +byte cli_step; long t0; int num_iter; diff --git a/ArducopterNG/ArducopterNG.pde b/ArducopterNG/ArducopterNG.pde index f1da27a73b..8ca0362d53 100644 --- a/ArducopterNG/ArducopterNG.pde +++ b/ArducopterNG/ArducopterNG.pde @@ -189,7 +189,7 @@ #endif /* Software version */ -#define VER 1.52 // Current software version (only numeric values) +#define VER 1.53 // Current software version (only numeric values) // Sensors - declare one global instance AP_ADC_ADS7844 adc; diff --git a/ArducopterNG/CLI.pde b/ArducopterNG/CLI.pde index 4a3158696d..e63d9d1129 100644 --- a/ArducopterNG/CLI.pde +++ b/ArducopterNG/CLI.pde @@ -74,6 +74,7 @@ void RunCLI () { // Blinking Red, Yellow, Green when in CLI mode if(millis() - cli_timer > 1000) { cli_timer = millis(); +/* if(cli_status == HIGH) { LEDAllOFF(); cli_status = LOW; @@ -82,6 +83,8 @@ void RunCLI () { LEDAllON(); cli_status = HIGH; } + */ + CLILedStep(); } diff --git a/ArducopterNG/Functions.pde b/ArducopterNG/Functions.pde index 421d97a055..4f679d41cd 100644 --- a/ArducopterNG/Functions.pde +++ b/ArducopterNG/Functions.pde @@ -139,9 +139,30 @@ int limitRange(int data, int minLimit, int maxLimit) { } - -void CLILeds (byte ledstep) { +// Stepping G, Y, R Leds +// Call CLILedStep(); to change led statuses +// Used on CLI as showing that we are in CLI mode +void CLILedStep () { + switch(cli_step) { + case 1: + digitalWrite(LED_Green, HIGH); + digitalWrite(LED_Yellow, LOW); + digitalWrite(LED_Red, LOW); + break; + case 2: + digitalWrite(LED_Green, LOW); + digitalWrite(LED_Yellow, HIGH); + digitalWrite(LED_Red, LOW); + break; + case 3: + digitalWrite(LED_Green, LOW); + digitalWrite(LED_Yellow, LOW); + digitalWrite(LED_Red, HIGH); + break; + } + cli_step ++; + if(cli_step == 4) cli_step = 1; }