Revision 1:0a051df78be2, committed 2016-05-25

Comitter:

Elecia

Date:

Wed May 25 03:42:25 2016 +0000

Parent:

0:21fea82c85fc

Commit message:

As demonstrated at Bring-A-Hack.

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/BuzzMotor.h	Wed May 25 03:42:25 2016 +0000
@@ -0,0 +1,26 @@
+#include "mbed.h"
+
+// new class to play a pattern based on PwmOut class, based on SongPlayer: SongPlayer
+// https://developer.mbed.org/users/4180_1/notebook/using-a-speaker-for-audio-output/
+class BuzzMotor
+{
+public:
+    BuzzMotor(PinName pin) : mPin(pin) {    
+        // mPin(pin) means pass pin to the constructor
+        mPin = 0.0;
+    }
+    void On() 
+    {
+        mPin = 1;
+    }
+    void Off() 
+    {
+        mPin = 0;
+    }
+
+private:
+    Timeout duration;
+    DigitalOut  mPin;
+    typedef enum {RUMBLE=0, ONE_SEC_HIGH_TICK=1, ONE_SEC_LOW_TICK=2, QUIET=3 } eBuzzType;
+
+};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LedArrayController.h	Wed May 25 03:42:25 2016 +0000
@@ -0,0 +1,82 @@
+
+#define NLED (8)
+#define COLOR_WHITE 0xFFFFFF
+#define COLOR_BLACK 0x000000
+
+extern void AllOneColorLeds(neopixel::Pixel * out, uint32_t index, uintptr_t color);
+
+class LedArrayController {
+public:
+    LedArrayController(BusIn *bus, neopixel::PixelArray *array) : mBus(bus), mArray(array)
+    {
+        mBus->mode(PullUp);
+        
+    }
+    void Stop()
+    {
+            mTimer.detach();
+    }
+    void OnChangeMode(uint32_t baseColor)
+    {
+                                   // 000  001  010  011  100  101  110, 111
+        const float mBlinkTiming[] = {1.0, 0.1, 0.5, 0.0, 2.0, 0.0, 0.0, 5.0};
+        mBaseColor = baseColor;
+        mIsBaseColor = false;
+        mBehavior.value = *mBus;
+
+        Update();
+
+        mTiming = mBlinkTiming[mBehavior.timingIndex];
+        if (mTiming > 0.0f)
+        {
+            mTimer.attach(this, &LedArrayController::Update, mTiming); 
+        } else {
+            mTimer.detach();
+        }        
+    }
+    void Update() {
+        // called by timer for updating LEDs:
+        if (mIsBaseColor) 
+        {
+            switch (mBehavior.type) {
+            case (BLINK_TO_WHITE):
+                mArray->update(AllOneColorLeds, NLED, COLOR_WHITE);
+                break;
+            case (BLINK_TO_BLACK):
+                mArray->update(AllOneColorLeds, NLED, COLOR_BLACK);
+                break;
+            case (BLINK_TO_RANDOM):
+                mArray->update(AllOneColorLeds, NLED, (rand() & COLOR_WHITE));
+                break;
+            case (BLINK_TO_OPPOSITE):
+                mArray->update(AllOneColorLeds, NLED, ~mBaseColor);
+                break;
+            }
+            mIsBaseColor = false;
+
+        } else {
+           // set to base color
+            mArray->update(AllOneColorLeds, NLED, mBaseColor);
+            mIsBaseColor = true;           
+        }     
+        mTimer.attach(this, &LedArrayController::Update, mTiming); 
+                   
+    }
+private:
+    float mTiming;
+    BusIn *mBus;
+    neopixel::PixelArray *mArray;
+    Timeout mTimer;
+    bool mIsBaseColor;
+    uint32_t mBaseColor;
+    typedef enum {BLINK_TO_WHITE=0, BLINK_TO_BLACK=1, BLINK_TO_RANDOM=2, BLINK_TO_OPPOSITE=3 } eBlinkType;
+    union {
+        struct {
+            uint32_t timingIndex:3;
+            uint32_t type:2;
+            uint32_t junk:28;
+        };
+        uint32_t value;            
+   } mBehavior;
+};
+

--- a/SongPlayer.h	Sun May 15 18:06:06 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#include "mbed.h"
-// new class to play a note on Speaker based on PwmOut class
-// https://developer.mbed.org/users/4180_1/notebook/using-a-speaker-for-audio-output/
-class SongPlayer
-{
-public:
-    SongPlayer(PinName pin) : _pin(pin) {
-// _pin(pin) means pass pin to the constructor
-    }
-// class method to play a note based on PwmOut class
-    void PlaySong(float frequency[], float duration[], float volume=1.0) {
-        vol = volume;
-        notecount = 0;
-        _pin.period(1.0/frequency[notecount]);
-        _pin = volume/2.0;
-        noteduration.attach(this,&SongPlayer::nextnote, duration[notecount]);
-        // setup timer to interrupt for next note to play
-        frequencyptr = frequency;
-        durationptr = duration;
-        //returns after first note starts to play
-    }
-    void nextnote();
-private:
-    Timeout noteduration;
-    PwmOut _pin;
-    int notecount;
-    float vol;
-    float * frequencyptr;
-    float * durationptr;
-};
-//Interrupt Routine to play next note
-void SongPlayer::nextnote()
-{
-    _pin = 0.0;
-    notecount++; //setup next note in song
-    if (durationptr[notecount]!=0.0) {
-        _pin.period(1.0/frequencyptr[notecount]);
-        noteduration.attach(this,&SongPlayer::nextnote, durationptr[notecount]);
-        _pin = vol/2.0;
-    } else
-        _pin = 0.0; //turn off on last note
-}
\ No newline at end of file

--- a/main.cpp	Sun May 15 18:06:06 2016 +0000
+++ b/main.cpp	Wed May 25 03:42:25 2016 +0000
@@ -1,173 +1,142 @@
 /*
   Fist full of wires!
-  The intention here is to make a ball of wires that someone can reach in and 
-  grab, changing the behavior of the system. 
-  
+  The intention here is to make a ball of wires that someone can reach in and
+  grab, changing the behavior of the system.
+
   So we read in the free IO lines, build up a variable.
   If it has changed,
     do the change actions:
         make a bzzzzt sound
-        vibrate the motor
         turn off all of the LEDs for a brief instant
-  
+
     Use the created variable to choose the neopixel pattern
     and the sound pattern to output to the audio (intermittent beeps)
 
- 
+
   This program depends on neopixel library.
   http://developer.mbed.org/users/JacobBramley/code/PixelArray/
-  
-  Audio (R2D2 sounds) from Szilard Liptak:
+
+  Audio using an Adafruit sound fx board
   https://developer.mbed.org/users/Szilard/notebook/mbed-r2d2-robot/
   Sounds in general: https://developer.mbed.org/users/4180_1/notebook/using-a-speaker-for-audio-output/
 
-    Todo:
-        Blinking needs a timer attachment
-        
-
- 
 */
 #include "mbed.h"
 #include "neopixel.h"
-#include "SongPlayer.h"
- 
- #include <stdlib.h>     /* srand, rand */
-#define NLED (8)
-#define ONE_COLOR
- 
+#include "LedArrayController.h"
+
+#include <stdlib.h>     /* srand, rand */
+
+
 BusIn mColorWires(
-        p20, p19, p18, p17, p16, p15    // six color, two each, RGB        
-        );
-BusIn mBlinkConfig( 
-        p14, p13, p12,                  // three timing: indexes into mBlinkTiming
-        p30, p29 );                     // two for blink type 
-
+    p22, p19, p18, p21, p16, p15    // six color, two each, RGB
+);
 typedef union {
-    struct 
-    {
+    struct {
         uint32_t green:2;
         uint32_t blue:2;
         uint32_t red:2;
         uint32_t junk:26;
     };
     uint32_t value;
-} tLedBehaviorWires;
-    
-BusIn mLedBitmask (p11, p10, p9, p8, p36, p35, p34, p33);  // eight to for bitmask which LED indexes are on... this is not enough of a difference
+} tledColorWires;
+
+BusIn mBlinkConfig(
+    p14, p13, p20,                  // three timing: indexes into mBlinkTiming
+    p30, p29 );                     // two for blink type
+
+Serial SerialToAudio(p9, p10); // tx, rx
+
+BusIn mLedPatternConfig (p23, p35, p36);
+                        // 000   001   010  011   100    101   110 111
+uint8_t mLedPattern[] = { 0x01, 0xF0, 0x0F, 0xAA, 0x55, 0x0F, 0xF0, 0xFF };
+
 
-#define COLOR_WHITE 0xFFFFFF
-#define COLOR_BLACK 0x000000
+char *mAudioPlaylist[] = {
+     "PBITEDUSTOGG\n" ,  // another one bites the dust
+     "PDANGW   OGG\n" ,     // danger will robinson
+     "PHASTA   OGG\n" ,     // hasta la vista baby
+     "PHELPME  OGG\n" ,    // help me obiwan kenobi, you are my only hope
+     "PNODISA  OGG\n" ,  // no disassembly
+     "PNOESCAPEOGG\n" ,  // there'll be no escape for the princess this time
+     "POMG     OGG\n" ,  // Oh my god (bender)
+     "PPRESSUREOGG\n" ,   // simpsons bomb disposal robot
+     "PSTILLALIOGG\n" ,  // this was a triumph
+     "PLAUGH   OGG\n" ,     // robo laugh
+     "PCOMPUTE OGG\n" ,   // does not compute
+     "PEMBEDDEDOGG\n" ,   // embedded.fm
+     };
+   
+int mNumAudioInPlaylist = 12;
 
 void InitializePins(void);
 void AllOneColorLeds(neopixel::Pixel * out, uint32_t index, uintptr_t color);
-void OnChangeMode(neopixel::PixelArray array);
+void OnChangeMode(neopixel::PixelArray *array);
 neopixel::Pixel GetCurrentColor(uint32_t wireConfig);
 void SetLeds(neopixel::Pixel * out, uint32_t index, uintptr_t wireConfig);
 
-class LedArrayController {
-public:
-    LedArrayController(BusIn *bus, neopixel::PixelArray *array) : mBus(bus), mArray(array)
-    {
-        mBus->mode(PullUp);
-        srand (time(NULL));
-    }
-    void OnChangeMode(uint32_t baseColor)
-    {
-                                   // 000  001  010  011  100  101  110, 111
-        const float mBlinkTiming[] = {1.0, 0.1, 0.5, 0.0, 2.0, 0.0, 0.0, 5.0};
-        mBaseColor = baseColor;
-        mIsBaseColor = false;
-        mBehavior.value = *mBus;
-        Update();
-
-        mTiming = mBlinkTiming[mBehavior.timingIndex];
-        if (mTiming > 0.0f)
-        {
-            mTimer.attach(this, &LedArrayController::Update, mTiming); 
-        } else {
-            mTimer.detach();
-        }        
-    }
-    void Update() {
-        // called by timer for updating LEDs:
-        if (mIsBaseColor) 
-        {
-            switch (mBehavior.type) {
-            case (BLINK_TO_WHITE):
-                mArray->update(AllOneColorLeds, NLED, COLOR_WHITE);
-                break;
-            case (BLINK_TO_BLACK):
-                mArray->update(AllOneColorLeds, NLED, COLOR_BLACK);
-                break;
-            case (BLINK_TO_RANDOM):
-                mArray->update(AllOneColorLeds, NLED, (rand() & COLOR_WHITE));
-                break;
-            case (BLINK_TO_OPPOSITE):
-                mArray->update(AllOneColorLeds, NLED, ~mBaseColor);
-                break;
-            }
-            mIsBaseColor = false;
-
-        } else {
-           // set to base color
-            mArray->update(AllOneColorLeds, NLED, mBaseColor);
-            mIsBaseColor = true;           
-        }     
-        mTimer.attach(this, &LedArrayController::Update, mTiming); 
-                   
-    }
-private:
-    float mTiming;
-    BusIn *mBus;
-    neopixel::PixelArray *mArray;
-    Timeout mTimer;
-    bool mIsBaseColor;
-    uint32_t mBaseColor;
-    typedef enum {BLINK_TO_WHITE=0, BLINK_TO_BLACK=1, BLINK_TO_RANDOM=2, BLINK_TO_OPPOSITE=3 } eBlinkType;
-    union {
-        struct {
-            uint32_t timingIndex:3;
-            uint32_t type:2;
-            uint32_t junk:28;
-        };
-        uint32_t value;            
-   } mBehavior;
-};
-
 
 void InitializePins(void)
 {
     mColorWires.mode(PullUp);
-    mLedBitmask.mode(PullUp);
+    mLedPatternConfig.mode(PullUp);
     mBlinkConfig.mode(PullUp);
+    SerialToAudio.baud(9600);        
 }
 
-void OnChangeMode(neopixel::PixelArray array)
+void OnChangeMode(neopixel::PixelArray *array)
 {
-    // FIXME play bzzzt sound
+    // all black, zap, then white
+    array->update(SetLeds, NLED, COLOR_BLACK);
 
-    // all white, delay all black
-    array.update(AllOneColorLeds, NLED, COLOR_WHITE);    
-    wait_ms(200);
-    array.update(AllOneColorLeds, NLED, COLOR_BLACK);    
-    wait_ms(200);
-    // FIXME mBlinkTimer.detach(); // clear timer functionality
+    SerialToAudio.printf("Q\n");
+    SerialToAudio.printf("q\n");
+    wait_ms(50);
+    // P and then the file name zap.ogg with no dot
+    SerialToAudio.printf("PZAP     OGG\n");
+    wait_ms(350);
+    array->update(SetLeds, NLED, COLOR_WHITE);
+    wait_ms(100);
+    SerialToAudio.printf("Q\n");
+    SerialToAudio.printf("q\n");
+    wait_ms(500);    
+    int audioListIndex = rand() % mNumAudioInPlaylist;
+    SerialToAudio.printf(mAudioPlaylist[audioListIndex]);
 }
 
 uint8_t MakeColorFromWires(uint32_t singleColorWireConfig)
 {
     uint8_t color;
-    if (singleColorWireConfig == 3u)      { color = 0xFF; }
-    else if (singleColorWireConfig == 0u) { color = 0x00; }
-    else /* one bit on */                 { color = 0x80; }
+    if (singleColorWireConfig == 3u)      {
+        color = 0xFF;
+    } else if (singleColorWireConfig == 0u) {
+        color = 0x00;
+    } else { /* one bit on */
+        color = 0x80;
+    }
     return color;
 }
 
 void AllOneColorLeds(neopixel::Pixel * out, uint32_t index, uintptr_t color)
 {
-    out->red =   (color >> 16) & 0xFF;    
-    out->green = (color >> 8 ) & 0xFF;
-    out->blue =  (color      ) & 0xFF;    
+    bool thisOneOn = false;
+    uint32_t indexMask = 1u << index;
+    indexMask &= mLedPattern[mLedPatternConfig];
+
+    if ( (color == COLOR_BLACK) || (color == COLOR_WHITE) )
+    {
+        thisOneOn = true;
+}    
+    if (indexMask) { // if this one set
+        thisOneOn = true;
+    }
+
+    if (thisOneOn) 
+    {
+        out->red =   (color >> 16) & 0xFF;
+        out->green = (color >> 8 ) & 0xFF;
+        out->blue =  (color      ) & 0xFF;
+    }
 }
 
 uint32_t GetCurrentColorU32(uint32_t wireConfig)
@@ -182,12 +151,11 @@
 
 neopixel::Pixel GetCurrentColor(uint32_t wireConfig)
 {
-    tLedBehaviorWires config;
+    tledColorWires config;
     neopixel::Pixel out;
     config.value = wireConfig;
-    if ( (config.red == 0u) && (config.green == 0u) && (config.blue == 0u) )
-    {
-        out.red = 0x10u;    
+    if ( (config.red == 0u) && (config.green == 0u) && (config.blue == 0u) ) {
+        out.red = 0x10u;
         out.green = 0x10u;
         out.blue = 0x10u;
     } else {
@@ -197,72 +165,63 @@
     }
     return out;
 }
-void SetLeds(neopixel::Pixel * out, uint32_t index, uintptr_t wireConfig) 
- {
+void SetLeds(neopixel::Pixel * out, uint32_t index, uintptr_t wireConfig)
+{
     bool thisOneOn = false;
     uint32_t indexMask = 1u << index;
-    
-    indexMask &= mLedBitmask;
-    if (indexMask) // if this one set
-    {
-        thisOneOn = true;
-    } else if (mLedBitmask == 0u) // all wires plugged in, let all LEDs turn on
-    {
+
+    indexMask &= mLedPattern[mLedPatternConfig];
+    if (indexMask) { // if this one set
         thisOneOn = true;
     }
-    
-    if (thisOneOn) 
-    {
+    if (thisOneOn) {
         *out = GetCurrentColor(wireConfig);
     } else {
-        AllOneColorLeds(out, index, COLOR_BLACK);    
+        AllOneColorLeds(out, index, COLOR_BLACK);
     }
- }
- 
- 
-int main() {
-    uint32_t ledBehaviorWires;
-    uint32_t ledBitMask;
+}
+
+
+int main()
+{
+    uint32_t ledColorWires;
+    uint32_t ledPatternConfig;
     uint32_t ledBlinkConfig;
-    bool change = true;
-    neopixel::PixelArray array(p5);
-    LedArrayController ledArrayController(&mBlinkConfig, &array);
- //   SongPlayer mySpeaker(p21);
-    
+    bool change = false;
+    AnalogIn analog (p20);
+    srand(analog*65535*analog);
+
     InitializePins();
-    
-//    float note[18]= {3520, 3135.96, 2637.02, 2093, 2349.32, 3951.07, 2793.83, 4186.01, 3520, 3135.96, 2637.02, 2093, 2349.32, 3951.07, 2793.83, 4186.01}; //R2D2 sound effect
-//    float duration[18]= {0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1};   //for a bit of variety, multiple sound samples could be chosen at random
- 
-// float note[18]= {1568.0,1396.9,1244.5,1244.5,1396.9,1568.0,1568.0,1568.0,1396.9,
-//                 1244.5,1396.9,1568.0,1396.9,1244.5,1174.7,1244.5,1244.5, 0.0
-//                };
-//float duration[18]= {0.48,0.24,0.72,0.48,0.24,0.48,0.24,0.24,0.24,
- //                    0.24,0.24,0.24,0.24,0.48,0.24,0.48,0.48, 0.0
- //                   };
- 
-//    uint32_t val = 0;
-    while (1) 
-    { 
-        if ((ledBehaviorWires != mColorWires) ||
-            (ledBitMask !=  mLedBitmask) ||
-            (ledBlinkConfig != mBlinkConfig) )
-        {
+    neopixel::PixelArray mPixelArray(p5);
+    LedArrayController ledArrayController(&mBlinkConfig, &mPixelArray);
+
+    ledColorWires    = mColorWires       & mColorWires.mask();
+    ledPatternConfig = mLedPatternConfig & mLedPatternConfig.mask();
+    ledBlinkConfig   = mBlinkConfig      & mBlinkConfig.mask();
+    ledArrayController.OnChangeMode(GetCurrentColorU32(ledColorWires));
+    mPixelArray.update(SetLeds, NLED, ledColorWires);
+
+    while (1) {
+        if ( 
+        ( ledColorWires    != ( mColorWires       & mColorWires.mask()       ) )  ||
+        ( ledPatternConfig != ( mLedPatternConfig & mLedPatternConfig.mask() ) )  ||
+        ( ledBlinkConfig   != ( mBlinkConfig      & mBlinkConfig.mask()      ) )  ){
             change = true;
         }
-        if (change)
-        {
+        if (change) {
             change = false;
-            ledBehaviorWires = mColorWires;
-            ledBitMask =  mLedBitmask;
-            ledBlinkConfig = mBlinkConfig;
-            ledArrayController.OnChangeMode(GetCurrentColorU32(ledBehaviorWires));
-//            OnChangeMode(array);
-            
-            array.update(SetLeds, NLED, ledBehaviorWires);
+
+            ledArrayController.Stop();
+            OnChangeMode(&mPixelArray);
+            ledArrayController.OnChangeMode(GetCurrentColorU32(ledColorWires));
+
+            ledColorWires    = mColorWires       & mColorWires.mask();
+            ledPatternConfig = mLedPatternConfig & mLedPatternConfig.mask();
+            ledBlinkConfig   = mBlinkConfig      & mBlinkConfig.mask();
+
+            mPixelArray.update(SetLeds, NLED, ledColorWires);
         }
-    
-//      mySpeaker.PlaySong(note,duration);  //play R2D2 sound effects
-      wait_ms(10);
+
+        wait_ms(10);
     }
 }
\ No newline at end of file