WebSVN - FlightCtrl - Path Comparison - / Rev 2419 and / Rev 2420

Ignore whitespace Rev 2419 → Rev 2420

 /trunk/hottmenu.c
 ,7 → 80,7
 #define HOTT_KEY_LEFT   8
 #define VARIO_ZERO 30000
-unsigned char NaviData_WaypointIndex = 0, NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0, ToNC_Load_WP_List = 0;
+unsigned char NaviData_WaypointIndex = 0, NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0, ToNC_Load_WP_List = 0, NaviData_MaxWpListIndex = 0;
 unsigned int NaviData_TargetDistance = 0;
 unsigned char MaxBlTemperture = 0;
 ,6 → 332,7
 {
  unsigned char i;
   //Debug("rqst: %02X",packet_request);
  switch(packet_request)
  {
   case HOTT_VARIO_PACKET_ID:
 ,11 → 499,16
 //---------------------------------------------------------------
 void HoTT_Menu(void)
 {
- static unsigned char line, page = 0,show_current = 0,show_mag = 0, show_poti = 0, load_waypoint_tmp, changed, load_waypoint_tmp2, changed2;
+ static unsigned char load_waypoint_tmp2 = 1, changed, load_waypoint_tmp = 1, changed2;
+ static unsigned char line, page = 0,show_current = 0,show_mag = 0, show_poti = 0;
  unsigned char tmp;
  HoTTVarioMeter = (HoTTVarioMeter * 7 + VarioMeter) / 8;
+// if(HottKeyboard) {beeptime = 1000;};
- if(page == 0)
+ switch(page)
+ {
+  case 0:
   switch(line++)
   {
         case 0:
 ,8 → 619,8
    default:  line = 0;
                         break;
   }
-  else
-  if(page == 1)
+  break;
+  case 1:
   switch(line++)
   {
         case 0:
 ,8 → 744,8
    default:  line = 0;
                         break;
   }
-  else
-  if(page == 2)
+  break;
+  case 2:
   switch(line++)
   {
         case 0:
 ,58 → 836,44
    default:  line = 0;
                         break;
   }
-  else
-  if(page == 3)
+  break;
+  case 3:
   switch(line++)
   {
         case 0:
                         HoTT_printfxy(0,0,"Load Waypoints");
+                        HoTT_printfxy(0,1,"(Relative Positions)");
+//                      HoTT_printfxy(0,1,"(Absolute)");
                         break;
-    case 1: //HoTT_printfxy(0,1,"Min:%2i.%1iV %s ",BattLowVoltageWarning/10, BattLowVoltageWarning%10, Mixer.Name);
-                        HoTT_printfxy(0,1,"(Absolute)");
+    case 1:
+                        if(NaviData_WaypointNumber)     HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
+                        else HoTT_printfxy(0,6,"No WPs active     ")
                         break;
     case 2:
-                        if(load_waypoint_tmp)
+                         HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)
+    case 3:
+    case 4:
+    case 5:
+                        if(load_waypoint_tmp2)
                          {
-                          HoTT_printfxy(0,3,"Load list:     ")
-                          if(changed && HoTTBlink) HoTT_printfxy(10,3,"   ", load_waypoint_tmp)
-                          else HoTT_printfxy(10,3,"%2d ", load_waypoint_tmp);
+                          if(changed2 && HoTTBlink) HoTT_printfxy(10,3,"   ")
+                          else HoTT_printfxy(10,3,"%2i   ",load_waypoint_tmp2);
+                          HoTT_printfxy(0,3,"Load list:")
                          }
                         else
                          {
                           HoTT_printfxy(0,3,"Load list: -- ");
                          }
-                        break;
-    case 3:
-                          if(changed && load_waypoint_tmp) HoTT_printfxy(0,4,"(Set -> Load)")
-                          else HoTT_printfxy(0,4,"              ");
-                        break;
-    case 4:
-                        break;
-    case 5:
-                        break;
-        case 6:
-                        if(NaviData_WaypointNumber)     HoTT_printfxy(0,6,"Active: %2d WPs",NaviData_WaypointNumber)
-                        else HoTT_printfxy(0,6,"No WPs active  ")
-                        break;
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-                        if(HottKeyboard == HOTT_KEY_UP && load_waypoint_tmp < 99) { changed = 1; load_waypoint_tmp++;}
-                        else
-                        if(HottKeyboard == HOTT_KEY_DOWN && load_waypoint_tmp) { changed = 1; load_waypoint_tmp--;};
-                        if(HottKeyboard == HOTT_KEY_SET) { if(load_waypoint_tmp) ToNC_Load_WP_List = load_waypoint_tmp; changed = 0;}
-                        else
+                         if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,4,"No SD-Card   ")
+                         else
+                         {
+                          if(changed2 && load_waypoint_tmp2) HoTT_printfxy(0,4,"(Set -> Load)")
+                          else HoTT_printfxy(0,4,"             ");
+                         }
+                        if(HottKeyboard == HOTT_KEY_UP && load_waypoint_tmp2 < NaviData_MaxWpListIndex) { changed2 = 1; load_waypoint_tmp2++;HoTTBlink = 0;}
+                        if(HottKeyboard == HOTT_KEY_DOWN && load_waypoint_tmp2 > 1) { changed2 = 1; load_waypoint_tmp2--;HoTTBlink = 0;};
+                        if(HottKeyboard == HOTT_KEY_SET) { if(load_waypoint_tmp2) ToNC_Load_WP_List = load_waypoint_tmp2 | 128; changed2 = 0;}
                         if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page = 4; line = 0;}
-                        else
                         if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page = 2; line = 0;};
                         HottKeyboard = 0;
                         break;
 ,58 → 880,45
    default:  line = 0;
                         break;
   }
-    else
-  if(page == 4)
+  break;
+  case 4:
   switch(line++)
   {
         case 0:
                         HoTT_printfxy(0,0,"Load Waypoints");
+                        HoTT_printfxy(0,1,"(Fixed Positions)");
                         break;
-    case 1: //HoTT_printfxy(0,1,"Min:%2i.%1iV %s ",BattLowVoltageWarning/10, BattLowVoltageWarning%10, Mixer.Name);
-                        HoTT_printfxy(0,1,"(Relative)");
+    case 1:
+                        if(NaviData_WaypointNumber)     HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
+                        else HoTT_printfxy(0,6,"No WPs active    ")
                         break;
     case 2:
-                        if(load_waypoint_tmp2)
+                         HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)
+    case 3:
+    case 4:
+    case 5:
+                  if(HottKeyboard) DebugOut.Analog[17]++;
+                        if(load_waypoint_tmp)
                          {
-                          HoTT_printfxy(0,3,"Load list:     ")
-                          if(changed && HoTTBlink) HoTT_printfxy(10,3,"   ", load_waypoint_tmp2)
-                          else HoTT_printfxy(10,3,"%2d ", load_waypoint_tmp2);
+                          if(changed && HoTTBlink) HoTT_printfxy(10,3,"   ")
+                          else HoTT_printfxy(10,3,"%2d (FIX)",load_waypoint_tmp);
+                          HoTT_printfxy(0,3,"Load list:")
                          }
                         else
                          {
                           HoTT_printfxy(0,3,"Load list: -- ");
                          }
-                        break;
-    case 3:
-                          if(changed2 && load_waypoint_tmp2) HoTT_printfxy(0,4,"(Set -> Load)")
-                          else HoTT_printfxy(0,4,"             ");
-                        break;
-    case 4:
-                        break;
-    case 5:
-                        break;
-        case 6:
-                        if(NaviData_WaypointNumber)     HoTT_printfxy(0,6,"Active: %2d WPs",NaviData_WaypointNumber)
-                        else HoTT_printfxy(0,6,"No WPs active  ")
-                        break;
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-                        if(HottKeyboard == HOTT_KEY_UP && load_waypoint_tmp2 < 99) { changed2 = 1; load_waypoint_tmp2++;}
-                        else
-                        if(HottKeyboard == HOTT_KEY_DOWN && load_waypoint_tmp2) { changed2 = 1; load_waypoint_tmp2--;};
-                        if(HottKeyboard == HOTT_KEY_SET) { if(load_waypoint_tmp2) ToNC_Load_WP_List = load_waypoint_tmp2 | 128; changed2 = 0;}
-//                      else
-//                      if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page = 5; line = 0;}
-                        else
+                         if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,4,"No SD-Card   ")
+                         else
+                         {
+                                if(changed && load_waypoint_tmp) HoTT_printfxy(0,4,"(Set -> Load)")
+                                else HoTT_printfxy(0,4,"             ");
+                         }
+                        if(HottKeyboard == HOTT_KEY_UP && load_waypoint_tmp < NaviData_MaxWpListIndex) { changed = 1; load_waypoint_tmp++; HoTTBlink = 0;}
+                        if(HottKeyboard == HOTT_KEY_DOWN && load_waypoint_tmp > 1) { changed = 1; load_waypoint_tmp--; HoTTBlink = 0;};
+                        if(HottKeyboard == HOTT_KEY_SET) { if(load_waypoint_tmp) ToNC_Load_WP_List = load_waypoint_tmp; changed = 0;}
+//                      if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page = 4; line = 0;}
                         if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page = 3; line = 0;};
                         HottKeyboard = 0;
                         break;
 ,35 → 925,10
    default:  line = 0;
                         break;
   }
-/*  else
-  if(page == 3)
-  switch(line++)
-  {
-        case 0:
-                        HoTT_printfxy(0,2,"Speak:");
-                        break;
-        case 1:
-//                      if(GetParamByte(PID_SPEAK_HOTT_CFG) & 0x01)
-                        if(!(GlobalConfig3 & CFG3_SPEAK_ALL) & 0x01)) HoTT_printfxy_INV(7,2,"All Messages ")
-                        else                    HoTT_printfxy_INV(7,2,"Warnings only");
-                        break;
-        case 2:
-                        HoTT_printfxy(1,4,"Use (set) to select");
-                        break;
-    default:
-                        if(HottKeyboard == HOTT_KEY_SET)
-                         {
-                          SetParamByte(PID_SPEAK_HOTT_CFG, GetParamByte(PID_SPEAK_HOTT_CFG) ^ 0x01);
-                         }
-                        else
-                        if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page = 2; line = 0;};
-                        HottKeyboard = 0;
-                        line = 0;
-                        break;
-  }
-*/
-  else page = 0;
+  break;
+  default:  page = 0;
+  break;
+ }
 }
 #endif

 /trunk/hottmenu.h
 ,7 → 43,7
 #define MAX_ERR_NUMBER (34+1)
 extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17];
-extern unsigned char NaviData_WaypointIndex, NaviData_WaypointNumber, NaviData_TargetHoldTime,ToNC_Load_WP_List;
+extern unsigned char NaviData_WaypointIndex, NaviData_WaypointNumber, NaviData_TargetHoldTime,ToNC_Load_WP_List,NaviData_MaxWpListIndex;
 extern unsigned int NaviData_TargetDistance;
 extern unsigned char MaxBlTemperture;
 extern unsigned char MinBlTemperture;

 /trunk/jetimenu.c
 ,7 → 161,7
 {                       //0123456789ABCDEF
 #if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
         JetiBox_printfxy(0,0,"Load Waypoints");
-        JetiBox_printfxy(0,1,"(Absolute)   ");
+        JetiBox_printfxy(0,1,"(Fixed)      ");
 #endif
 }
 ,18 → 176,21
 void Menu_WPL_A2(uint8_t key)
 {                       //0123456789ABCDEF
 #if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
-static unsigned char load_waypoint_tmp, changed;
+static unsigned char load_waypoint_tmp = 1, changed;
-        JetiBox_printfxy(0,0,"Abs. Waypoints");
-        JetiBox_printfxy(0,1,"#%2d   WPs:",load_waypoint_tmp);
-        if(NaviData_WaypointNumber)     JetiBox_printfxy(10,1,"%2d",NaviData_WaypointNumber)
-        else JetiBox_printfxy(10,1,"--")
+  JetiBox_printfxy(0,0,"FIX Waypoints");
+  if(NaviData_MaxWpListIndex == 0) JetiBox_printfxy(0,1,"no SD-Card")
+  else
+  {
+        JetiBox_printfxy(0,1,"#%2d WP:",load_waypoint_tmp);
+        if(NaviData_WaypointNumber)     JetiBox_printfxy(8,1,"%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
+        else JetiBox_printfxy(8,1,"--/--")
     if(changed)         JetiBox_printfxy(14,1,"->")
         else            JetiBox_printfxy(14,1,"  ");
-        if(key == JETIBOX_KEY_UP && load_waypoint_tmp < 99) { load_waypoint_tmp++; changed = 1;}
-        if(key == JETIBOX_KEY_DOWN && load_waypoint_tmp) { load_waypoint_tmp--; changed = 1; }
+        if(key == JETIBOX_KEY_UP && load_waypoint_tmp < NaviData_MaxWpListIndex) { load_waypoint_tmp++; changed = 1;}
+        if(key == JETIBOX_KEY_DOWN && load_waypoint_tmp > 1) { load_waypoint_tmp--; changed = 1; }
         if(key == JETIBOX_KEY_RIGHT && load_waypoint_tmp)
         {
 ,6 → 197,7
          ToNC_Load_WP_List = load_waypoint_tmp;
          changed = 0;
         }
+  }
 #endif
 }
 ,18 → 204,21
 void Menu_WPL_R2(uint8_t key)
 {                       //0123456789ABCDEF
 #if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
-static unsigned char load_waypoint_tmp, changed;
+static unsigned char load_waypoint_tmp = 1, changed;
-        JetiBox_printfxy(0,0,"Rel. Waypoints");
-        JetiBox_printfxy(0,1,"#%2d   WPs:",load_waypoint_tmp);
-        if(NaviData_WaypointNumber)     JetiBox_printfxy(10,1,"%2d",NaviData_WaypointNumber)
-        else JetiBox_printfxy(10,1,"--")
+  JetiBox_printfxy(0,0,"Rel. Waypoints");
+  if(NaviData_MaxWpListIndex == 0) JetiBox_printfxy(0,1,"no SD-Card")
+  else
+  {
+        JetiBox_printfxy(0,1,"#%2d WPs:",load_waypoint_tmp);
+        if(NaviData_WaypointNumber)     JetiBox_printfxy(8,1,"%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
+        else JetiBox_printfxy(8,1,"--/--")
     if(changed)         JetiBox_printfxy(14,1,"->")
         else            JetiBox_printfxy(14,1,"  ");
-        if(key == JETIBOX_KEY_UP && load_waypoint_tmp < 99) { load_waypoint_tmp++; changed = 1;}
-        if(key == JETIBOX_KEY_DOWN && load_waypoint_tmp) { load_waypoint_tmp--; changed = 1; }
+        if(key == JETIBOX_KEY_UP && load_waypoint_tmp < NaviData_MaxWpListIndex) { load_waypoint_tmp++; changed = 1;}
+        if(key == JETIBOX_KEY_DOWN && load_waypoint_tmp > 1) { load_waypoint_tmp--; changed = 1; }
         if(key == JETIBOX_KEY_RIGHT && load_waypoint_tmp)
         {
 ,6 → 225,7
          ToNC_Load_WP_List = load_waypoint_tmp | 0x80;
          changed = 0;
         }
+  }
 #endif
 }
 ,9 → 278,7
 // the menu navigation structure
 /*                                              |
 - 0 - 1 - 2 - 3 - 0
 */
 const MENU_ENTRY JetiBox_Menu[] PROGMEM=
 ,8 → 288,8
         {0, 2, 1, 1, &Menu_Temperature },       // 1
         {1, 3, 2, 2, &Menu_Battery },   // 2
         {2, 4, 3, 3, &Menu_PosInfo },   // 3
-        {3, 5, 4, 7, &Menu_WPL_A1 },    // 4
-        {4, 6, 5, 8, &Menu_WPL_R1 },    // 5
+        {3, 5, 7, 7, &Menu_WPL_A1 },    // 4
+        {4, 6, 8, 8, &Menu_WPL_R1 },    // 5
         {5, 0, 6, 6, &Magnet_Values },  // 6
         {4, 7, 7, 7, &Menu_WPL_A2 },    // 7

/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/spi.c
372,6 → 372,7
NaviData_WaypointNumber = FromNaviCtrl.Param.Byte[5];
NaviData_TargetDistance = FromNaviCtrl.Param.Int[3];
NaviData_TargetHoldTime = FromNaviCtrl.Param.Byte[8];
NaviData_MaxWpListIndex = FromNaviCtrl.Param.Byte[9];
#endif
break;

 /trunk/version.txt
 ,8 → 681,9
  - Redundant operation supported
  - Bugfix Compass-Calibration: At the second comdass calibration, the Calibration started in step 2 and not in step 1
  - Loading menu by HoTT and Jeti added
+.03g
+ - loading relative points

Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2419 → Rev 2420