From e7c32aff0fc88d1701c233df9c73be16e9bcb0eb Mon Sep 17 00:00:00 2001 From: Marcomissyou Date: Tue, 27 Jan 2015 15:41:52 +0800 Subject: [PATCH] modify main.cpp of analog and analog_in --- libraries/tests/mbed/analog/main.cpp | 2 +- libraries/tests/mbed/analog_in/main.cpp | 4 +- libraries/tests/mbed/blinky/main.cpp | 54 ++----------------------- workspace_tools/targets.py | 2 +- 4 files changed, 7 insertions(+), 55 deletions(-) diff --git a/libraries/tests/mbed/analog/main.cpp b/libraries/tests/mbed/analog/main.cpp index 8dcc1772ab..a4e368af3c 100644 --- a/libraries/tests/mbed/analog/main.cpp +++ b/libraries/tests/mbed/analog/main.cpp @@ -62,4 +62,4 @@ int main() { } notify_completion(check); -} +} \ No newline at end of file diff --git a/libraries/tests/mbed/analog_in/main.cpp b/libraries/tests/mbed/analog_in/main.cpp index 2886219396..157885df36 100644 --- a/libraries/tests/mbed/analog_in/main.cpp +++ b/libraries/tests/mbed/analog_in/main.cpp @@ -50,9 +50,9 @@ int main() { } if (successes > 8) { - notify_completion(true); + notify_success(true); } else { - notify_completion(false); + notify_success(false); } } \ No newline at end of file diff --git a/libraries/tests/mbed/blinky/main.cpp b/libraries/tests/mbed/blinky/main.cpp index 9c87526a67..3e6293939f 100644 --- a/libraries/tests/mbed/blinky/main.cpp +++ b/libraries/tests/mbed/blinky/main.cpp @@ -1,60 +1,12 @@ #include "mbed.h" -#include "nrf_soc.h" - -#define CMD_POWER_DOWN (0xB9) - -DigitalOut LED00(p0); -DigitalOut LED01(p1); -DigitalOut LED02(p2); -DigitalOut LED03(p3); -DigitalOut LED04(p4); -DigitalOut LED05(p5); -DigitalOut Flash_CS(p28); -InterruptIn button(p20); - -void intoSystemoff() { - Flash_CS = 0; - LED00 = 0; - LED01 = 0; - LED02 = 0; - LED03 = 0; - //ble.init(); - wait(1); - NRF_POWER->SYSTEMOFF = POWER_SYSTEMOFF_SYSTEMOFF_Enter; - //sd_power_system_off(); - //NRF_POWER->RAMON = POWER_RAMON_OFFRAM3_RAM3Off << POWER_RAMON_OFFRAM3_Pos; - //NRF_POWER->RAMON = POWER_RAMON_OFFRAM2_RAM2Off << POWER_RAMON_OFFRAM2_Pos; - //wait(5); - //NRF_POWER->RAMON = POWER_RAMON_OFFRAM1_RAM1On << POWER_RAMON_ONRAM1_Pos; - //NRF_POWER->RAMON = POWER_RAMON_OFFRAM0_RAM0On << POWER_RAMON_ONRAM0_Pos; - - } - -int main() { - LED00 = 1; - button.fall(&intoSystemoff); - for(;;) - { - LED03 = 1; - wait(1); - LED03 = 0; - wait(1); - } - - -} - - - -/*#include "mbed.h" DigitalOut myled(LED1); int main() { while(1) { myled = 1; - wait(2); + wait(0.2); myled = 0; - wait(2); + wait(0.2); } -}*/ +} diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py index bdff0f6fef..3a1345bf40 100644 --- a/workspace_tools/targets.py +++ b/workspace_tools/targets.py @@ -971,7 +971,7 @@ TARGETS = [ BLE_SMURFS_OTA(), HRM1017(), # nRF51822 RBLAB_NRF51822(),# nRF51822 - RBLAB_BLENANO(),# nRF51822git + RBLAB_BLENANO(),# nRF51822 NRF51822_Y5_MBUG(),#nRF51822 WALLBOT_BLE(), # nRF51822 DELTA_DFCM_NNN40(), # nRF51822