From e7c24acdbc1f29991d1d0a198bf651257ede119c Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Sun, 3 Dec 2017 22:06:21 +0100 Subject: [PATCH] Moving to src for 1.5 library format --- Hippie_gestures.h | 70 -------------- Hippie_mouths.h | 87 ------------------ Hippie_sounds.h | 133 --------------------------- Hippie.cpp => src/Hippie.cpp | 0 Hippie.h => src/Hippie.h | 0 Oscillator.cpp => src/Oscillator.cpp | 0 Oscillator.h => src/Oscillator.h | 0 7 files changed, 290 deletions(-) delete mode 100644 Hippie_gestures.h delete mode 100644 Hippie_mouths.h delete mode 100644 Hippie_sounds.h rename Hippie.cpp => src/Hippie.cpp (100%) rename Hippie.h => src/Hippie.h (100%) rename Oscillator.cpp => src/Oscillator.cpp (100%) rename Oscillator.h => src/Oscillator.h (100%) diff --git a/Hippie_gestures.h b/Hippie_gestures.h deleted file mode 100644 index 256e996..0000000 --- a/Hippie_gestures.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef Zowi_gestures_h -#define Zowi_gestures_h - -//*********************************************************************************** -//*********************************GESTURE DEFINES*********************************** -//*********************************************************************************** - -#define ZowiHappy 0 -#define ZowiSuperHappy 1 -#define ZowiSad 2 -#define ZowiSleeping 3 -#define ZowiFart 4 -#define ZowiConfused 5 -#define ZowiLove 6 -#define ZowiAngry 7 -#define ZowiFretful 8 -#define ZowiMagic 9 -#define ZowiWave 10 -#define ZowiVictory 11 -#define ZowiFail 12 - -//*** MOUTH ANIMATIONS*** -#define littleUuh 0 -#define dreamMouth 1 -#define adivinawi 2 -#define wave 3 - - - // unsigned long int littleUuh_code[]={ - // 0b00000000000000001100001100000000, - // 0b00000000000000000110000110000000, - // 0b00000000000000000011000011000000, - // 0b00000000000000000110000110000000, - // 0b00000000000000001100001100000000, - // 0b00000000000000011000011000000000, - // 0b00000000000000110000110000000000, - // 0b00000000000000011000011000000000 - // }; - - // unsigned long int dreamMouth_code[]={ - // 0b00000000000000000000110000110000, - // 0b00000000000000010000101000010000, - // 0b00000000011000100100100100011000, - // 0b00000000000000010000101000010000 - // }; - - // unsigned long int adivinawi_code[]={ - // 0b00100001000000000000000000100001, - // 0b00010010100001000000100001010010, - // 0b00001100010010100001010010001100, - // 0b00000000001100010010001100000000, - // 0b00000000000000001100000000000000, - // 0b00000000000000000000000000000000 - // }; - - // unsigned long int wave_code[]={ - // 0b00001100010010100001000000000000, - // 0b00000110001001010000100000000000, - // 0b00000011000100001000010000100000, - // 0b00000001000010000100001000110000, - // 0b00000000000001000010100100011000, - // 0b00000000000000100001010010001100, - // 0b00000000100000010000001001000110, - // 0b00100000010000001000000100000011, - // 0b00110000001000000100000010000001, - // 0b00011000100100000010000001000000 - // }; - - -#endif \ No newline at end of file diff --git a/Hippie_mouths.h b/Hippie_mouths.h deleted file mode 100644 index 5a2ef3a..0000000 --- a/Hippie_mouths.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef Zowi_mouths_h -#define Zowi_mouths_h - - -//*********************************************************************************** -//*********************************MOUTHS DEFINES************************************ -//*********************************************************************************** - -#define zero_code 0b00001100010010010010010010001100 -#define one_code 0b00000100001100000100000100001110 -#define two_code 0b00001100010010000100001000011110 -#define three_code 0b00001100010010000100010010001100 -#define four_code 0b00010010010010011110000010000010 -#define five_code 0b00011110010000011100000010011100 -#define six_code 0b00000100001000011100010010001100 -#define seven_code 0b00011110000010000100001000010000 -#define eight_code 0b00001100010010001100010010001100 -#define nine_code 0b00001100010010001110000010001110 - -#define smile_code 0b00000000100001010010001100000000 -#define happyOpen_code 0b00000000111111010010001100000000 -#define happyClosed_code 0b00000000111111011110000000000000 -#define heart_code 0b00010010101101100001010010001100 - -#define bigSurprise_code 0b00001100010010100001010010001100 -#define smallSurprise_code 0b00000000000000001100001100000000 - -#define tongueOut_code 0b00111111001001001001000110000000 -#define vamp1_code 0b00111111101101101101010010000000 -#define vamp2_code 0b00111111101101010010000000000000 -#define lineMouth_code 0b00000000000000111111000000000000 - -#define confused_code 0b00000000001000010101100010000000 -#define diagonal_code 0b00100000010000001000000100000010 - -#define sad_code 0b00000000001100010010100001000000 -#define sadOpen_code 0b00000000001100010010111111000000 -#define sadClosed_code 0b00000000001100011110110011000000 - -#define okMouth_code 0b00000001000010010100001000000000 -#define xMouth_code 0b00100001010010001100010010100001 -#define interrogation_code 0b00001100010010000100000100000100 - -#define thunder_code 0b00000100001000011100001000010000 -#define culito_code 0b00000000100001101101010010000000 - -#define angry_code 0b00000000011110100001100001000000 - - -//Mouths sorted by numbers, and after, by happy to sad mouths -#define zero 0 -#define one 1 -#define two 2 -#define three 3 -#define four 4 -#define five 5 -#define six 6 -#define seven 7 -#define eight 8 -#define nine 9 -#define smile 10 -#define happyOpen 11 -#define happyClosed 12 -#define heart 13 -#define bigSurprise 14 -#define smallSurprise 15 -#define tongueOut 16 -#define vamp1 17 -#define vamp2 18 -#define lineMouth 19 -#define confused 20 -#define diagonal 21 -#define sad 22 -#define sadOpen 23 -#define sadClosed 24 -#define okMouth 25 -#define xMouth 26 -#define interrogation 27 -#define thunder 28 -#define culito 29 -#define angry 30 - - - -#endif - - diff --git a/Hippie_sounds.h b/Hippie_sounds.h deleted file mode 100644 index 288fdb9..0000000 --- a/Hippie_sounds.h +++ /dev/null @@ -1,133 +0,0 @@ -#ifndef Zowi_sounds_h -#define Zowi_sounds_h - -//*********************************************************************************** -//*********************************SOUNDS DEFINES************************************ -//*********************************************************************************** - - -// Reference: This list was adapted from the table located here: -// http://www.phy.mtu.edu/~suits/notefreqs.html -#define note_C0 16.35 //C0 -#define note_Db0 17.32 //C#0/Db0 -#define note_D0 18.35 //D0 -#define note_Eb0 19.45 //D#0/Eb0 -#define note_E0 20.6 //E0 -#define note_F0 21.83 //F0 -#define note_Gb0 23.12 //F#0/Gb0 -#define note_G0 24.5 //G0 -#define note_Ab0 25.96 //G#0/Ab0 -#define note_A0 27.5 //A0 -#define note_Bb0 29.14 //A#0/Bb0 -#define note_B0 30.87 //B0 -#define note_C1 32.7 //C1 -#define note_Db1 34.65 //C#1/Db1 -#define note_D1 36.71 //D1 -#define note_Eb1 38.89 //D#1/Eb1 -#define note_E1 41.2 //E1 -#define note_F1 43.65 //F1 -#define note_Gb1 46.25 //F#1/Gb1 -#define note_G1 49 //G1 -#define note_Ab1 51.91 //G#1/Ab1 -#define note_A1 55 //A1 -#define note_Bb1 58.27 //A#1/Bb1 -#define note_B1 61.74 //B1 -#define note_C2 65.41 //C2 (Middle C) -#define note_Db2 69.3 //C#2/Db2 -#define note_D2 73.42 //D2 -#define note_Eb2 77.78 //D#2/Eb2 -#define note_E2 82.41 //E2 -#define note_F2 87.31 //F2 -#define note_Gb2 92.5 //F#2/Gb2 -#define note_G2 98 //G2 -#define note_Ab2 103.83 //G#2/Ab2 -#define note_A2 110 //A2 -#define note_Bb2 116.54 //A#2/Bb2 -#define note_B2 123.47 //B2 -#define note_C3 130.81 //C3 -#define note_Db3 138.59 //C#3/Db3 -#define note_D3 146.83 //D3 -#define note_Eb3 155.56 //D#3/Eb3 -#define note_E3 164.81 //E3 -#define note_F3 174.61 //F3 -#define note_Gb3 185 //F#3/Gb3 -#define note_G3 196 //G3 -#define note_Ab3 207.65 //G#3/Ab3 -#define note_A3 220 //A3 -#define note_Bb3 233.08 //A#3/Bb3 -#define note_B3 246.94 //B3 -#define note_C4 261.63 //C4 -#define note_Db4 277.18 //C#4/Db4 -#define note_D4 293.66 //D4 -#define note_Eb4 311.13 //D#4/Eb4 -#define note_E4 329.63 //E4 -#define note_F4 349.23 //F4 -#define note_Gb4 369.99 //F#4/Gb4 -#define note_G4 392 //G4 -#define note_Ab4 415.3 //G#4/Ab4 -#define note_A4 440 //A4 -#define note_Bb4 466.16 //A#4/Bb4 -#define note_B4 493.88 //B4 -#define note_C5 523.25 //C5 -#define note_Db5 554.37 //C#5/Db5 -#define note_D5 587.33 //D5 -#define note_Eb5 622.25 //D#5/Eb5 -#define note_E5 659.26 //E5 -#define note_F5 698.46 //F5 -#define note_Gb5 739.99 //F#5/Gb5 -#define note_G5 783.99 //G5 -#define note_Ab5 830.61 //G#5/Ab5 -#define note_A5 880 //A5 -#define note_Bb5 932.33 //A#5/Bb5 -#define note_B5 987.77 //B5 -#define note_C6 1046.5 //C6 -#define note_Db6 1108.73 //C#6/Db6 -#define note_D6 1174.66 //D6 -#define note_Eb6 1244.51 //D#6/Eb6 -#define note_E6 1318.51 //E6 -#define note_F6 1396.91 //F6 -#define note_Gb6 1479.98 //F#6/Gb6 -#define note_G6 1567.98 //G6 -#define note_Ab6 1661.22 //G#6/Ab6 -#define note_A6 1760 //A6 -#define note_Bb6 1864.66 //A#6/Bb6 -#define note_B6 1975.53 //B6 -#define note_C7 2093 //C7 -#define note_Db7 2217.46 //C#7/Db7 -#define note_D7 2349.32 //D7 -#define note_Eb7 2489.02 //D#7/Eb7 -#define note_E7 2637.02 //E7 -#define note_F7 2793.83 //F7 -#define note_Gb7 2959.96 //F#7/Gb7 -#define note_G7 3135.96 //G7 -#define note_Ab7 3322.44 //G#7/Ab7 -#define note_A7 3520 //A7 -#define note_Bb7 3729.31 //A#7/Bb7 -#define note_B7 3951.07 //B7 -#define note_C8 4186.01 //C8 -#define note_Db8 4434.92 //C#8/Db8 -#define note_D8 4698.64 //D8 -#define note_Eb8 4978.03 //D#8/Eb8 - - -#define S_connection 0 -#define S_disconnection 1 -#define S_buttonPushed 2 -#define S_mode1 3 -#define S_mode2 4 -#define S_mode3 5 -#define S_surprise 6 -#define S_OhOoh 7 -#define S_OhOoh2 8 -#define S_cuddly 9 -#define S_sleeping 10 -#define S_happy 11 -#define S_superHappy 12 -#define S_happy_short 13 -#define S_sad 14 -#define S_confused 15 -#define S_fart1 16 -#define S_fart2 17 -#define S_fart3 18 - -#endif \ No newline at end of file diff --git a/Hippie.cpp b/src/Hippie.cpp similarity index 100% rename from Hippie.cpp rename to src/Hippie.cpp diff --git a/Hippie.h b/src/Hippie.h similarity index 100% rename from Hippie.h rename to src/Hippie.h diff --git a/Oscillator.cpp b/src/Oscillator.cpp similarity index 100% rename from Oscillator.cpp rename to src/Oscillator.cpp diff --git a/Oscillator.h b/src/Oscillator.h similarity index 100% rename from Oscillator.h rename to src/Oscillator.h