HR/PEE20_motionController
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mats van Reenen 2020-05-25 10:59:48 +02:00
commit fee6db6e7d
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mfrc522.c
View File

@ -8,6 +8,7 @@
Lightly modified by Mats van Reenen: use other SPI interface Lightly modified by Mats van Reenen: use other SPI interface
*/ */
#include <msp430.h>
#include <Mfrc522.h> #include <Mfrc522.h>
#include <SPI.h> #include <SPI.h>
//#include <SPI2.h> //#include <SPI2.h>

1
NFC.c
View File

@ -1,5 +1,4 @@
#include <msp430.h> #include <msp430.h>
#include "NFC.h" #include "NFC.h"
#include "SPI2.h"
#include "Mfrc522.h" #include "Mfrc522.h"

4
main.c
View File

@ -41,8 +41,6 @@
*/ */
int main(void) int main(void)
{ {
int v;
WDTCTL = WDTPW | WDTHOLD; // stop watchdog timer WDTCTL = WDTPW | WDTHOLD; // stop watchdog timer
// set cpu op 16MHz // set cpu op 16MHz
@ -52,7 +50,7 @@ int main(void)
SPIInit(); SPIInit();
MDInit(); MDInit();
MCInit(); MCInit();
NFCInit(); //NFCInit();
return 0; return 0;
} }