WebSVN - Projects - Diff - Rev 469 and 471 - /C-OSD/trunk/osd_ncmode

  *   You should have received a copy of the GNU General Public License      *
  *   along with this program; if not, write to the                          *
  *   Free Software Foundation, Inc.,                                        *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.              *
  ****************************************************************************/
+if (COSD_FLAGS & COSD_FLAG_HUD) {
-// write icons at init or after menu/mode-switch
+        // write icons at init or after menu/mode-switch
-if (!(COSD_FLAGS & COSD_ICONS_WRITTEN)) {
+        if (!(COSD_FLAGS2 & COSD_ICONS_WRITTEN)) {
-    write_char_xy(5, top_line, 0xCB); // km/h
+            write_char_xy(5, top_line, 0xCB); // km/h
-    write_char_xy(10, top_line, 0xCA); // RC-transmitter
+            write_char_xy(10, top_line, 0xCA); // RC-transmitter
-    write_char_xy(16, top_line, 0xD0); // degree symbol
+            write_char_xy(16, top_line, 0xD0); // degree symbol
-    write_char_xy(27, top_line, 0xCC); // small meters m height
+            write_char_xy(27, top_line, 0xCC); // small meters m height
-    write_char_xy(20, top_line + 1, 0xB0); // left circle
+            write_char_xy(20, top_line + 1, 0xB0); // left circle
-    write_char_xy(22, top_line + 1, 0xB2); // right circle
+            write_char_xy(22, top_line + 1, 0xB2); // right circle
-    write_char_xy(27, top_line + 1, 0xCC); // small meters m home
+            write_char_xy(27, top_line + 1, 0xCC); // small meters m home
-    write_char_xy(7, bottom_line, 0x9E); // small V
+            write_char_xy(7, bottom_line, 0x9E); // small V
-        if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
+                if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
-                write_char_xy(7, bottom_line - 1, 0x9F); // small A
+                        write_char_xy(7, bottom_line - 1, 0x9F); // small A
-                write_char_xy(14, bottom_line - 1, 0xB5); // mah
+                        write_char_xy(14, bottom_line - 1, 0xB5); // mah
+                }
+            write_char_xy(14, bottom_line, 0xD1); // on clock
+            write_char_xy(21, bottom_line, 0xD2); // fly clock
+            write_char_xy(26, bottom_line, 0xC8); // sat1
+            write_char_xy(27, bottom_line, 0xC9); // sat2
+                COSD_FLAGS2 |= COSD_ICONS_WRITTEN;
+        }
-    write_char_xy(14, bottom_line, 0xD1); // on clock
-    write_char_xy(21, bottom_line, 0xD2); // fly clock
-    write_char_xy(26, bottom_line, 0xC8); // sat1
-    write_char_xy(27, bottom_line, 0xC9); // sat2
-        COSD_FLAGS |= COSD_ICONS_WRITTEN;
-}
-// first line
+        // first line
-write_ndigit_number_u(2, top_line, (uint16_t) (((uint32_t) naviData.GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 100, 0);
+        write_ndigit_number_u(2, top_line, (uint16_t) (((uint32_t) naviData.GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 100, 0);
-write_ndigit_number_u(7, top_line, naviData.RC_Quality, 100, 0);
+        write_ndigit_number_u(7, top_line, naviData.RC_Quality, 100, 0);
-if (naviData.RC_Quality <= RCLVL_WRN && last_RC_Quality > RCLVL_WRN) {
+        if (naviData.RC_Quality <= RCLVL_WRN && last_RC_Quality > RCLVL_WRN) {
-    for (uint8_t x = 0; x < 4; x++)
+            for (uint8_t x = 0; x < 4; x++)
-        write_char_att_xy(7 + x, top_line, BLINK);
+                write_char_att_xy(7 + x, top_line, BLINK);
-} else if (naviData.RC_Quality > RCLVL_WRN && last_RC_Quality <= RCLVL_WRN) {
+        } else if (naviData.RC_Quality > RCLVL_WRN && last_RC_Quality <= RCLVL_WRN) {
-    for (uint8_t x = 0; x < 4; x++)
+            for (uint8_t x = 0; x < 4; x++)
-        write_char_att_xy(7 + x, top_line, 0);
+                write_char_att_xy(7 + x, top_line, 0);
-}
+        }
-last_RC_Quality = naviData.RC_Quality;
-if (naviData.NCFlags & NC_FLAG_NOSERIALLINK) {
+        if (naviData.NCFlags & NC_FLAG_NOSERIALLINK) {
-    write_char_xy(11, top_line, 0); // clear
+            write_char_xy(11, top_line, 0); // clear
-} else {
+        } else {
-    write_char_xy(11, top_line, 0xC6); // PC icon
+            write_char_xy(11, top_line, 0xC6); // PC icon
-}
+        }
-write_ndigit_number_u(13, top_line, naviData.CompassHeading, 100, 0);
+        write_ndigit_number_u(13, top_line, naviData.CompassHeading, 100, 0);
-write_ascii_string(17, top_line, directions[heading_conv(naviData.CompassHeading)]);
+        write_ascii_string(17, top_line, directions[heading_conv(naviData.CompassHeading)]);
-draw_variometer(21, top_line, naviData.Variometer);
+        draw_variometer(21, top_line, naviData.Variometer);
-//note:lephisto:according to several sources it's /30
+        //note:lephisto:according to several sources it's /30
-if (naviData.Altimeter > 300 || naviData.Altimeter < -300) {
+        if (naviData.Altimeter > 300 || naviData.Altimeter < -300) {
-    // above 10m only write full meters
+            // above 10m only write full meters
-    write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 1000, 0);
+            write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 1000, 0);
-} else {
+        } else {
-    // up to 10m write meters.dm
+            // up to 10m write meters.dm
-    //write_number_u_10th(21, top_line, naviData.Altimeter / 3);
+            //write_number_u_10th(21, top_line, naviData.Altimeter / 3);
-    write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 100, 0);
+            write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 100, 0);
-}
+        }
-// seccond line
+        // seccond line
-draw_compass(11, top_line + 1, naviData.CompassHeading);
+        draw_compass(11, top_line + 1, naviData.CompassHeading);
-// TODO: verify correctness
+        // TODO: verify correctness
-uint16_t heading_home = (naviData.HomePositionDeviation.Bearing + 360 - naviData.CompassHeading) % 360;
+        uint16_t heading_home = (naviData.HomePositionDeviation.Bearing + 360 - naviData.CompassHeading) % 360;
-//write_char_xy(21, top_line + 1, arrowdir[heading_conv(heading_home)]);
+        //write_char_xy(21, top_line + 1, arrowdir[heading_conv(heading_home)]);
-// finer resolution, 0xa0 is first character and we add the index 0 <= index < 16
+        // finer resolution, 0xa0 is first character and we add the index 0 <= index < 16
-write_char_xy(21, top_line + 1, 0xa0 + heading_fine_conv(heading_home));
+        write_char_xy(21, top_line + 1, 0xa0 + heading_fine_conv(heading_home));
-write_ndigit_number_u(24, top_line + 1, naviData.HomePositionDeviation.Distance / 10, 100, 0);
+        write_ndigit_number_u(24, top_line + 1, naviData.HomePositionDeviation.Distance / 10, 100, 0);
-// center
+        // center
-if (naviData.MKFlags & FLAG_MOTOR_RUN) { // should be engines running
+        if (naviData.MKFlags & FLAG_MOTOR_RUN) { // should be engines running
-    if (!(old_MKFlags & FLAG_MOTOR_RUN)) { // motors just started, clear middle
+            if (!(old_MKFlags & FLAG_MOTOR_RUN)) { // motors just started, clear middle
-        clear();
+                clear();
-        // update flags to paint display again if needed
+                // update flags to paint display again if needed
-        COSD_FLAGS &= ~COSD_ICONS_WRITTEN;
+                COSD_FLAGS2 &= ~COSD_ICONS_WRITTEN;
-    }
+            }
-    if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) {
+            if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) {
-        draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll);
+                draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll);
-    }
+            }
-    // motors are on, assume we were/are flying
+            // motors are on, assume we were/are flying
-    COSD_FLAGS |= COSD_WASFLYING;
+            COSD_FLAGS2 |= COSD_WASFLYING;
-} else {
+        } else {
-    // stats
+            // stats
-    if ((COSD_FLAGS & COSD_WASFLYING) && (COSD_FLAGS & COSD_FLAG_STATS)) {
+            if ((COSD_FLAGS2 & COSD_WASFLYING) && (COSD_FLAGS & COSD_FLAG_STATS)) {
-                uint8_t line = 3;
+                        uint8_t line = 3;
-        write_ascii_string_pgm(2, line, stats_item_pointers[0]); // max Altitude
+                write_ascii_string_pgm(2, line, stats_item_pointers[0]); // max Altitude
-        write_ndigit_number_s(18, line, max_Altimeter / 30, 1000, 0);
+                write_ndigit_number_s(18, line, max_Altimeter / 30, 1000, 0);
-        write_char_xy(22, line, 204); // small meters m
+                write_char_xy(22, line, 204); // small meters m
-        write_ascii_string_pgm(2, ++line, stats_item_pointers[1]); // max Speed
+                write_ascii_string_pgm(2, ++line, stats_item_pointers[1]); // max Speed
-        write_ndigit_number_u(19, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 100, 0);
+                write_ndigit_number_u(19, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 100, 0);
-        write_char_xy(22, line, 203); // km/h
+                write_char_xy(22, line, 203); // km/h
-        write_ascii_string_pgm(2, ++line, stats_item_pointers[2]); // max Distance
+                write_ascii_string_pgm(2, ++line, stats_item_pointers[2]); // max Distance
-        write_ndigit_number_u(19, line, max_Distance / 10, 100, 0);
+                write_ndigit_number_u(19, line, max_Distance / 10, 100, 0);
-        write_char_xy(22, line, 204); // small meters m
+                write_char_xy(22, line, 204); // small meters m
-        write_ascii_string_pgm(2, ++line, stats_item_pointers[3]); // min voltage
+                write_ascii_string_pgm(2, ++line, stats_item_pointers[3]); // min voltage
-        write_ndigit_number_u_10th(18, line, min_UBat, 100, 0);
+                write_ndigit_number_u_10th(18, line, min_UBat, 100, 0);
-        write_char_xy(22, line, 0x9E); // small V
+                write_char_xy(22, line, 0x9E); // small V
-                if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
+                        if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
-                        write_ascii_string_pgm(2, ++line, stats_item_pointers[7]); // ampere
+                                write_ascii_string_pgm(2, ++line, stats_item_pointers[7]); // ampere
-                        write_ndigit_number_u_10th(18, line, max_ampere / 10, 100, 0);
+                                write_ndigit_number_u_10th(18, line, max_ampere / 10, 100, 0);
-                        write_char_xy(22, line, 0x9F); // small A
+                                write_char_xy(22, line, 0x9F); // small A
-                }
+                        }
-        write_ascii_string_pgm(2, ++line, stats_item_pointers[4]); // max time
+                write_ascii_string_pgm(2, ++line, stats_item_pointers[4]); // max time
-        write_time(16, line, max_FlyingTime);
+                write_time(16, line, max_FlyingTime);
-        write_char_xy(22, line, 210); // fly clock
+                write_char_xy(22, line, 210); // fly clock
-        write_ascii_string_pgm(2, ++line, stats_item_pointers[5]); // longitude
+                write_ascii_string_pgm(2, ++line, stats_item_pointers[5]); // longitude
-        write_gps_pos(15, line, naviData.CurrentPosition.Longitude);
+                write_gps_pos(15, line, naviData.CurrentPosition.Longitude);
-        write_ascii_string_pgm(2, ++line, stats_item_pointers[6]); // latitude
+                write_ascii_string_pgm(2, ++line, stats_item_pointers[6]); // latitude
-        write_gps_pos(15, line, naviData.CurrentPosition.Latitude);
+                write_gps_pos(15, line, naviData.CurrentPosition.Latitude);
-    } else if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) { // if no stats there is space horizon
+            } else if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) { // if no stats there is space horizon
-        draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll);
+                draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll);
-    }
+            }
-}
+        }
-if (COSD_FLAGS & COSD_FLAG_BIGVARIO) {
+        if (COSD_FLAGS & COSD_FLAG_BIGVARIO) {
-    draw_big_variometer(27, 8, naviData.Variometer);
+            draw_big_variometer(27, 8, naviData.Variometer);
-}
+        }
-// pre-bottom line
+        // pre-bottom line
-if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
+        if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
-        //write_ndigit_number_s(3, bottom_line - 1, ampere, 1000, 0);
+                //write_ndigit_number_s(3, bottom_line - 1, ampere, 1000, 0);
-        write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 100, 0);
+                write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 100, 0);
-        write_ndigit_number_s(10, bottom_line - 1, ampere_wasted, 1000, 0);
+                write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 1000, 0);
-}
+        }
-// bottom line
-draw_battery(2, bottom_line, min_voltage, naviData.UBat, max_voltage);
-write_ndigit_number_u_10th(3, bottom_line, naviData.UBat, 100, 0);
+        // bottom line
-if (naviData.UBat <= min_voltage && last_UBat > min_voltage) {
+        draw_battery(2, bottom_line, min_voltage, naviData.UBat, max_voltage);
-    for (uint8_t x = 2; x < 8; x++)
+        write_ndigit_number_u_10th(3, bottom_line, naviData.UBat, 100, 0);
-        write_char_att_xy(x, bottom_line, BLINK);
+        if (naviData.UBat <= min_voltage && last_UBat > min_voltage) {
-} else if (naviData.UBat > min_voltage && last_UBat < min_voltage) {
+            for (uint8_t x = 2; x < 8; x++)
-    for (uint8_t x = 2; x < 8; x++)
+                write_char_att_xy(x, bottom_line, BLINK);
-        write_char_att_xy(x, bottom_line, 0);
+        } else if (naviData.UBat > min_voltage && last_UBat < min_voltage) {
-}
+            for (uint8_t x = 2; x < 8; x++)
-// remember last values
+                write_char_att_xy(x, bottom_line, 0);
-last_UBat = naviData.UBat;
+        }
-write_time(8, bottom_line, uptime);
+        write_time(8, bottom_line, uptime);
-write_time(15, bottom_line, naviData.FlyingTime);
+        write_time(15, bottom_line, naviData.FlyingTime);
         write_ndigit_number_u(24, bottom_line, naviData.SatsInUse, 10, 0);
 write_ndigit_number_u(24, bottom_line, naviData.SatsInUse, 10, 0);
         if (naviData.NCFlags & NC_FLAG_MANUAL_CONTROL) {
     if (naviData.UBat < min_UBat) min_UBat = naviData.UBat;
     if (naviData.FlyingTime > max_FlyingTime) max_FlyingTime = naviData.FlyingTime;
         if (ampere > max_ampere) max_ampere = ampere;
+}
+// remember last values
+last_RC_Quality = naviData.RC_Quality;
 last_UBat = naviData.UBat;
 old_MKFlags = naviData.MKFlags;
-seconds_since_last_data = 0;

Subversion Repositories Projects

(root)/C-OSD/trunk/osd_ncmode_default.c - Rev 469 → 471