Diff: DmTouch.h

Revision:

14:2db7065edbec

Parent:

11:264e19992620

--- a/DmTouch.h	Fri Sep 18 14:59:13 2015 +0000
+++ b/DmTouch.h	Mon Oct 12 08:35:35 2015 +0000
@@ -45,7 +45,7 @@
 #if defined (DM_TOOLCHAIN_ARDUINO)
   DmTouch(Display disp, SpiMode spiMode=Auto, bool useIrq=true);
 #elif defined (DM_TOOLCHAIN_MBED)
-  DmTouch(Display disp, SpiMode spiMode=Hardware);
+  DmTouch(Display disp, PinName mosi=D11, PinName miso=D12, PinName clk=D13);
 #endif
   void init();
   void readTouchData(uint16_t& posX, uint16_t& posY, bool& touching);
@@ -75,15 +75,15 @@
   bool _hardwareSpi;
   uint8_t _samplesPerMeasurement;
   CalibrationMatrix _calibrationMatrix;
-  uint8_t _cs, _clk, _mosi, _miso;
-  int8_t _irq;
   uint16_t _touch_id;
 
 #if defined (DM_TOOLCHAIN_ARDUINO)
+  uint8_t _cs, _clk, _mosi, _miso,_irq;;
   regtype *_pinDC, *_pinCS, *_pinCLK, *_pinMOSI, *_pinMISO, *_pinIrq;
   regsize _bitmaskDC, _bitmaskCS, _bitmaskCLK, _bitmaskMOSI, _bitmaskMISO, _bitmaskIrq;
   uint8_t _spiSettings;
 #elif defined (DM_TOOLCHAIN_MBED)
+  PinName _cs, _clk, _mosi, _miso, _irq;
   DigitalOut *_pinDC, *_pinCS, *_pinCLK, *_pinMOSI, *_led;
   DigitalIn *_pinMISO, *_pinIrq;
   SPI *_spi;