noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ide-1.5.x

This commit is contained in:
Cristian Maglie 2014-04-07 18:53:15 +02:00
parent b2500b3b85 4a10c1c5a8
commit ae1ef4750a
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/Esplora/keywords.txt
View File

@ -28,6 +28,9 @@ writeBlue KEYWORD2
readRed KEYWORD2
readGreen KEYWORD2
readBlue KEYWORD2
readTinkerkitInput KEYWORD2
readTinkerkitInputA KEYWORD2
readTinkerkitInputB KEYWORD2
tone KEYWORD2
noTone KEYWORD2

12
libraries/Esplora/src/Esplora.h
View File

@ -40,6 +40,8 @@ const byte CH_SLIDER = 4;
const byte CH_LIGHT = 5;
const byte CH_TEMPERATURE = 6;
const byte CH_MIC = 7;
const byte CH_TINKERKIT_A = 8;
const byte CH_TINKERKIT_B = 9;
const byte CH_JOYSTICK_SW = 10;
const byte CH_JOYSTICK_X = 11;
const byte CH_JOYSTICK_Y = 12;
@ -156,6 +158,16 @@ public:
void tone(unsigned int freq);
void tone(unsigned int freq, unsigned long duration);
void noTone();
inline unsigned int readTinkerkitInput(byte whichInput) {
return readChannel(whichInput + CH_TINKERKIT_A);
}
inline unsigned int readTinkerkitInputA() {
return readChannel(CH_TINKERKIT_A);
}
inline unsigned int readTinkerkitInputB() {
return readChannel(CH_TINKERKIT_B);
}
};