Revision 1:0f59aa4b839f, committed 2015-10-06

Comitter:

k4zuki

Date:

Tue Oct 06 02:12:46 2015 +0000

Parent:

0:6a500a08c7fd

Child:

2:457a920a1223

Commit message:

fork from davervw/SWSPI

Changed in this revision

--- a/SWSPI.cpp	Tue Feb 04 06:54:01 2014 +0000
+++ b/SWSPI.cpp	Tue Oct 06 02:12:46 2015 +0000
@@ -23,11 +23,17 @@
 #include <mbed.h>
 #include "SWSPI.h"
 
-SWSPI::SWSPI(PinName mosi_pin, PinName miso_pin, PinName sclk_pin)
+SWSPI::SWSPI(PinName mosi_pin, PinName miso_pin, PinName sclk_pin):_fast(false)
 {
-    mosi = new DigitalOut(mosi_pin);
-    miso = new DigitalIn(miso_pin);
-    sclk = new DigitalOut(sclk_pin);
+    mosi = new DigitalInOut(mosi_pin);
+    mosi->input();
+    mosi->mode(PullNone);
+    miso = new DigitalInOut(miso_pin);
+    miso->input();
+    miso->mode(PullNone);
+    sclk = new DigitalInOut(sclk_pin);
+    sclk->input();
+    sclk->mode(PullNone);
     format(8);
     frequency();
 }
@@ -51,11 +57,24 @@
 void SWSPI::frequency(int hz)
 {
     this->freq = hz;
+    _fast = (hz >= 1000000) ? true : false;
 }
 
+#pragma Otime
+
 int SWSPI::write(int value)
 {
+    mosi->output();
+    mosi->mode(PullNone);
+    miso->input();
+    miso->mode(PullNone);
+    sclk->output();
+    sclk->mode(PullNone);
+
     int read = 0;
+    if (_fast) {
+        read = fast_write(value);
+    }
     for (int bit = bits-1; bit >= 0; --bit)
     {
         mosi->write(((value >> bit) & 0x01) != 0);
@@ -68,7 +87,7 @@
 
         sclk->write(!polarity);
 
-        wait(1.0/freq/2);
+        wait_us(1000000/freq/2);
 
         if (phase == 1)
         {
@@ -78,9 +97,30 @@
 
         sclk->write(polarity);
 
-        wait(1.0/freq/2);
+        wait_us(1000000/freq/2);
     }
+
+    mosi->input();
+    mosi->mode(PullNone);
+    miso->input();
+    miso->mode(PullNone);
+    sclk->input();
+    sclk->mode(PullNone);
     
     return read;
 }
 
+uint8_t SWSPI::fast_write(uint8_t value)
+{
+    uint8_t data = 0;
+    for(uint8_t mask = 0x80; mask; mask >>= 1) {
+        mosi->write((value & mask) ? 1 : 0);
+        if (miso->read()) {
+            data |= mask;
+        }
+        sclk->write(1);
+        sclk->write(0);
+    }
+    return data;
+}
+

--- a/SWSPI.h	Tue Feb 04 06:54:01 2014 +0000
+++ b/SWSPI.h	Tue Oct 06 02:12:46 2015 +0000
@@ -49,15 +49,17 @@
 class SWSPI
 {
 private:
-    DigitalOut* mosi;
-    DigitalIn* miso;
-    DigitalOut* sclk;
+    uint8_t fast_write(uint8_t value);
+    DigitalInOut* mosi;
+    DigitalInOut* miso;
+    DigitalInOut* sclk;
     int port;
     int bits;
     int mode;
     int polarity; // idle clock value
     int phase; // 0=sample on leading (first) clock edge, 1=trailing (second)
     int freq;
+    bool _fast;
     
 public:
     /** Create SWSPI object