Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: main.cpp
- Revision:
- 37:ff95e7070f26
- Parent:
- 36:87865913ae6f
- Child:
- 39:2f17131d22a5
--- a/main.cpp Thu May 23 22:26:39 2013 +0000 +++ b/main.cpp Wed May 29 00:20:31 2013 +0000 @@ -15,9 +15,11 @@ //#define EVT_TIME_PROFILE #define DEBUG //#define SSNOTIFY -#define USE_MODSERIAL +//#define USE_MODSERIAL #include <stdint.h> +#include "SnConstants.h" + #include "SDFileSystem.h" #ifdef USE_MODSERIAL #include "MODSERIAL.h" @@ -26,7 +28,6 @@ #endif #include "FATDirHandle.h" #include "EthernetPowerControl.h" -#include "SnConstants.h" #include "SnBitUtils.h" #include "SnSDUtils.h" #include "SnConfigFrame.h" @@ -38,13 +39,17 @@ #ifdef USE_ETH_INTERFACE #include "SnCommAfarTCP.h" #else -#include "SnCommAfarNetIf.h" +//#include "SnCommAfarNetIf.h" +#include "SnCommWinAfar.h" #ifdef ENABLE_AFAR_TWITTER -#include "SnCommAfarNetIfTwitter.h" +//#include "SnCommAfarNetIfTwitter.h" +#include "SnCommWinTwitter.h" #endif #endif -#include "SnCommUsb.h" -#include "SnCommSBD.h" +//#include "SnCommUsb.h" +#include "SnCommWinUsb.h" +//#include "SnCommSBD.h" +#include "SnCommWinSBD.h" #include "SnBase64.h" #ifdef USE_RTOS_TIMER #include "RtosTimer.h" @@ -559,17 +564,20 @@ #ifdef USE_ETH_INTERFACE gComms[comi++] = new SnCommAfarTCP(gConf); #else - gComms[comi++] = new SnCommAfarNetIf(gConf); + //gComms[comi++] = new SnCommAfarNetIf(gConf); + gComms[comi++] = new SnCommWinAfar(gConf); #ifdef ENABLE_AFAR_TWITTER gTwit = new SnCommAfarNetIfTwitter(gConf); #endif #endif #endif #ifdef ENABLE_SBD_COMM - gComms[comi++] = new SnCommSBD(&gSBDport, &gCpu); + //gComms[comi++] = new SnCommSBD(&gSBDport, &gCpu); + gComms[comi++] = new SnCommWinSBD(&gSBDport, &gCpu); #endif #ifdef ENABLE_USB_COMM - gComms[comi++] = new SnCommUsb(&gCpu); + //gComms[comi++] = new SnCommUsb(&gCpu); + gComms[comi++] = new SnCommWinUsb(&gCpu); #endif #ifdef DEBUG @@ -624,7 +632,7 @@ led2=0; // the main event loop. wait for triggers in SendClock - AreCardsPowered(true); + AreCardsPowered(true); // TODO: should this be an if? gTrgTimer.start(); register int32_t etms=0; // time between written events while( true )