From 5632b52771e0a45c9e99c70ead4360583f7624cd Mon Sep 17 00:00:00 2001 From: Stanley Huang Date: Wed, 23 Sep 2015 17:21:01 +1000 Subject: Move Narcoleptic into libraries directory --- libraries/Narcoleptic/Narcoleptic.cpp | 68 +++++++++++++++++++++++++++++++++++ libraries/Narcoleptic/Narcoleptic.h | 34 ++++++++++++++++++ megalogger/Narcoleptic.cpp | 68 ----------------------------------- megalogger/Narcoleptic.h | 34 ------------------ 4 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 libraries/Narcoleptic/Narcoleptic.cpp create mode 100644 libraries/Narcoleptic/Narcoleptic.h delete mode 100644 megalogger/Narcoleptic.cpp delete mode 100644 megalogger/Narcoleptic.h diff --git a/libraries/Narcoleptic/Narcoleptic.cpp b/libraries/Narcoleptic/Narcoleptic.cpp new file mode 100644 index 0000000..61fb13c --- /dev/null +++ b/libraries/Narcoleptic/Narcoleptic.cpp @@ -0,0 +1,68 @@ +/** + * Narcoleptic - A sleep library for Arduino + * Copyright (C) 2010 Peter Knight (Cathedrow) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +#include "Narcoleptic.h" + +#ifndef __SAM3X8E__ + +#include +#include +#include +//#include + +#include +#include + +SIGNAL(WDT_vect) { + wdt_disable(); + wdt_reset(); + WDTCSR &= ~_BV(WDIE); +} + +void NarcolepticClass::sleep(uint8_t wdt_period) { + wdt_enable(wdt_period); + wdt_reset(); + WDTCSR |= _BV(WDIE); + set_sleep_mode(SLEEP_MODE_PWR_DOWN); + sleep_mode(); + wdt_disable(); + WDTCSR &= ~_BV(WDIE); +} + +void NarcolepticClass::delay(int milliseconds) { + while (milliseconds >= 8000) { sleep(WDTO_8S); milliseconds -= 8000; } + if (milliseconds >= 4000) { sleep(WDTO_4S); milliseconds -= 4000; } + if (milliseconds >= 2000) { sleep(WDTO_2S); milliseconds -= 2000; } + if (milliseconds >= 1000) { sleep(WDTO_1S); milliseconds -= 1000; } + if (milliseconds >= 500) { sleep(WDTO_500MS); milliseconds -= 500; } + if (milliseconds >= 250) { sleep(WDTO_250MS); milliseconds -= 250; } + if (milliseconds >= 125) { sleep(WDTO_120MS); milliseconds -= 120; } + if (milliseconds >= 64) { sleep(WDTO_60MS); milliseconds -= 60; } + if (milliseconds >= 32) { sleep(WDTO_30MS); milliseconds -= 30; } + if (milliseconds >= 16) { sleep(WDTO_15MS); milliseconds -= 15; } +} + +#else + +void NarcolepticClass::delay(int milliseconds) { + delay(milliseconds); +} + +#endif + +NarcolepticClass Narcoleptic; diff --git a/libraries/Narcoleptic/Narcoleptic.h b/libraries/Narcoleptic/Narcoleptic.h new file mode 100644 index 0000000..9b1f255 --- /dev/null +++ b/libraries/Narcoleptic/Narcoleptic.h @@ -0,0 +1,34 @@ +/** + * Narcoleptic - A sleep library for Arduino + * Copyright (C) 2010 Peter Knight (Cathedrow) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +#ifndef Narcoleptic_h +#define Narcoleptic_h + +#include +#include + +class NarcolepticClass +{ + public: + void delay(int milliseconds); + private: + void sleep(uint8_t); +}; +extern NarcolepticClass Narcoleptic; + +#endif diff --git a/megalogger/Narcoleptic.cpp b/megalogger/Narcoleptic.cpp deleted file mode 100644 index 61fb13c..0000000 --- a/megalogger/Narcoleptic.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Narcoleptic - A sleep library for Arduino - * Copyright (C) 2010 Peter Knight (Cathedrow) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -#include "Narcoleptic.h" - -#ifndef __SAM3X8E__ - -#include -#include -#include -//#include - -#include -#include - -SIGNAL(WDT_vect) { - wdt_disable(); - wdt_reset(); - WDTCSR &= ~_BV(WDIE); -} - -void NarcolepticClass::sleep(uint8_t wdt_period) { - wdt_enable(wdt_period); - wdt_reset(); - WDTCSR |= _BV(WDIE); - set_sleep_mode(SLEEP_MODE_PWR_DOWN); - sleep_mode(); - wdt_disable(); - WDTCSR &= ~_BV(WDIE); -} - -void NarcolepticClass::delay(int milliseconds) { - while (milliseconds >= 8000) { sleep(WDTO_8S); milliseconds -= 8000; } - if (milliseconds >= 4000) { sleep(WDTO_4S); milliseconds -= 4000; } - if (milliseconds >= 2000) { sleep(WDTO_2S); milliseconds -= 2000; } - if (milliseconds >= 1000) { sleep(WDTO_1S); milliseconds -= 1000; } - if (milliseconds >= 500) { sleep(WDTO_500MS); milliseconds -= 500; } - if (milliseconds >= 250) { sleep(WDTO_250MS); milliseconds -= 250; } - if (milliseconds >= 125) { sleep(WDTO_120MS); milliseconds -= 120; } - if (milliseconds >= 64) { sleep(WDTO_60MS); milliseconds -= 60; } - if (milliseconds >= 32) { sleep(WDTO_30MS); milliseconds -= 30; } - if (milliseconds >= 16) { sleep(WDTO_15MS); milliseconds -= 15; } -} - -#else - -void NarcolepticClass::delay(int milliseconds) { - delay(milliseconds); -} - -#endif - -NarcolepticClass Narcoleptic; diff --git a/megalogger/Narcoleptic.h b/megalogger/Narcoleptic.h deleted file mode 100644 index 9b1f255..0000000 --- a/megalogger/Narcoleptic.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Narcoleptic - A sleep library for Arduino - * Copyright (C) 2010 Peter Knight (Cathedrow) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -#ifndef Narcoleptic_h -#define Narcoleptic_h - -#include -#include - -class NarcolepticClass -{ - public: - void delay(int milliseconds); - private: - void sleep(uint8_t); -}; -extern NarcolepticClass Narcoleptic; - -#endif -- cgit v1.2.3