Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2437 → Rev 2438

/trunk/hottmenu.c
58,6 → 58,7
 
unsigned char NaviData_WaypointIndex = 0;
unsigned char NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0, ToNC_Load_WP_List = 0, NaviData_MaxWpListIndex = 0;
unsigned char ToNC_Load_SingePoint = 0, ToNC_Store_SingePoint = 0;
char WPL_Name[10];// = {" \0"};
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
 
506,7 → 507,6
//---------------------------------------------------------------
void HoTT_Menu(void)
{
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;
847,6 → 847,7
case 3:
switch(line++)
{
static unsigned char load_waypoint_tmp2 = 1, changed2;
case 0:
HoTT_printfxy(0,0,"Load Waypoints");
HoTT_printfxy(0,1,"(Relative Positions)");
895,6 → 896,7
case 4:
switch(line++)
{
static unsigned char load_waypoint_tmp = 1, changed;
case 0:
HoTT_printfxy(0,0,"Load Waypoints");
HoTT_printfxy(0,1,"(Fixed Positions)");
909,16 → 911,15
case 3:
case 4:
case 5:
if(HottKeyboard) DebugOut.Analog[17]++;
HoTT_printfxy(0,3,"Load list:")
if(load_waypoint_tmp)
{
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: -- ");
HoTT_printfxy(10,3," --")
}
if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,4,"No SD-Card ")
930,8 → 931,8
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;};
if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page++; line = 0;}
if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page--; line = 0;};
HottKeyboard = 0;
break;
default: line = 0;
938,6 → 939,108
break;
}
break;
case 5:
switch(line++)
{
static unsigned char wp_tmp, changed;
case 0:
HoTT_printfxy(0,0,"Store single Position");
// HoTT_printfxy(0,1,"(Fixed Positions)");
break;
case 1:
HoTT_printfxy(0,2," %2i.%1iV ",UBat/10, UBat%10)
HoTT_printfxy(0,3," %2i:%02i ",FlugSekunden/60,FlugSekunden%60);
// HoTT_printfxy(0,4,"Dist:%3dm",NaviData_TargetDistance)
break;
case 2:
HoTT_printfxy(11,2,"ALT:%4im", (int16_t)(HoehenWert/100))
HoTT_printfxy(11,3,"DIR: %3d%c",CompassCorrected, HoTT_GRAD);
HoTT_printfxy(11,4,"Cam: %3i",Parameter_ServoNickControl);
break;
case 3:
case 4:
case 5:
HoTT_printfxy(0,6,"Store point:")
if(wp_tmp)
{
if(changed && HoTTBlink) HoTT_printfxy(13,6," ")
else HoTT_printfxy(13,6,"%2d ",wp_tmp);
}
else
{
HoTT_printfxy(13,6," --")
}
if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,7,"No SD-Card ")
else
{
if(changed && wp_tmp) HoTT_printfxy(0,7,"(Set -> Store)")
else Hott_ClearLine(7);
}
if(HottKeyboard == HOTT_KEY_UP && wp_tmp < NaviData_MaxWpListIndex) { changed = 1; wp_tmp++; HoTTBlink = 0;}
if(HottKeyboard == HOTT_KEY_DOWN && wp_tmp > 1) { changed = 1; wp_tmp--; HoTTBlink = 0;};
if(HottKeyboard == HOTT_KEY_SET) { if(wp_tmp) ToNC_Store_SingePoint = wp_tmp; changed = 0;}
if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page++; line = 0;}
if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page--; line = 0;};
HottKeyboard = 0;
break;
default: line = 0;
break;
}
break;
case 6:
switch(line++)
{
static unsigned char wp_tmp, changed;
case 0:
HoTT_printfxy(0,0,"Load single Position");
// HoTT_printfxy(0,1,"(Fixed Positions)");
break;
case 1:
HoTT_printfxy(0,2," %2i.%1iV ",UBat/10, UBat%10)
HoTT_printfxy(0,3," %2i:%02i ",FlugSekunden/60,FlugSekunden%60);
// HoTT_printfxy(0,4,"Dist:%3dm",NaviData_TargetDistance)
if(NaviData_WaypointNumber) HoTT_printfxy(0,5,"Active WP:%2d/%d %dm ",NaviData_WaypointIndex,NaviData_WaypointNumber,NaviData_TargetDistance)
else Hott_ClearLine(5);
break;
case 2:
HoTT_printfxy(11,2,"ALT:%4im", (int16_t)(HoehenWert/100))
HoTT_printfxy(11,3,"DIR: %3d%c",CompassCorrected, HoTT_GRAD);
HoTT_printfxy(11,4,"Cam: %3i",Parameter_ServoNickControl);
break;
// HoTT_printfxy(11,7,"%s",WPL_Name)
case 3:
case 4:
case 5:
if(HottKeyboard) DebugOut.Analog[17]++;
HoTT_printfxy(0,6,"load point:")
if(wp_tmp)
{
if(changed && HoTTBlink) HoTT_printfxy(11,6," ")
else HoTT_printfxy(11,6,"%2d",wp_tmp);
}
else
{
HoTT_printfxy(11,6," --")
}
if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,7,"No SD-Card ")
else
{
if(changed && wp_tmp) HoTT_printfxy(0,7,"(Set -> Load)")
else Hott_ClearLine(7);
}
if(HottKeyboard == HOTT_KEY_UP && wp_tmp < NaviData_MaxWpListIndex) { changed = 1; wp_tmp++; HoTTBlink = 0;}
if(HottKeyboard == HOTT_KEY_DOWN && wp_tmp > 1) { changed = 1; wp_tmp--; HoTTBlink = 0;};
if(HottKeyboard == HOTT_KEY_SET) { if(wp_tmp) ToNC_Load_SingePoint = wp_tmp; changed = 0;}
// if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page++; line = 0;}
if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page--; line = 0;};
HottKeyboard = 0;
break;
default: line = 0;
break;
}
break;
default: page = 0;
break;
}
/trunk/hottmenu.h
3,6 → 3,8
 
extern unsigned char NaviData_WaypointIndex;
extern unsigned char NaviData_WaypointNumber, NaviData_TargetHoldTime,ToNC_Load_WP_List,NaviData_MaxWpListIndex;
extern unsigned char ToNC_Load_SingePoint, ToNC_Store_SingePoint;
 
extern char WPL_Name[10];
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
 
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/makefile
6,10 → 6,10
#-------------------------------------------------------------------
VERSION_MAJOR = 2
VERSION_MINOR = 04
VERSION_PATCH = 2
VERSION_PATCH = 4
VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change!
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 61 # Navi-Kompatibilität
NC_SPI_COMPATIBLE = 62 # Navi-Kompatibilität
LIB_FC_COMPATIBLE = 6 # Library
#-------------------------------------------------------------------
# ATMEGA644: 63487 is maximum
/trunk/sbus.c
166,7 → 166,7
if(SenderOkay < 200) SenderOkay += 20; else SenderOkay = 200;
}
signal = sBusBuffer[1];
if(!load--) { process = (12*11 - 8); load = 2;} else process = (4*11 - 8); // lowers the processor load
if(!load--) { process = (16*11 - 8); load = 2;} else process = (4*11 - 8); // lowers the processor load
for(i = 0; i < process; i++) // collect the single bits
{
if(sBusBuffer[sbyte] & bitmask8) signal |= bitmask11;
195,5 → 195,5
}
NewSBusData = 0;
}
#endif
 
#endif
/trunk/spi.c
222,7 → 222,11
ToNaviCtrl.Param.Byte[3] = EE_Parameter.ComingHomeAltitude;
ToNaviCtrl.Param.Byte[4] = LowVoltageHomeActive;
ToNaviCtrl.Param.Byte[5] = ToNC_Load_WP_List;
ToNaviCtrl.Param.Byte[6] = ToNC_Load_SingePoint;
ToNaviCtrl.Param.Byte[7] = ToNC_Store_SingePoint;
ToNC_Load_WP_List = 0;
ToNC_Load_SingePoint = 0;
ToNC_Store_SingePoint = 0;
break;
case SPI_FCCMD_STICK:
cli();
258,7 → 262,6
ToNaviCtrl.Param.Byte[7] = EE_Parameter.NaviGpsILimit;
ToNaviCtrl.Param.Byte[8] = EE_Parameter.NaviGpsDLimit;
ToNaviCtrl.Param.Byte[9] = (unsigned char) SenderOkay;
// ToNaviCtrl.Param.Byte[10] = (unsigned char) PPM_in[0]; // ACT RSSI
ToNaviCtrl.Param.Byte[10] = NC_Wait_for_LED;
ToNaviCtrl.Param.Byte[11] = DebugOut.Analog[7] / 4; //GasMischanteil
break;
/trunk/version.txt
686,13 → 686,18
2.04b
- Bugfix: Poti Values were wrong after calibration
- Redundant Slave: LED-Binking: Green: UART Data & Red:I2C error
- CompassCorrected in HoTT- und Jeti-Display
- CompassCorrected (True-Compass) in HoTT- and Jeti-Display
- "True Compass" in virtual menu
- Jeti: Indicator "R" for redundancy
2.04c
- S.Bus auf 16 Kanäle erweitert
 
 
ToDo: Höhenauslösung