Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Revision 110:d1da040a0cf2, committed 2015-11-24
- Comitter:
- uci1
- Date:
- Tue Nov 24 21:52:27 2015 +0000
- Parent:
- 109:c3fe52b2e46f
- Child:
- 111:e6f9802fd0e1
- Commit message:
- Stn32 (slow) with conf name. SD stall fix. No interface chip. Safety nets.
Changed in this revision
SnConfigFrame.cpp | Show annotated file Show diff for this revision Revisions of this file |
SnConstants.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/SnConfigFrame.cpp Mon Nov 23 23:00:02 2015 +0000 +++ b/SnConfigFrame.cpp Tue Nov 24 21:52:27 2015 +0000 @@ -55,7 +55,7 @@ } void SnConfigFrame::SetHardDefaults() { - sprintf(fLabel,"Stn19DefaultR109"); + sprintf(fLabel,"Stn32slowDefaultR110"); fConfTime = 1338854400u; // Tue, 05 Jun 2012 00:00:00 GMT fRun = 0; fFirstSeq = 0;
--- a/SnConstants.h Mon Nov 23 23:00:02 2015 +0000 +++ b/SnConstants.h Tue Nov 24 21:52:27 2015 +0000 @@ -21,11 +21,11 @@ //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF0, 0xC6, 0x1A}; // STN 10 (ATWD MB 8) 0002F7F0C61A //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x0A, 0x9C}; // STN 14 (SST 104) 0002F7F20A9C //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x02, 0xC1}; // STN 17 (SST 109) 0002F7F202C1 -static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x24, 0x44}; // STN 19 (SST 105) 0002F7F22444 +//static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x24, 0x44}; // STN 19 (SST 105) 0002F7F22444 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF7, 0xA8}; // STN 15 (SST 110) 0002F7F1F7A8 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x24, 0x4B}; // STN 13 (SST 102) 0002F7F2244B //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF6, 0x34}; // STN 31 (SST 107) 0002F7F1F634 -//static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF2, 0x1A}; // STN 32 (SST 112) 0002F7F1F21A +static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF2, 0x1A}; // STN 32 (SST 112) 0002F7F1F21A (slow) //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF2, 0x12}; // STN 30 (SST 113) 0002F7F1F212 // if these change, it is likely that some i/o version (config, event, etc) will need to change