mirror of
https://github.com/s00500/SimpleExpressions
synced 2024-11-23 05:50:54 +00:00
Improving ESP32 LED Handeling, versionbump
This commit is contained in:
parent
10c656448b
commit
5618498992
@ -1,5 +1,5 @@
|
||||
name=SimpleExpressions
|
||||
version=1.1.0
|
||||
version=1.1.1
|
||||
author=Lukas Bachschwell
|
||||
maintainer=Lukas Bachschwell <lukas@lbsfilm.at>
|
||||
sentence=Make you Robots cute and noisy
|
||||
|
||||
@ -20,8 +20,8 @@ void SimpleExpressionsClass::initBuzzer(int aBuzzerPin) {
|
||||
buzzerPin = aBuzzerPin;
|
||||
|
||||
#if defined(ESP32)
|
||||
ledcSetup(ledc_channel, 2000, 8); // channel, max frequency, resolution
|
||||
ledcAttachPin(aBuzzerPin, ledc_channel);
|
||||
ledcSetup(ledc_channel, 2000, 8); // channel, max frequency, resolution
|
||||
ledcAttachPin(aBuzzerPin, ledc_channel);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -31,17 +31,17 @@ void SimpleExpressionsClass::initBuzzer(int aBuzzerPin) {
|
||||
|
||||
void SimpleExpressionsClass::writeMouth(const char mouthName[], int r, int g, int b) {
|
||||
int number = -1;
|
||||
for(int i = 0; i < frameCount; i++){
|
||||
if(strncmp(shapes[i].name, mouthName, 20) == 0) {
|
||||
number = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(number != -1){
|
||||
printMouth(number, r, g, b);
|
||||
} else {
|
||||
if(debug) Serial.println("Error: mouth name does not exist");
|
||||
for(int i = 0; i < frameCount; i++) {
|
||||
if(strncmp(shapes[i].name, mouthName, 20) == 0) {
|
||||
number = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(number != -1) {
|
||||
printMouth(number, r, g, b);
|
||||
} else {
|
||||
if(debug) Serial.println("Error: mouth name does not exist");
|
||||
}
|
||||
}
|
||||
|
||||
void SimpleExpressionsClass::printMouth(int number, int r, int g, int b) {
|
||||
@ -49,31 +49,31 @@ void SimpleExpressionsClass::printMouth(int number, int r, int g, int b) {
|
||||
if(shapes[number].data[i]) mouth.setPixelColor(i, mouth.Color(r, g, b));
|
||||
else mouth.setPixelColor(i, 0);
|
||||
}
|
||||
mouth.show();
|
||||
showMouth();
|
||||
delay(1);
|
||||
clearPixels();
|
||||
}
|
||||
|
||||
void SimpleExpressionsClass::writeMouth(const char mouthName[] ) {
|
||||
int number = -1;
|
||||
for(int i = 0; i < colorFrameCount; i++){
|
||||
if(strncmp(shapes[i].name, mouthName, 20) == 0) {
|
||||
number = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(number != -1){
|
||||
printMouth(number);
|
||||
} else {
|
||||
if(debug) Serial.println("Error: mouth name does not exist");
|
||||
for(int i = 0; i < colorFrameCount; i++) {
|
||||
if(strncmp(shapes[i].name, mouthName, 20) == 0) {
|
||||
number = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(number != -1) {
|
||||
printMouth(number);
|
||||
} else {
|
||||
if(debug) Serial.println("Error: mouth name does not exist");
|
||||
}
|
||||
}
|
||||
|
||||
void SimpleExpressionsClass::printMouth(int number) {
|
||||
for(uint16_t i = 0; i<7; i++) {
|
||||
mouth.setPixelColor(i, mouth.Color(colorShapes[number].data[i][0], colorShapes[number].data[i][1], colorShapes[number].data[i][2]));
|
||||
}
|
||||
mouth.show();
|
||||
showMouth();
|
||||
delay(1);
|
||||
clearPixels();
|
||||
}
|
||||
@ -84,7 +84,7 @@ void SimpleExpressionsClass::writeMouthGeneric(const bool mouthArray[7], int r,
|
||||
if(mouthArray[i]) mouth.setPixelColor(i, mouth.Color(r, g, b));
|
||||
else mouth.setPixelColor(i, 0);
|
||||
}
|
||||
mouth.show();
|
||||
showMouth();
|
||||
delay(1);
|
||||
clearPixels();
|
||||
}
|
||||
@ -93,7 +93,7 @@ void SimpleExpressionsClass::writeMouthGeneric(const int mouthArray[7][3]) {
|
||||
for(uint16_t i=0; i<7; i++) {
|
||||
mouth.setPixelColor(i, mouth.Color(mouthArray[i][0], mouthArray[i][1], mouthArray[i][2]));
|
||||
}
|
||||
mouth.show();
|
||||
showMouth();
|
||||
delay(1);
|
||||
clearPixels();
|
||||
}
|
||||
@ -103,7 +103,7 @@ void SimpleExpressionsClass::clearMouth() {
|
||||
for(int i = 0; i < 7; i++) {
|
||||
mouth.setPixelColor(i, 0);
|
||||
}
|
||||
mouth.show();
|
||||
showMouth();
|
||||
delay(1);
|
||||
clearPixels();
|
||||
}
|
||||
@ -115,24 +115,37 @@ void SimpleExpressionsClass::clearPixels() { // avoid strange issues on ESP32 wi
|
||||
}
|
||||
delay(1);
|
||||
}
|
||||
|
||||
void SimpleExpressionsClass::showMouth() {
|
||||
#if defined(ESP32)
|
||||
portDISABLE_INTERRUPTS();
|
||||
mouth.show();
|
||||
delay(1);
|
||||
portENABLE_INTERRUPTS();
|
||||
clearPixels();
|
||||
#else
|
||||
mouth.show();
|
||||
#endif
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////
|
||||
//-- SOUNDS -----------------------------------------------------//
|
||||
///////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
void SimpleExpressionsClass::_tone (float noteFrequency, long noteDuration, int silentDuration){
|
||||
if(silentDuration==0){silentDuration=1;}
|
||||
if(silentDuration==0) {silentDuration=1;}
|
||||
|
||||
#if defined(ESP32)
|
||||
ledcWriteTone(ledc_channel, noteFrequency);
|
||||
delay(noteDuration); // milliseconds
|
||||
ledcWrite(ledc_channel, 0); // notone
|
||||
ledcWriteTone(ledc_channel, noteFrequency);
|
||||
delay(noteDuration); // milliseconds
|
||||
ledcWrite(ledc_channel, 0); // notone
|
||||
#else
|
||||
tone(buzzerPin, noteFrequency, noteDuration);
|
||||
delay(noteDuration); // milliseconds
|
||||
tone(buzzerPin, noteFrequency, noteDuration);
|
||||
delay(noteDuration); // milliseconds
|
||||
#endif
|
||||
|
||||
delay(silentDuration);
|
||||
delay(silentDuration);
|
||||
}
|
||||
|
||||
|
||||
@ -142,138 +155,138 @@ void SimpleExpressionsClass::bendTones (float initFrequency, float finalFrequenc
|
||||
// bendTones (880, 2093, 1.02, 18, 1);
|
||||
// bendTones (note_A5, note_C7, 1.02, 18, 0);
|
||||
|
||||
if(silentDuration==0){silentDuration=1;}
|
||||
if(silentDuration==0) {silentDuration=1;}
|
||||
|
||||
if(initFrequency < finalFrequency)
|
||||
{
|
||||
for (int i=initFrequency; i<finalFrequency; i=i*prop) {
|
||||
_tone(i, noteDuration, silentDuration);
|
||||
}
|
||||
for (int i=initFrequency; i<finalFrequency; i=i*prop) {
|
||||
_tone(i, noteDuration, silentDuration);
|
||||
}
|
||||
|
||||
} else{
|
||||
|
||||
for (int i=initFrequency; i>finalFrequency; i=i/prop) {
|
||||
_tone(i, noteDuration, silentDuration);
|
||||
}
|
||||
for (int i=initFrequency; i>finalFrequency; i=i/prop) {
|
||||
_tone(i, noteDuration, silentDuration);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SimpleExpressionsClass::playSound(int soundName){
|
||||
switch(soundName){
|
||||
switch(soundName) {
|
||||
|
||||
case S_CONNECTION:
|
||||
_tone(NOTE_E5,50,30);
|
||||
_tone(NOTE_E6,55,25);
|
||||
_tone(NOTE_A6,60,10);
|
||||
case S_CONNECTION:
|
||||
_tone(NOTE_E5,50,30);
|
||||
_tone(NOTE_E6,55,25);
|
||||
_tone(NOTE_A6,60,10);
|
||||
break;
|
||||
|
||||
case S_DISCONNECTION:
|
||||
_tone(NOTE_E5,50,30);
|
||||
_tone(NOTE_A6,55,25);
|
||||
_tone(NOTE_E6,50,10);
|
||||
case S_DISCONNECTION:
|
||||
_tone(NOTE_E5,50,30);
|
||||
_tone(NOTE_A6,55,25);
|
||||
_tone(NOTE_E6,50,10);
|
||||
break;
|
||||
|
||||
case S_BUTTON_PUSHED:
|
||||
bendTones (NOTE_E6, NOTE_G6, 1.03, 20, 2);
|
||||
delay(30);
|
||||
bendTones (NOTE_E6, NOTE_D7, 1.04, 10, 2);
|
||||
case S_BUTTON_PUSHED:
|
||||
bendTones (NOTE_E6, NOTE_G6, 1.03, 20, 2);
|
||||
delay(30);
|
||||
bendTones (NOTE_E6, NOTE_D7, 1.04, 10, 2);
|
||||
break;
|
||||
|
||||
case S_MODE1:
|
||||
bendTones (NOTE_E6, NOTE_A6, 1.02, 30, 10); //1318.51 to 1760
|
||||
case S_MODE1:
|
||||
bendTones (NOTE_E6, NOTE_A6, 1.02, 30, 10); //1318.51 to 1760
|
||||
break;
|
||||
|
||||
case S_MODE2:
|
||||
bendTones (NOTE_G6, NOTE_D7, 1.03, 30, 10); //1567.98 to 2349.32
|
||||
case S_MODE2:
|
||||
bendTones (NOTE_G6, NOTE_D7, 1.03, 30, 10); //1567.98 to 2349.32
|
||||
break;
|
||||
|
||||
case S_MODE3:
|
||||
_tone(NOTE_E6,50,100); //D6
|
||||
_tone(NOTE_G6,50,80); //E6
|
||||
_tone(NOTE_D7,300,0); //G6
|
||||
case S_MODE3:
|
||||
_tone(NOTE_E6,50,100); //D6
|
||||
_tone(NOTE_G6,50,80); //E6
|
||||
_tone(NOTE_D7,300,0); //G6
|
||||
break;
|
||||
|
||||
case S_SURPRISE:
|
||||
bendTones(800, 2150, 1.02, 10, 1);
|
||||
bendTones(2149, 800, 1.03, 7, 1);
|
||||
case S_SURPRISE:
|
||||
bendTones(800, 2150, 1.02, 10, 1);
|
||||
bendTones(2149, 800, 1.03, 7, 1);
|
||||
break;
|
||||
|
||||
case S_OHOOH:
|
||||
bendTones(880, 2000, 1.04, 8, 3); //A5 = 880
|
||||
delay(200);
|
||||
case S_OHOOH:
|
||||
bendTones(880, 2000, 1.04, 8, 3); //A5 = 880
|
||||
delay(200);
|
||||
|
||||
for (int i=880; i<2000; i=i*1.04) {
|
||||
_tone(NOTE_B5,5,10);
|
||||
}
|
||||
for (int i=880; i<2000; i=i*1.04) {
|
||||
_tone(NOTE_B5,5,10);
|
||||
}
|
||||
break;
|
||||
|
||||
case S_OHOOH2:
|
||||
bendTones(1880, 3000, 1.03, 8, 3);
|
||||
delay(200);
|
||||
case S_OHOOH2:
|
||||
bendTones(1880, 3000, 1.03, 8, 3);
|
||||
delay(200);
|
||||
|
||||
for (int i=1880; i<3000; i=i*1.03) {
|
||||
_tone(NOTE_C6,10,10);
|
||||
}
|
||||
for (int i=1880; i<3000; i=i*1.03) {
|
||||
_tone(NOTE_C6,10,10);
|
||||
}
|
||||
break;
|
||||
|
||||
case S_CUDDLY:
|
||||
bendTones(700, 900, 1.03, 16, 4);
|
||||
bendTones(899, 650, 1.01, 18, 7);
|
||||
case S_CUDDLY:
|
||||
bendTones(700, 900, 1.03, 16, 4);
|
||||
bendTones(899, 650, 1.01, 18, 7);
|
||||
break;
|
||||
|
||||
case S_SLEEPING:
|
||||
bendTones(100, 500, 1.04, 10, 10);
|
||||
delay(500);
|
||||
bendTones(400, 100, 1.04, 10, 1);
|
||||
case S_SLEEPING:
|
||||
bendTones(100, 500, 1.04, 10, 10);
|
||||
delay(500);
|
||||
bendTones(400, 100, 1.04, 10, 1);
|
||||
break;
|
||||
|
||||
case S_HAPPY:
|
||||
bendTones(1500, 2500, 1.05, 20, 8);
|
||||
bendTones(2499, 1500, 1.05, 25, 8);
|
||||
case S_HAPPY:
|
||||
bendTones(1500, 2500, 1.05, 20, 8);
|
||||
bendTones(2499, 1500, 1.05, 25, 8);
|
||||
break;
|
||||
|
||||
case S_SUPER_HAPPY:
|
||||
bendTones(2000, 6000, 1.05, 8, 3);
|
||||
delay(50);
|
||||
bendTones(5999, 2000, 1.05, 13, 2);
|
||||
case S_SUPER_HAPPY:
|
||||
bendTones(2000, 6000, 1.05, 8, 3);
|
||||
delay(50);
|
||||
bendTones(5999, 2000, 1.05, 13, 2);
|
||||
break;
|
||||
|
||||
case S_HAPPY_SHORT:
|
||||
bendTones(1500, 2000, 1.05, 15, 8);
|
||||
delay(100);
|
||||
bendTones(1900, 2500, 1.05, 10, 8);
|
||||
case S_HAPPY_SHORT:
|
||||
bendTones(1500, 2000, 1.05, 15, 8);
|
||||
delay(100);
|
||||
bendTones(1900, 2500, 1.05, 10, 8);
|
||||
break;
|
||||
|
||||
case S_SAD:
|
||||
bendTones(880, 669, 1.02, 20, 200);
|
||||
case S_SAD:
|
||||
bendTones(880, 669, 1.02, 20, 200);
|
||||
break;
|
||||
|
||||
case S_CONFUSED:
|
||||
bendTones(1000, 1700, 1.03, 8, 2);
|
||||
bendTones(1699, 500, 1.04, 8, 3);
|
||||
bendTones(1000, 1700, 1.05, 9, 10);
|
||||
case S_CONFUSED:
|
||||
bendTones(1000, 1700, 1.03, 8, 2);
|
||||
bendTones(1699, 500, 1.04, 8, 3);
|
||||
bendTones(1000, 1700, 1.05, 9, 10);
|
||||
break;
|
||||
|
||||
case S_FART1:
|
||||
bendTones(1600, 3000, 1.02, 2, 15);
|
||||
case S_FART1:
|
||||
bendTones(1600, 3000, 1.02, 2, 15);
|
||||
break;
|
||||
|
||||
case S_FART2:
|
||||
bendTones(2000, 6000, 1.02, 2, 20);
|
||||
case S_FART2:
|
||||
bendTones(2000, 6000, 1.02, 2, 20);
|
||||
break;
|
||||
|
||||
case S_FART3:
|
||||
bendTones(1600, 4000, 1.02, 2, 20);
|
||||
bendTones(4000, 3000, 1.02, 2, 20);
|
||||
case S_FART3:
|
||||
bendTones(1600, 4000, 1.02, 2, 20);
|
||||
bendTones(4000, 3000, 1.02, 2, 20);
|
||||
break;
|
||||
|
||||
case PIRATES:
|
||||
case PIRATES:
|
||||
// This is funny but very experimental and probably take long haha =P
|
||||
for (int i = 0; i < 203; i++) { //203 is the total number of music notes in the song
|
||||
int wait = duration[i] * songspeed;
|
||||
_tone( notes[i], wait, 0); //tone(pin,frequency,duration)
|
||||
}
|
||||
for (int i = 0; i < 203; i++) { //203 is the total number of music notes in the song
|
||||
int wait = duration[i] * songspeed;
|
||||
_tone( notes[i], wait, 0); //tone(pin,frequency,duration)
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
@ -13,34 +13,35 @@
|
||||
|
||||
class SimpleExpressionsClass
|
||||
{
|
||||
public:
|
||||
// General
|
||||
void init(int mouthPin, int buzzerPin);
|
||||
void initMouth(int mouthPin);
|
||||
void initBuzzer(int buzzerPin);
|
||||
public:
|
||||
// General
|
||||
void init(int mouthPin, int buzzerPin);
|
||||
void initMouth(int mouthPin);
|
||||
void initBuzzer(int buzzerPin);
|
||||
|
||||
// Mouths
|
||||
void printMouth(int number, int r, int g, int b);
|
||||
void writeMouth(const char mouthName[], int r, int g, int b);
|
||||
// Mouths
|
||||
void printMouth(int number, int r, int g, int b);
|
||||
void writeMouth(const char mouthName[], int r, int g, int b);
|
||||
|
||||
void printMouth(int number);
|
||||
void writeMouth(const char mouthName[]);
|
||||
void printMouth(int number);
|
||||
void writeMouth(const char mouthName[]);
|
||||
|
||||
void clearMouth();
|
||||
void clearMouth();
|
||||
void showMouth();
|
||||
|
||||
void writeMouthGeneric(const int mouthArray[7][3]);
|
||||
void writeMouthGeneric(const bool mouthArray[7], int r, int g, int b);
|
||||
void writeMouthGeneric(const int mouthArray[7][3]);
|
||||
void writeMouthGeneric(const bool mouthArray[7], int r, int g, int b);
|
||||
|
||||
// Sounds
|
||||
void _tone (float noteFrequency, long noteDuration, int silentDuration);
|
||||
void bendTones (float initFrequency, float finalFrequency, float prop, long noteDuration, int silentDuration);
|
||||
void playSound(int soundName);
|
||||
// Sounds
|
||||
void _tone (float noteFrequency, long noteDuration, int silentDuration);
|
||||
void bendTones (float initFrequency, float finalFrequency, float prop, long noteDuration, int silentDuration);
|
||||
void playSound(int soundName);
|
||||
|
||||
|
||||
private:
|
||||
Adafruit_NeoPixel mouth;
|
||||
void clearPixels();
|
||||
int buzzerPin;
|
||||
private:
|
||||
Adafruit_NeoPixel mouth;
|
||||
void clearPixels();
|
||||
int buzzerPin;
|
||||
};
|
||||
|
||||
extern SimpleExpressionsClass SimpleExpressions;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user