Skip to content

Commit 86b6411

Browse files
committed
Merge branch 'hek-gateway-rework' into development
Conflicts: libraries/MySensors/MySensor.cpp libraries/MySensors/MySensor.h
2 parents d8ba222 + 5bb8c9b commit 86b6411

File tree

28 files changed

+3498
-829
lines changed

28 files changed

+3498
-829
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
char dummyvar; // to get Arduinoi IDE to include core headers properly
2+
3+
/*
4+
MsTimer2 is a small and very easy to use library to interface Timer2 with
5+
humans. It's called MsTimer2 because it "hardcodes" a resolution of 1
6+
millisecond on timer2
7+
For Details see: http://www.arduino.cc/playground/Main/MsTimer2
8+
*/
9+
#include <MsTimer2.h>
10+
11+
// Switch on LED on and off each half second
12+
13+
#if defined(ARDUINO) && ARDUINO >= 100
14+
const int led_pin = LED_BUILTIN; // 1.0 built in LED pin var
15+
#else
16+
#if defined(CORE_LED0_PIN)
17+
const int led_pin = CORE_LED0_PIN; // 3rd party LED pin define
18+
#else
19+
const int led_pin = 13; // default to pin 13
20+
#endif
21+
#endif
22+
23+
24+
void flash()
25+
{
26+
static boolean output = HIGH;
27+
28+
digitalWrite(led_pin, output);
29+
output = !output;
30+
}
31+
32+
void setup()
33+
{
34+
pinMode(led_pin, OUTPUT);
35+
36+
MsTimer2::set(500, flash); // 500ms period
37+
MsTimer2::start();
38+
}
39+
40+
void loop()
41+
{
42+
}

libraries/MsTimer2/keywords.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
MsTimer2 KEYWORD1
2+
set KEYWORD2
3+
start KEYWORD2
4+
stop KEYWORD2

libraries/MySensors/MyConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
/***
1919
* Enable/Disable debug logging
2020
*/
21-
#define DEBUG
21+
//#define DEBUG
2222

2323
#endif

libraries/MySensors/MyGateway.cpp

Lines changed: 0 additions & 297 deletions
This file was deleted.

0 commit comments

Comments
 (0)