Diff: main.cpp

Revision:

30:2829089e2ef3

Parent:

29:99e8c0ea9ac1

Child:

31:747be5f4f781

diff -r 99e8c0ea9ac1 -r 2829089e2ef3 main.cpp
--- a/main.cpp	Mon Apr 15 12:05:57 2019 +0000
+++ b/main.cpp	Mon Apr 22 13:58:24 2019 +0000
@@ -10,18 +10,18 @@
 #include "MFRC522.h"
  
 // NFC/RFID Reader (SPI)
-MFRC522    rfidReader( PTA16, PTC7, PTC5, D10, D8 ); // PTD2 statt PTA16
+MFRC522    rfidReader( MBED_CONF_IOTKIT_RFID_MOSI, MBED_CONF_IOTKIT_RFID_MISO, MBED_CONF_IOTKIT_RFID_SCLK, MBED_CONF_IOTKIT_RFID_SS, MBED_CONF_IOTKIT_RFID_RST ); 
 
 #include "ESP8266Interface.h"
 ESP8266Interface wifi(MBED_CONF_APP_WIFI_TX, MBED_CONF_APP_WIFI_RX);
 
 // Sensoren wo Daten fuer Topics produzieren
-static DevI2C devI2c(PTE0,PTE1);
+static DevI2C devI2c( MBED_CONF_IOTKIT_I2C_SDA, MBED_CONF_IOTKIT_I2C_SCL );
 static HTS221Sensor hum_temp(&devI2c);
-AnalogIn hallSensor( PTC0 );
-DigitalIn button( PTC13 );
+AnalogIn hallSensor( MBED_CONF_IOTKIT_HALL_SENSOR );
+DigitalIn button( MBED_CONF_IOTKIT_BUTTON1 );
 //Use X2 encoding by default.
-QEI wheel (PTC6, PTA4, NC, 624);
+QEI wheel (MBED_CONF_IOTKIT_BUTTON2, MBED_CONF_IOTKIT_BUTTON3, NC, 624);
 
 // Topic's
 char* topicTEMP =  "iotkit/sensor";
@@ -42,9 +42,9 @@
 int type = 0;
 
 // UI
-OLEDDisplay oled( PTE26, PTE0, PTE1);
-DigitalOut led1( D10 );
-DigitalOut alert( D13 );
+OLEDDisplay oled( MBED_CONF_IOTKIT_OLED_RST, MBED_CONF_IOTKIT_OLED_SDA, MBED_CONF_IOTKIT_OLED_SCL );
+DigitalOut led1( MBED_CONF_IOTKIT_LED1 );
+DigitalOut alert( MBED_CONF_IOTKIT_LED3 );
 
 // Aktore(n)
 Motor m1(D3, D2, D4); // PWM, Vorwaerts, Rueckwarts