Diff: SnConstants.h

Revision:

37:ff95e7070f26

Parent:

36:87865913ae6f

Child:

38:9070c17536cd

--- a/SnConstants.h	Thu May 23 22:26:39 2013 +0000
+++ b/SnConstants.h	Wed May 29 00:20:31 2013 +0000
@@ -2,10 +2,7 @@
 #define SN_SnConstants
 
 #include "SnBitUtils.h"
-
-//#define CPUBAUD_SN 921600
-#define CPUBAUD_SN 460800
-//#define CPUBAUD_SN 115200
+#include "SnCommConstants.h"
 
 //
 // constants
@@ -24,14 +21,6 @@
 static const float    kAsfClkPrdUs      = 8.535; // us -- change kAdcToMBtimeCut if this is <=2us
 
 static const uint32_t kAbsMaxTimer      = 1800u; // timers use integers counting us and can't go longer than ~ this many secs
-// NOTE: these times below must be less than kAbsMaxTimer (this is not checked, however)
-static const uint32_t kDefTimeout       = 120u;  // seconds
-static const uint32_t kConnectTimeout   = 120u;  // seconds
-static const uint32_t kListenTimeout    = 120u;  // seconds
-static const uint32_t kConnectSBDTO     = 180u;  // seconds
-static const uint32_t kCommWinLongPrdTk = 300u;  // seconds
-static const uint32_t kSecsPerDay       = 3600u*24u;
-static const uint32_t kSecsPerYear      = kSecsPerDay*365u;
 
 // safety nets
 static const float    kMinForcePer      = 0.05;   // seconds -- safety net for max force trigger rate