Diff: interrupt/interrupt.cpp

Revision:

28:bcfc84b481bc

Parent:

23:f45eb02433a5

Child:

29:ea48140fc85e

--- a/interrupt/interrupt.cpp	Mon Sep 03 07:37:28 2018 +0000
+++ b/interrupt/interrupt.cpp	Tue Sep 04 12:00:39 2018 +0000
@@ -7,8 +7,10 @@
 #include "pinnames.h"
 #include "cat18_can_info.h"
 #include "workinfo.h"
-#include "define_right_or_left.h"
 #include "calplace.h"
+#include "pinnames.h"
+#include "state.h"
+#include "discoveryboard.h"
 //#define CAN_ON //CAN通信するならdefine
 Ticker ticker;
 CAN can(pin_can_rd,pin_can_td);
@@ -27,7 +29,7 @@
 //CAN通信
 void CanRead();
 void CanSend();
-
+void SpiRead();
 void InterruptSetup()
 {
     DEBUG("InterruptSetup() start\r\n");
@@ -37,6 +39,7 @@
 }
 void TimerInterrupt()
 {
+    if(is_manual == 1) return;
     static int count = 0;
     if(count % kPIDCount == 0) PIDInterrupt();
     if(count % kCalTargetCount == 0) CalTargetInterrupt();
@@ -94,4 +97,6 @@
     if(state >= CANID_FINISH) {
         state = 1;
     }
+}
+void SpiRead(){
 }
\ No newline at end of file