| /trunk/hottmenu.c |
|---|
| 645,10 → 645,13 |
| if(!GPSPacket.WarnBeep) GPSPacket.m_sec = BuildHoTT_Vario(); else GPSPacket.m_sec = VARIO_ZERO; |
| GPSPacket.m_3sec = 120; |
| GPSPacket.NumOfSats = GPSInfo.NumOfSats; |
| if(GPSInfo.Flags & FLAG_DIFFSOLN) GPSPacket.SatFix = 'D'; |
| else |
| if(GPSInfo.SatFix == SATFIX_3D) GPSPacket.SatFix = ' '; |
| else GPSPacket.SatFix = '!'; |
| if(GPSPacket.SatFix != '!' && NMEA_In_Fix_Character) GPSPacket.SatFix = NMEA_In_Fix_Character; // external GPS via NMEA |
| HoTT_DataPointer = (unsigned char *) &GPSPacket; |
| GPSPacket.FreeCharacters[0] = NC_GPS_ModeCharacter; |
| GPSPacket.FreeCharacters[1] = CamCtrlCharacter; |
| /trunk/led.c |
|---|
| 59,14 → 59,14 |
| { |
| if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK1) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;} |
| else |
| if((unsigned char) PPM_in[WP_EVENT_PPM_IN] + 127 == 255) { NC_Wait_for_LED = 0; if(J16Bitmask & 128) J16_OFF; else J16_ON; J16Mask = 0; } // Ausschalten |
| else |
| if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_OFF; else J16_ON; J16Mask = 1; NC_Wait_for_LED = 0;} // Manual overwrite |
| else |
| if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing == 5)) {if(J16Bitmask & 128) J16_ON; else J16_OFF; J16Mask = 1; NC_Wait_for_LED = 0;} // Manual overwrite |
| else |
| if((unsigned char) PPM_in[WP_EVENT_PPM_IN] + 127 == 255) { NC_Wait_for_LED = 0; if(J16Bitmask & 128) J16_OFF; else J16_ON; J16Mask = 0; } // 255 = DauerEin |
| else |
| if(!J16Blinkcount--) |
| { |
| if(EE_Parameter.GlobalConfig3 & CFG3_USE_NC_FOR_OUT1) |
| /trunk/libfc1284.a |
|---|
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| /trunk/menu.c |
|---|
| 97,7 → 97,7 |
| case 0: |
| if(OEM_String[0] == 255) {LCD_printfxy(0,0,"+ MikroKopter +");} else {LCD_printfxy(0,0,"+ %s +",OEM_String)}; |
| LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%02d%c ",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH +'a'); |
| LCD_printfxy(0,2,"Set:%d %s", ActiveParamSet,Mixer.Name); |
| LCD_printfxy(0,2,"Set:%d %s ", ActiveParamSet,Mixer.Name); |
| if(FC_StatusFlags3 & FC_STATUS3_BOAT) LCD_printfxy(16,2,"BOAT"); |
| if(VersionInfo.HardwareError[1] & FC_ERROR1_MIXER) LCD_printfxy(0,3,"Mixer Error!") |
| /trunk/spi.c |
|---|
| 49,6 → 49,7 |
| unsigned int FromNC_Laser_cm; |
| unsigned int TrigLogging_CountExternal = 0; |
| unsigned char FromNcBaudrateIndex = 8; |
| unsigned char NMEA_In_Fix_Character = 0; |
| #ifdef USE_SPI_COMMUNICATION |
| 577,7 → 578,7 |
| EarthMagneticField = FromNaviCtrl.Param.Byte[0]; |
| EarthMagneticInclination = FromNaviCtrl.Param.Byte[1]; |
| EarthMagneticInclinationTheoretic = FromNaviCtrl.Param.Byte[2]; |
| //FromNaviCtrl.Param.Byte[3]; |
| NMEA_In_Fix_Character = FromNaviCtrl.Param.Byte[3]; |
| //FromNaviCtrl.Param.Byte[4]; |
| //FromNaviCtrl.Param.Byte[5]; |
| NaviData_TargetDistance = FromNaviCtrl.Param.Int[3]; |
| /trunk/spi.h |
|---|
| 255,6 → 255,7 |
| extern unsigned int TrigLogging_CountExternal; |
| extern unsigned char FromNcBaudrateIndex; |
| extern unsigned char GPS_TimeHours, GPS_TimeMinutes, GPS_TimeSeconds; |
| extern unsigned char NMEA_In_Fix_Character; |
| #else |
| /trunk/version.txt |
|---|
| 916,7 → 916,8 |
| 2.21a (28.03.2018) |
| - WAYPOINT-EVENT = 255 -> Cameratrigger continously ON (or OFF -> Depends on the IDLE-Bit) |
| - GPS-Fix Character from NEMA in HoTT-LCD |
| toDo: |
| - CalAthmospheare nachführen |