Merge branch 'master' of https://bitbucket.org/MReenenHR/motion-controller

2020-05-25 10:59:48 +02:00 · 2020-05-25 10:59:48 +02:00 · fee6db6e7d
commit fee6db6e7d
parent ae3cb731c6 83c27b43dd
3 changed files with 2 additions and 4 deletions
--- a/Mfrc522.c
+++ b/Mfrc522.c
@ -8,6 +8,7 @@
  Lightly modified by Mats van Reenen: use other SPI interface
 */

+#include <msp430.h>
 #include <Mfrc522.h>
 #include <SPI.h>
 //#include <SPI2.h>
--- a/NFC.c
+++ b/NFC.c
@ -1,5 +1,4 @@
 #include <msp430.h>
 #include "NFC.h"
-#include "SPI2.h"
 #include "Mfrc522.h"

--- a/main.c
+++ b/main.c
@ -41,8 +41,6 @@
 */
 int main(void)
 {
-    int v;
-
    WDTCTL = WDTPW | WDTHOLD;   // stop watchdog timer

    // set cpu op 16MHz
@ -52,7 +50,7 @@ int main(void)
    SPIInit();
    MDInit();
    MCInit();
-    NFCInit();
+    //NFCInit();

    return 0;
 }