some fix

Ticker_for_TickerScheduler/Ticker/Ticker.cpp

@@ -0,0 +1,87 @@
+/* 
+  Ticker.cpp - esp8266 library that calls functions periodically
+
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "c_types.h"
+#include "eagle_soc.h"
+#include "ets_sys.h"
+#include "osapi.h"
+
+static const int ONCE   = 0;
+static const int REPEAT = 1;
+
+#include "Ticker.h"
+
+Ticker::Ticker()
+: _timer(nullptr)
+{
+}
+
+Ticker::~Ticker()
+{
+	detach();
+}
+
+void Ticker::_attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, uint32_t arg)
+{
+	if (_timer)
+	{
+		os_timer_disarm(_timer);
+	}
+	else
+	{
+		_timer = new ETSTimer;
+	}
+
+	os_timer_setfn(_timer, reinterpret_cast<ETSTimerFunc*>(callback), reinterpret_cast<void*>(arg));
+	os_timer_arm(_timer, milliseconds, (repeat)?REPEAT:ONCE);
+}
+
+void Ticker::detach()
+{
+	if (!_timer)
+		return;
+
+	os_timer_disarm(_timer);
+	delete _timer;
+	_timer = nullptr;
+	_callback_function = nullptr;
+}
+
+bool Ticker::active() const
+{
+	return (bool)_timer;
+}
+
+void Ticker::_static_callback(void* arg)
+{
+	Ticker* _this = (Ticker*)arg;
+	if (_this == nullptr)
+	{
+		return;
+	}
+	if (_this->_callback_function)
+	{
+		_this->_callback_function();
+	}
+}

Ticker_for_TickerScheduler/Ticker/Ticker.h

@@ -0,0 +1,136 @@
+/* 
+  Ticker.h - esp8266 library that calls functions periodically
+
+  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef TICKER_H
+#define TICKER_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <functional>
+#include <Schedule.h>
+
+extern "C" {
+	typedef struct _ETSTIMER_ ETSTimer;
+}
+
+class Ticker
+{
+public:
+	Ticker();
+	~Ticker();
+	typedef void (*callback_t)(void);
+	typedef void (*callback_with_arg_t)(void*);
+	typedef std::function<void(void)> callback_function_t;
+
+	void attach_scheduled(float seconds, callback_function_t callback)
+	{
+		attach(seconds,std::bind(schedule_function, callback));
+	}
+
+	void attach(float seconds, callback_function_t callback)
+	{
+		_callback_function = callback;
+		attach(seconds, _static_callback, (void*)this);
+	}
+
+	void attach_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
+	{
+		attach_ms(milliseconds, std::bind(schedule_function, callback));
+	}
+
+	void attach_ms(uint32_t milliseconds, callback_function_t callback)
+	{
+		_callback_function = callback;
+		attach_ms(milliseconds, _static_callback, (void*)this);
+	}
+
+	template<typename TArg>
+	void attach(float seconds, void (*callback)(TArg), TArg arg)
+	{
+		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach() callback argument size must be <= 4 bytes");
+		// C-cast serves two purposes:
+		// static_cast for smaller integer types,
+		// reinterpret_cast + const_cast for pointer types
+		uint32_t arg32 = (uint32_t)arg;
+		_attach_ms(seconds * 1000, true, reinterpret_cast<callback_with_arg_t>(callback), arg32);
+	}
+
+	template<typename TArg>
+	void attach_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
+	{
+		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach_ms() callback argument size must be <= 4 bytes");
+		uint32_t arg32 = (uint32_t)arg;
+		_attach_ms(milliseconds, true, reinterpret_cast<callback_with_arg_t>(callback), arg32);
+	}
+
+	void once_scheduled(float seconds, callback_function_t callback)
+	{
+		once(seconds, std::bind(schedule_function, callback));
+	}
+
+	void once(float seconds, callback_function_t callback)
+	{
+		_callback_function = callback;
+		once(seconds, _static_callback, (void*)this);
+	}
+
+	void once_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
+	{
+		once_ms(milliseconds, std::bind(schedule_function, callback));
+	}
+
+	void once_ms(uint32_t milliseconds, callback_function_t callback)
+	{
+		_callback_function = callback;
+		once_ms(milliseconds, _static_callback, (void*)this);
+	}
+
+	template<typename TArg>
+	void once(float seconds, void (*callback)(TArg), TArg arg)
+	{
+		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach() callback argument size must be <= 4 bytes");
+		uint32_t arg32 = (uint32_t)(arg);
+		_attach_ms(seconds * 1000, false, reinterpret_cast<callback_with_arg_t>(callback), arg32);
+	}
+
+	template<typename TArg>
+	void once_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
+	{
+		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach_ms() callback argument size must be <= 4 bytes");
+		uint32_t arg32 = (uint32_t)(arg);
+		_attach_ms(milliseconds, false, reinterpret_cast<callback_with_arg_t>(callback), arg32);
+	}
+
+	void detach();
+	bool active() const;
+
+protected:	
+	void _attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, uint32_t arg);
+	static void _static_callback (void* arg);
+
+protected:
+	ETSTimer* _timer;
+	callback_function_t _callback_function = nullptr;
+};
+
+
+#endif//TICKER_H

Ticker_for_TickerScheduler/Ticker/examples/TickerBasic/TickerBasic.ino

@@ -0,0 +1,45 @@
+/*
+  Basic Ticker usage
+
+  Ticker is an object that will call a given function with a certain period.
+  Each Ticker calls one function. You can have as many Tickers as you like,
+  memory being the only limitation.
+
+  A function may be attached to a ticker and detached from the ticker.
+  There are two variants of the attach function: attach and attach_ms.
+  The first one takes period in seconds, the second one in milliseconds.
+
+  The built-in LED will be blinking.
+*/
+
+#include <Ticker.h>
+
+Ticker flipper;
+
+int count = 0;
+
+void flip() {
+  int state = digitalRead(LED_BUILTIN);  // get the current state of GPIO1 pin
+  digitalWrite(LED_BUILTIN, !state);     // set pin to the opposite state
+
+  ++count;
+  // when the counter reaches a certain value, start blinking like crazy
+  if (count == 20) {
+    flipper.attach(0.1, flip);
+  }
+  // when the counter reaches yet another value, stop blinking
+  else if (count == 120) {
+    flipper.detach();
+  }
+}
+
+void setup() {
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(LED_BUILTIN, LOW);
+
+  // flip the pin every 0.3s
+  flipper.attach(0.3, flip);
+}
+
+void loop() {
+}

Ticker_for_TickerScheduler/Ticker/examples/TickerFunctional/TickerFunctional.ino

@@ -0,0 +1,64 @@
+#include "Arduino.h"
+#include "Ticker.h"
+
+#define LED1  2
+#define LED2  4
+#define LED3  12
+#define LED4  14
+#define LED5  15
+
+
+class ExampleClass {
+  public:
+    ExampleClass(int pin, int duration) : _pin(pin), _duration(duration) {
+      pinMode(_pin, OUTPUT);
+      _myTicker.attach_ms(_duration, std::bind(&ExampleClass::classBlink, this));
+    }
+    ~ExampleClass() {};
+
+    int _pin, _duration;
+    Ticker _myTicker;
+
+    void classBlink() {
+      digitalWrite(_pin, !digitalRead(_pin));
+    }
+};
+
+void staticBlink() {
+  digitalWrite(LED2, !digitalRead(LED2));
+}
+
+void scheduledBlink() {
+  digitalWrite(LED3, !digitalRead(LED2));
+}
+
+void parameterBlink(int p) {
+  digitalWrite(p, !digitalRead(p));
+}
+
+Ticker staticTicker;
+Ticker scheduledTicker;
+Ticker parameterTicker;
+Ticker lambdaTicker;
+
+ExampleClass example(LED1, 100);
+
+
+void setup() {
+  pinMode(LED2, OUTPUT);
+  staticTicker.attach_ms(100, staticBlink);
+
+  pinMode(LED3, OUTPUT);
+  scheduledTicker.attach_ms_scheduled(100, scheduledBlink);
+
+  pinMode(LED4, OUTPUT);
+  parameterTicker.attach_ms(100, std::bind(parameterBlink, LED4));
+
+  pinMode(LED5, OUTPUT);
+  lambdaTicker.attach_ms(100, []() {
+    digitalWrite(LED5, !digitalRead(LED5));
+  });
+}
+
+void loop() {
+}

Ticker_for_TickerScheduler/Ticker/examples/TickerParameter/TickerParameter.ino

@@ -0,0 +1,35 @@
+/*
+  Passing paramters to Ticker callbacks
+
+  Apart from void(void) functions, the Ticker library supports
+  functions taking one argument. This argument's size has to be less or
+  equal to 4 bytes (so char, short, int, float, void*, char* types will do).
+
+  This sample runs two tickers that both call one callback function,
+  but with different arguments.
+
+  The built-in LED will be pulsing.
+*/
+
+#include <Ticker.h>
+
+Ticker tickerSetHigh;
+Ticker tickerSetLow;
+
+void setPin(int state) {
+  digitalWrite(LED_BUILTIN, state);
+}
+
+void setup() {
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(1, LOW);
+
+  // every 25 ms, call setPin(0)
+  tickerSetLow.attach_ms(25, setPin, 0);
+
+  // every 26 ms, call setPin(1)
+  tickerSetHigh.attach_ms(26, setPin, 1);
+}
+
+void loop() {
+}

Ticker_for_TickerScheduler/Ticker/keywords.txt

@@ -0,0 +1,29 @@
+#######################################
+# Syntax Coloring Map For Wire
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+attach	KEYWORD2
+attach_ms	KEYWORD2
+once	KEYWORD2
+once_ms	KEYWORD2
+detach	KEYWORD2
+active	KEYWORD2
+
+#######################################
+# Instances (KEYWORD2)
+#######################################
+
+Ticker	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+

Ticker_for_TickerScheduler/Ticker/library.properties

@@ -0,0 +1,10 @@
+name=Ticker
+version=1.0
+author=Ivan Grokhtokov <ivan@esp8266.com>
+maintainer=Ivan Grokhtokov <ivan@esp8266.com>
+sentence=Allows to call functions with a given interval.
+paragraph=
+category=Timing
+url=
+architectures=esp8266
+dot_a_linkage=true