Switch to using internal cc1111 temperature sensor

[fw/altos] / ao-tools / ao-view / aoview_state.c

diff --git a/ao-tools/ao-view/aoview_state.c b/ao-tools/ao-view/aoview_state.c
index 21cea99add4451dfb462ac3ea48f23c3568b9a00..505bcddcb1477487735d5f459c76f07a46cf2819 100644 (file)
--- a/ao-tools/ao-view/aoview_state.c
+++ b/ao-tools/ao-view/aoview_state.c
@@ -127,10 +127,10 @@ aoview_state_derive(struct cc_telem *data, struct aostate *state)
        accel_counts_per_mss = ((data->accel_minus_g - data->accel_plus_g) / 2.0) / 9.80665;
        state->acceleration = (data->ground_accel - data->flight_accel) / accel_counts_per_mss;
        state->speed = data->flight_vel / (accel_counts_per_mss * 100.0);
-       state->temperature = ((data->temp / 32767.0 * 3.3) - 0.5) / 0.01;
-       state->drogue_sense = data->drogue / 32767.0 * 15.0;
-       state->main_sense = data->main / 32767.0 * 15.0;
-       state->battery = data->batt / 32767.0 * 5.0;
+       state->temperature = cc_thermometer_to_temperature(data->temp);
+       state->drogue_sense = cc_ignitor_to_voltage(data->drogue);
+       state->main_sense = cc_ignitor_to_voltage(data->main);
+       state->battery = cc_battery_to_voltage(data->batt);
        if (!strcmp(data->state, "pad")) {
                if (data->gps.gps_locked && data->gps.nsat >= 4) {
                        state->npad++;
@@ -342,23 +342,14 @@ aoview_state_notify(struct cc_telem *data)
        }
        if (state->gps.gps_connected) {
                int     nsat_vis = 0;
-               int     nsat_locked = 0;
                int     c;
 
-               for (c = 0; c < state->gps_tracking.channels; c++) {
-                       if ((state->gps_tracking.sats[c].state & 0xff) == 0xbf)
-                               nsat_locked++;
-               }
                aoview_table_add_row(2, "Satellites Visible", "%d", state->gps_tracking.channels);
-               aoview_table_add_row(2, "Satellites Locked", "%d", nsat_locked);
                for (c = 0; c < state->gps_tracking.channels; c++) {
-                       aoview_table_add_row(2, "Satellite id,state,C/N0",
-                                            "%3d,%02x,%2d%s",
+                       aoview_table_add_row(2, "Satellite id,C/N0",
+                                            "%3d,%2d",
                                             state->gps_tracking.sats[c].svid,
-                                            state->gps_tracking.sats[c].state,
-                                            state->gps_tracking.sats[c].c_n0,
-                                            (state->gps_tracking.sats[c].state & 0xff) == 0xbf ?
-                                            " LOCKED" : "");
+                                            state->gps_tracking.sats[c].c_n0);
                }
        }
        aoview_table_finish();