WebSVN - FlightCtrl - Diff - Rev 2681 and 2692



const char PROGMEM LANDING[] =      {" !!   LANDING    !!  "};
const char PROGMEM SIMULATION[] =       {"  SIMULATION active  "};
const char PROGMEM BOAT_MODE[] =        {"     Boat Mode       "};
const char PROGMEM STORE[] =            {" Store Position SP1  "};
const char PROGMEM LOAD[] =             {" Load Position SP1   "};
const char PROGMEM FLYZONE[] =          {" Flyzone:   points   "};
const char PROGMEM SETTING[] =  {"Set  :"};

 
const char PROGMEM CALIBRATE_TEXT[6][21] =
{

 "Canbus Error    \0",  // 39
 "5V RC-Supply    \0",  // 40
 "Power-Supply    \0",  // 41
 "ACC not calibr. \0",  // 42
 "Parachute!      \0",  // 43
 "Outside Flyzone \0",  // 44
 "No Flyzone      \0",  // 45
 };

 
 

         {SPEAK_ERR_GPS,0},             // "GPS Update Rate",           // 38
         {SPEAK_ERR_DATABUS,0}, // "Canbus Error!                       // 39    
         {SPEAK_RECEIV_VOLT,0}, // "5V Supply"                          // 40    
         {SPEAK_UNDERVOLTAGE,0},// "Power Supply"                       // 41    
         {SPEAK_ERR_SENSOR,0},  // "ACC not calibr. ",          // 42
         {SPEAK_MK_OFF,0},              // "Parachute",                         // 43
         {SPEAK_MAX_RANGE,0},   // "Outside Area",              // 44
         {SPEAK_ERROR,0}                // "No Flyzone",                        // 45
};

 
/*
//------------------------------------------------------------------------------------------

      VarioPacket.Text[16] = '0'+(tmp) / 10;
      VarioPacket.Text[17] = '0'+(tmp) % 10;
      VarioPacket.Text[18] = 's';
      VarioPacket.Text[19] = ' ';
      VarioPacket.Text[20] = ' ';
          if(FlyzonePointCnt >= 3) VarioPacket.Text[20] = 'F';
         }
         else if(FlyzonePointCnt)
         {
          for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&FLYZONE[i]);
      if(FlyzonePointCnt >=10) VarioPacket.Text[9] = '0'+(FlyzonePointCnt) / 10;
      VarioPacket.Text[10] = '0'+(FlyzonePointCnt) % 10;
         }
         else
         if(NC_To_FC_Flags & NC_TO_FC_SIMULATION_ACTIVE)
         {
          for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&SIMULATION[i]);

                        break;
    case 7: //HoTT_printfxy(0,6,"WARNINGS:");
                        if(HoTTBlink)
                        {
                         LIBFC_HoTT_SetPos(6 * 21);
 
                         if(EE_Parameter.BitConfig & (CFG_LOOP_LINKS | CFG_LOOP_RECHTS | CFG_LOOP_UNTEN | CFG_LOOP_OBEN)) HoTT_printf_BLINK("LOOPING! ");
                         if(Parameter_GlobalConfig & CFG_HEADING_HOLD) HoTT_printf_BLINK("HH! ");
                         if(!(Parameter_GlobalConfig & CFG_KOMPASS_AKTIV)) HoTT_printf_BLINK("COMPASS OFF! ");
                        }
                        break;

                        HoTT_printfxy(0,0,"Load Waypoints");
                        HoTT_printfxy(0,1,"(Relative Positions)");
//                      HoTT_printfxy(0,1,"(Absolute)"); 
                        break;
    case 1:
                        if(FlyzonePointCnt)     HoTT_printfxy(0,5,"Flyzone:%2d points",FlyzonePointCnt) else Hott_ClearLine(5);
                        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:
                         HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)

        case 0:  
                        HoTT_printfxy(0,0,"Load Waypoints");
                        HoTT_printfxy(0,1,"(Fixed Positions)");
                        break;
    case 1:
                        if(FlyzonePointCnt)     HoTT_printfxy(0,5,"Flyzone:%2d points",FlyzonePointCnt) else Hott_ClearLine(5);
                        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:
                         HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)

Rev 2681	Rev 2692
Line 104...	Line 104...
104	const char PROGMEM LANDING[] = {" !! LANDING !! "};	104	const char PROGMEM LANDING[] = {" !! LANDING !! "};
105	const char PROGMEM SIMULATION[] = {" SIMULATION active "};	105	const char PROGMEM SIMULATION[] = {" SIMULATION active "};
106	const char PROGMEM BOAT_MODE[] = {" Boat Mode "};	106	const char PROGMEM BOAT_MODE[] = {" Boat Mode "};
107	const char PROGMEM STORE[] = {" Store Position SP1 "};	107	const char PROGMEM STORE[] = {" Store Position SP1 "};
108	const char PROGMEM LOAD[] = {" Load Position SP1 "};	108	const char PROGMEM LOAD[] = {" Load Position SP1 "};
-		109	const char PROGMEM FLYZONE[] = {" Flyzone: points "};
109	const char PROGMEM SETTING[] = {"Set :"};	110	const char PROGMEM SETTING[] = {"Set :"};
Line 110...	Line 111...
110		111
111	const char PROGMEM CALIBRATE_TEXT[6][21] =	112	const char PROGMEM CALIBRATE_TEXT[6][21] =
112	{	113	{
Line 164...	Line 165...
164	"Canbus Error \0", // 39	165	"Canbus Error \0", // 39
165	"5V RC-Supply \0", // 40	166	"5V RC-Supply \0", // 40
166	"Power-Supply \0", // 41	167	"Power-Supply \0", // 41
167	"ACC not calibr. \0", // 42	168	"ACC not calibr. \0", // 42
168	"Parachute! \0", // 43	169	"Parachute! \0", // 43
-		170	"Outside Flyzone \0", // 44
-		171	"No Flyzone \0", // 45
169	};	172	};
Line 170...	Line 173...
170		173
171		174
Line 213...	Line 216...
213	{SPEAK_ERR_GPS,0}, // "GPS Update Rate", // 38	216	{SPEAK_ERR_GPS,0}, // "GPS Update Rate", // 38
214	{SPEAK_ERR_DATABUS,0}, // "Canbus Error! // 39	217	{SPEAK_ERR_DATABUS,0}, // "Canbus Error! // 39
215	{SPEAK_RECEIV_VOLT,0}, // "5V Supply" // 40	218	{SPEAK_RECEIV_VOLT,0}, // "5V Supply" // 40
216	{SPEAK_UNDERVOLTAGE,0},// "Power Supply" // 41	219	{SPEAK_UNDERVOLTAGE,0},// "Power Supply" // 41
217	{SPEAK_ERR_SENSOR,0}, // "ACC not calibr. ", // 42	220	{SPEAK_ERR_SENSOR,0}, // "ACC not calibr. ", // 42
218	{SPEAK_MK_OFF,0}, // "Parachute", // 43	221	{SPEAK_MK_OFF,0}, // "Parachute", // 43
-		222	{SPEAK_MAX_RANGE,0}, // "Outside Area", // 44
-		223	{SPEAK_ERROR,0} // "No Flyzone", // 45
219	};	224	};
Line 220...	Line 225...
220		225
221	/*	226	/*
222	//------------------------------------------------------------------------------------------	227	//------------------------------------------------------------------------------------------
Line 544...	Line 549...
544	VarioPacket.Text[16] = '0'+(tmp) / 10;	549	VarioPacket.Text[16] = '0'+(tmp) / 10;
545	VarioPacket.Text[17] = '0'+(tmp) % 10;	550	VarioPacket.Text[17] = '0'+(tmp) % 10;
546	VarioPacket.Text[18] = 's';	551	VarioPacket.Text[18] = 's';
547	VarioPacket.Text[19] = ' ';	552	VarioPacket.Text[19] = ' ';
548	VarioPacket.Text[20] = ' ';	553	VarioPacket.Text[20] = ' ';
-		554	if(FlyzonePointCnt >= 3) VarioPacket.Text[20] = 'F';
-		555	}
-		556	else if(FlyzonePointCnt)
-		557	{
-		558	for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&FLYZONE[i]);
-		559	if(FlyzonePointCnt >=10) VarioPacket.Text[9] = '0'+(FlyzonePointCnt) / 10;
-		560	VarioPacket.Text[10] = '0'+(FlyzonePointCnt) % 10;
549	}	561	}
550	else	562	else
551	if(NC_To_FC_Flags & NC_TO_FC_SIMULATION_ACTIVE)	563	if(NC_To_FC_Flags & NC_TO_FC_SIMULATION_ACTIVE)
552	{	564	{
553	for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&SIMULATION[i]);	565	for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&SIMULATION[i]);
Line 984...	Line 996...
984	break;	996	break;
985	case 7: //HoTT_printfxy(0,6,"WARNINGS:");	997	case 7: //HoTT_printfxy(0,6,"WARNINGS:");
986	if(HoTTBlink)	998	if(HoTTBlink)
987	{	999	{
988	LIBFC_HoTT_SetPos(6 * 21);	1000	LIBFC_HoTT_SetPos(6 * 21);
989	// if(!(Parameter_GlobalConfig & CFG_ACHSENKOPPLUNG_AKTIV)) HoTT_printf_BLINK("COUPLING OFF! ");	-
990	if(EE_Parameter.BitConfig & (CFG_LOOP_LINKS \| CFG_LOOP_RECHTS \| CFG_LOOP_UNTEN \| CFG_LOOP_OBEN)) HoTT_printf_BLINK("LOOPING! ");	1001	if(EE_Parameter.BitConfig & (CFG_LOOP_LINKS \| CFG_LOOP_RECHTS \| CFG_LOOP_UNTEN \| CFG_LOOP_OBEN)) HoTT_printf_BLINK("LOOPING! ");
991	if(Parameter_GlobalConfig & CFG_HEADING_HOLD) HoTT_printf_BLINK("HH! ");	1002	if(Parameter_GlobalConfig & CFG_HEADING_HOLD) HoTT_printf_BLINK("HH! ");
992	if(!(Parameter_GlobalConfig & CFG_KOMPASS_AKTIV)) HoTT_printf_BLINK("COMPASS OFF! ");	1003	if(!(Parameter_GlobalConfig & CFG_KOMPASS_AKTIV)) HoTT_printf_BLINK("COMPASS OFF! ");
993	}	1004	}
994	break;	1005	break;
Line 1021...	Line 1032...
1021	HoTT_printfxy(0,0,"Load Waypoints");	1032	HoTT_printfxy(0,0,"Load Waypoints");
1022	HoTT_printfxy(0,1,"(Relative Positions)");	1033	HoTT_printfxy(0,1,"(Relative Positions)");
1023	// HoTT_printfxy(0,1,"(Absolute)");	1034	// HoTT_printfxy(0,1,"(Absolute)");
1024	break;	1035	break;
1025	case 1:	1036	case 1:
-		1037	if(FlyzonePointCnt) HoTT_printfxy(0,5,"Flyzone:%2d points",FlyzonePointCnt) else Hott_ClearLine(5);
1026	if(NaviData_WaypointNumber) HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)	1038	if(NaviData_WaypointNumber) HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
1027	else HoTT_printfxy(0,6,"No WPs active ")	1039	else HoTT_printfxy(0,6,"No WPs active ")
1028	break;	1040	break;
1029	case 2:	1041	case 2:
1030	HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)	1042	HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)
Line 1069...	Line 1081...
1069	case 0:	1081	case 0:
1070	HoTT_printfxy(0,0,"Load Waypoints");	1082	HoTT_printfxy(0,0,"Load Waypoints");
1071	HoTT_printfxy(0,1,"(Fixed Positions)");	1083	HoTT_printfxy(0,1,"(Fixed Positions)");
1072	break;	1084	break;
1073	case 1:	1085	case 1:
-		1086	if(FlyzonePointCnt) HoTT_printfxy(0,5,"Flyzone:%2d points",FlyzonePointCnt) else Hott_ClearLine(5);
1074	if(NaviData_WaypointNumber) HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)	1087	if(NaviData_WaypointNumber) HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
1075	else HoTT_printfxy(0,6,"No WPs active ")	1088	else HoTT_printfxy(0,6,"No WPs active ")
1076	break;	1089	break;
1077	case 2:	1090	case 2:
1078	HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)	1091	HoTT_printfxy(0,7,"%2i.%1iV ",UBat/10, UBat%10)

Subversion Repositories FlightCtrl

(root)/tags/V2.18a/hottmenu.c @ 2718 - Rev 2681 → 2692