Diff: ukifune.cpp

Revision:

1:6253da3ab855

Parent:

0:bb828a2c4208

Child:

7:e2a690a654ff

--- a/ukifune.cpp	Sat Jan 21 07:16:57 2017 +0000
+++ b/ukifune.cpp	Sun Jan 22 13:51:48 2017 +0000
@@ -1,17 +1,19 @@
 #include "mbed.h"
 #include "ukifune.h"
 #include "unzen.h"
+#include "amakusa.h"
 
 #define AD7999 (0x29<<1)
 #define ADCBUFSIZE 8
-
+#define ADCNUM 8
 
 namespace ukifune
 {
         // 
     DigitalOut *leds[12];
     DigitalIn *switches[16];
-    float adc[8];
+    float adc[ADCNUM];
+    amakusa::Hysteresis * hysteresis[ADCNUM];
     
         
         // Test points
@@ -36,7 +38,7 @@
     
         // Mode Button
     DigitalIn SWM1(PD_14);
-    DigitalIn SWM2(PB_3);
+    DigitalIn SWM2(PB_4);
     DigitalIn SWM3(PA_12);
     
         // Key Button
@@ -50,7 +52,7 @@
     DigitalIn SWK8(PB_12);
     DigitalIn SWK9(PA_7);
     DigitalIn SWK10(PA_6);
-    DigitalIn SWK11(PD_8);
+    DigitalIn SWK11(PC_7);
     DigitalIn SWK12(PC_5);
     DigitalIn SWK13(PC_8);
 
@@ -81,6 +83,7 @@
     
     void init( unzen::Framework *audio)
     {
+            
             // Setup interrupt/process activity flag.
         audio->set_pre_interrupt_callback( assert_interrupt_flag );
         audio->set_post_interrupt_callback( deassert_interrupt_flag );
@@ -120,11 +123,15 @@
         switches[ swk11 ] = & SWK11;
         switches[ swk12 ] = & SWK12;
         switches[ swk13 ] = & SWK13;
+        
+        for ( int i= 0; i<ADCNUM; i++ )
+            hysteresis[ i ] = new amakusa::Hysteresis((int32_t)0,(int32_t) 255);
+            
     }
     
     void get_button_state(
-            uint32_t & rising, 
-            uint32_t & falling, 
+            uint32_t & pusshing, 
+            uint32_t & releasing, 
             uint32_t & pushed )
     {
         static int last_button  = 0;
@@ -144,10 +151,10 @@
         pushed = current_button; 
         
             // buttons which are pushed from last state.
-        rising =  ( last_button ^ current_button ) & current_button;
+        pusshing =  ( last_button ^ current_button ) & current_button;
         
             // buttons which are released from last state
-        falling = ( last_button ^ current_button ) & last_button;
+        releasing = ( last_button ^ current_button ) & last_button;
         
         last_button = current_button;
     }
@@ -172,13 +179,52 @@
         return *( leds[ led ] );
     }
 
+    float get_volume( int number )
+    {
+        if ( number < 0)
+            return 0.0;
+        if ( number >= ADCNUM )
+            return 0.0;
+            
+        return adc[ number ];
+            
+    }
+
+    void parse_adc( char * buf, int &ch, int &data )
+    {
+        ch = ( buf[0] & 0x30 ) >> 4;
+        data = 
+            ( buf[0] & 0x0F ) << 4 |
+            ( buf[1] & 0xF0 ) >> 4;
+        
+    } 
+
+
+
     void tick(void)
     {
-        unsigned char adcbuf[ADCBUFSIZE];
+        char adcbuf[ADCBUFSIZE];
+        int ch, data;
         
-        i2c3..read( AD7999, adcbuf, 8);
-        i2c4..read( AD7999, adcbuf, 8);
-
+        i2c3.read( AD7999, adcbuf, 8);
+        parse_adc(& adcbuf[0], ch, data);
+        adc[ch] = hysteresis[ch]->run( data ) / 255.0;
+        parse_adc(& adcbuf[2], ch, data);
+        adc[ch] = hysteresis[ch]->run( data ) / 255.0;
+        parse_adc(& adcbuf[4], ch, data);
+        adc[ch] = hysteresis[ch]->run( data ) / 255.0;
+        parse_adc(& adcbuf[6], ch, data);
+        adc[ch] = hysteresis[ch]->run( data ) / 255.0;
+        
+        i2c4.read( AD7999, adcbuf, 8);
+        parse_adc(& adcbuf[0], ch, data);
+        adc[ch+4] = hysteresis[ch+4]->run( data ) / 255.0;
+        parse_adc(& adcbuf[2], ch, data);
+        adc[ch+4] = hysteresis[ch+4]->run( data ) / 255.0;
+        parse_adc(& adcbuf[4], ch, data);
+        adc[ch+4] = hysteresis[ch+4]->run( data ) / 255.0;
+        parse_adc(& adcbuf[6], ch, data);
+        adc[ch+4] = hysteresis[ch+4]->run( data ) / 255.0;
     }