Permalink
Browse files

Test to figure out where the short report error is coming from

  • Loading branch information...
Zuph committed Apr 9, 2011
1 parent fdeef6b commit b3901d19dbd8bcdaf07837faa2d0eda931dadaa1
Showing with 8 additions and 4 deletions.
  1. +4 −1 WSB Flight Computer.layout
  2. +4 −3 main.c
@@ -13,6 +13,9 @@
<File name="lib/bmp085.c" open="0" top="0" tabpos="0">
<Cursor position="1753" topLine="28" />
</File>
+ <File name="lib/ds3231.c" open="1" top="0" tabpos="7">
+ <Cursor position="2578" topLine="77" />
+ </File>
<File name="lib/i2c.c" open="1" top="0" tabpos="4">
<Cursor position="7648" topLine="293" />
</File>
@@ -23,7 +26,7 @@
<Cursor position="3346" topLine="107" />
</File>
<File name="main.c" open="1" top="1" tabpos="1">
- <Cursor position="10460" topLine="358" />
+ <Cursor position="16251" topLine="532" />
</File>
<File name="parsing/epoch.c" open="1" top="0" tabpos="2">
<Cursor position="1326" topLine="43" />
View
7 main.c
@@ -1717,20 +1717,20 @@ void flightPhaseLogic(uint32_t time)
myPhase = 2;
}
#ifdef FCPUDEBUG
- lprintf_P(PSTR("Phase 3: FALLING OUT OF SKY\n"));
+ lprintf_P(PSTR("Phase 3: FALLING\n"));
#endif
scheduleQueueAdd(&flightPhaseLogic, time+1);
break;
case 4:
//reset HF and Sat Sample and Transmit Intervals to 1 hour
scheduleQueueAdd(&flightPhaseLogic, time+3600);
#ifdef FCPUDEBUG
- lprintf_P(PSTR("Phase 4: Landed\n"));
+ lprintf_P(PSTR("Phase 4: Land\n"));
#endif
break;
default:
#ifdef FCPUDEBUG
- lprintf_P(PSTR("ERROR!\n"));
+ lprintf_P(PSTR("ERR!\n"));
#endif
break;
}
@@ -1790,6 +1790,7 @@ inline uint32_t now(void)
_delay_ms(50);
error = getTime(&seconds, &minutes, &hours, &days);
}
+ lprintf("Now: %lu\n", getEpochSeconds(seconds, minutes, hours, days));
return getEpochSeconds(seconds, minutes, hours, days);
}

0 comments on commit b3901d1

Please sign in to comment.