green rosh
/
BAE_FRDM_INTEGRATION
bae integrated final (may be)
Fork of BAE_FRDMTESIN2 by
Diff: main.cpp
- Revision:
- 2:80b8a2e999f7
- Parent:
- 0:8b0d43fe6c05
- Child:
- 3:02b45de29c0f
diff -r b4bb78a9b92e -r 80b8a2e999f7 main.cpp --- a/main.cpp Tue Dec 02 04:38:19 2014 +0000 +++ b/main.cpp Tue Dec 02 10:43:24 2014 +0000 @@ -4,6 +4,7 @@ #include "slave.h" #include "beacon.h" #include "ACS.h" +#include "fault.h" Serial pc(USBTX, USBRX); @@ -157,7 +158,7 @@ //--------------------------------------------------------------------------------------------------------------------------------------------------- //Dummy fault rectifier functions -Mail<int,16> faults; +/*Mail<int,16> faults; void FUNC_FAULT_FUNCT1() { @@ -187,6 +188,15 @@ faults.free(fault_id); } } +}*/ +void T_FAULT(void const *args) +{ + while(1) + { + Thread :: signal_wait(0x2); + FAULTS(); + + } } //------------------------------------------------------------------------------------------------------------------------------------------------ @@ -208,7 +218,9 @@ } if(schedcount%2==0) { + // ptr_t_fault -> signal_set(0x2); ptr_t_hk_acq -> signal_set(0x2); + } if(schedcount%3==0) {