Browse Source

ArduCopter: Support for OLED display by Alexey Kozin

mission-4.1.18
Dmitry Prokhorov 8 years ago committed by Lucas De Marchi
parent
commit
3e993f955e
  1. 2
      ArduCopter/GCS_Mavlink.cpp
  2. 2
      ArduCopter/flight_mode.cpp
  3. 1
      ArduCopter/sensors.cpp

2
ArduCopter/GCS_Mavlink.cpp

@ -2072,6 +2072,7 @@ void Copter::gcs_check_input(void) @@ -2072,6 +2072,7 @@ void Copter::gcs_check_input(void)
void Copter::gcs_send_text(MAV_SEVERITY severity, const char *str)
{
GCS_MAVLINK::send_statustext(severity, 0xFF, str);
notify.send_text(str);
}
/*
@ -2087,6 +2088,7 @@ void Copter::gcs_send_text_fmt(MAV_SEVERITY severity, const char *fmt, ...) @@ -2087,6 +2088,7 @@ void Copter::gcs_send_text_fmt(MAV_SEVERITY severity, const char *fmt, ...)
va_end(arg_list);
hal.util->vsnprintf((char *)str, sizeof(str), fmt, arg_list);
GCS_MAVLINK::send_statustext(severity, 0xFF, str);
notify.send_text(str);
}
/*

2
ArduCopter/flight_mode.cpp

@ -344,6 +344,8 @@ bool Copter::mode_allows_arming(control_mode_t mode, bool arming_from_gcs) @@ -344,6 +344,8 @@ bool Copter::mode_allows_arming(control_mode_t mode, bool arming_from_gcs)
// notify_flight_mode - sets notify object based on flight mode. Only used for OreoLED notify device
void Copter::notify_flight_mode(control_mode_t mode)
{
AP_Notify::flags.flight_mode = mode; //for on-board oled display
switch (mode) {
case AUTO:
case GUIDED:

1
ArduCopter/sensors.cpp

@ -166,6 +166,7 @@ void Copter::read_battery(void) @@ -166,6 +166,7 @@ void Copter::read_battery(void)
// update motors with voltage and current
if (battery.get_type() != AP_BattMonitor::BattMonitor_TYPE_NONE) {
motors->set_voltage(battery.voltage());
AP_Notify::flags.battery_voltage = battery.voltage(); //for on-board oled display
}
if (battery.has_current()) {
motors->set_current(battery.current_amps());

Loading…
Cancel
Save