imuboard: allow to log on stdout even if sdcard is enabled

diff --git a/imuboard/gps_venus.c b/imuboard/gps_venus.c
index 2aa8f8386e8a46d6eb4aed9fc2a263664d90d592..fbb657840691386d4458a4f08f54e67326daa14c 100644 (file)
--- a/imuboard/gps_venus.c
+++ b/imuboard/gps_venus.c
@@ -617,7 +617,7 @@ void gps_get_pos(struct gps_pos *pos)
        memcpy(pos, &gps_pos, sizeof(*pos));
 }
 
-int gps_log(void)
+int gps_log(uint8_t to_stdout)
 {
        uint32_t ms;
        uint8_t flags, prio;
@@ -646,13 +646,13 @@ int gps_log(void)
                (double)gps_pos.sea_altitude / 100.);
 
 
-       if (sd_log_enabled()) {
+       if (!to_stdout && sd_log_enabled()) {
                if (sd_log_write(buf, len) != len) {
                        printf_P(PSTR("error writing to file\n"));
                        return -1;
                }
        }
-       else {
+       else if (to_stdout) {
                printf_P(PSTR("%s"), buf);
        }
 

diff --git a/imuboard/gps_venus.h b/imuboard/gps_venus.h
index 7970088b52f8d5c7032a775594de73455b7d30bf..7397cbc773205349713e027dd2119e5ee065d6cc 100644 (file)
--- a/imuboard/gps_venus.h
+++ b/imuboard/gps_venus.h
@@ -38,7 +38,9 @@ struct gps_pos {
 } __attribute__ ((packed));
 
 int gps_venus_init(void);
-int gps_log(void);
+
+/* log gps position stdout (if stdout is 1) or on sdcard (if 0) */
+int gps_log(uint8_t to_stdout);
 
 /* does not lock intr, must be done by user */
 void gps_get_pos(struct gps_pos *pos);

diff --git a/imuboard/imu.c b/imuboard/imu.c
index c113e1cfbfb1f3f36b733087cfafeecfbad416fe..14f8479ac5959a5dc67b7235bb5e8d783c1b1dae 100644 (file)
--- a/imuboard/imu.c
+++ b/imuboard/imu.c
@@ -99,7 +99,8 @@ void imu_get_pos_euler(struct euler *euler)
 }
 
 
-int imu_log(void)
+
+int imu_log(uint8_t to_stdout)
 {
        char buf[128];
        int16_t len;
@@ -124,9 +125,14 @@ int imu_log(void)
                imu.gx, imu.gy, imu.gz,
                imu.ax, imu.ay, imu.az,
                imu.mx, imu.my, imu.mz);
-       if (sd_log_write(buf, len) != len) {
-               printf_P(PSTR("error writing to file\n"));
-               return -1;
+       if (!to_stdout && sd_log_enabled()) {
+               if (sd_log_write(buf, len) != len) {
+                       printf_P(PSTR("error writing to file\n"));
+                       return -1;
+               }
+       }
+       else if (to_stdout) {
+               printf_P(PSTR("%s"), buf);
        }
 
        return 0;

diff --git a/imuboard/imu.h b/imuboard/imu.h
index 06c03a148cbbb658eaf7b5b18d572ff7ff5bcbb3..06755c9aee35e762f89d46f92f9166b8c043bdfe 100644 (file)
--- a/imuboard/imu.h
+++ b/imuboard/imu.h
@@ -65,8 +65,8 @@ struct euler {
 /* initialize the IMU */
 void imu_init(void);
 
-/* if sd log file is opened, log the status of IMU on the sdcard */
-int imu_log(void);
+/* log imu status on stdout (if stdout is 1) or on sdcard (if 0) */
+int imu_log(uint8_t to_stdout);
 
 /* return a filled imu_info structure corresponding to the latest axes read in
  * the timer callback. Does not lock irq, so it's up to the user to do that. */

diff --git a/imuboard/main.c b/imuboard/main.c
index bee118f543787c4c0c0eaea2b3063b6b09d5d473..37be46cdf6b72b1a654e4333f58a784300be7805 100644 (file)
--- a/imuboard/main.c
+++ b/imuboard/main.c
@@ -140,9 +140,6 @@ static void main_timer_interrupt(void)
                LED2_OFF();
 }
 
-/* XXX */
-int sd_main(void);
-
 int main(void)
 {
        DDRB = 0x18 /* LEDs */;
@@ -182,15 +179,14 @@ int main(void)
        printf_P(PSTR("\r\n"));
        rdline_newline(&imuboard.rdl, imuboard.prompt);
 
-       //sd_main();
        imu_init();
        gps_venus_init();
 
        imuboard.flags |= IMUBOARD_F_BOOT_OK;
 
        while (1) {
-               //imu_log();
-               //gps_log();
+               imu_log(0);
+               gps_log(0);
                cmdline_poll();
        }