Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 687 → Rev 688

/trunk/main.c
81,6 → 81,7
#include "ssc.h"
#include "sdc.h"
#include "uart1.h"
#include "canbus.h"
 
 
#ifdef FOLLOW_ME
456,6 → 457,7
Compass_Update(); // update compass communication
Analog_Update(); // get new ADC values
CalcHeadFree();
if(UART_VersionInfo.HWMajor >= 30) ProcessCanBus();
if(!CheckDelay(SPI0_Timeout)) TimeoutGPS_Process = 0;
else if(CountMilliseconds - SPI0_Timeout > 30000000L) SPI0_Timeout = CountMilliseconds; // avoid too long overflows
if(++TimeoutGPS_Process >= 25)
635,6 → 637,9
 
CompassValueErrorCount = 0;
I2CBus(Compass_I2CPort)->Timeout = SetDelay(3000);
 
// Intilizes the Canbus
if(UART_VersionInfo.HWMajor >= 30) CanbusInit();
// ++++++++++++++++++++++++++++++++++++++++++++++
for (;;) // the endless main loop
{
/trunk/main.h
13,7 → 13,7
//-----------------------
 
#define VERSION_MAJOR 2
#define VERSION_MINOR 12
#define VERSION_MINOR 13
#define VERSION_PATCH 0
// 0 = A
// 1 = B
36,7 → 36,7
// 18 = S
 
#ifndef FOLLOW_ME
#define FC_SPI_COMPATIBLE 76 // <------------------
#define FC_SPI_COMPATIBLE 77 // <------------------
#else
#define FC_SPI_COMPATIBLE 0xFF
#endif
/trunk/menu.c
76,7 → 76,7
 
 
u8 MenuItem = 0;
u8 MaxMenuItem = 27;
u8 MaxMenuItem = 28;
 
void Menu_Putchar(char c)
{
351,23 → 351,22
i1 = abs(FromFlightCtrl.AngleRoll)/10;
i2 = abs(FromFlightCtrl.AngleRoll)%10;
LCD_printfxy(0,1,"GyroRoll:%c%03ld.%01ld", sign, i1, i2);
if(FromFlightCtrl.AccNick < 0) sign = '-';
if(FromFlightCtrl_AccNick < 0) sign = '-';
else sign = '+';
i1 = abs(FromFlightCtrl.AccNick)/10;
i2 = abs(FromFlightCtrl.AccNick)%10;
i1 = abs(FromFlightCtrl_AccNick)/10;
i2 = abs(FromFlightCtrl_AccNick)%10;
LCD_printfxy(0,2," AccNick:%c%03ld.%01ld", sign, i1, i2);
if(FromFlightCtrl.AccRoll < 0) sign = '-';
if(FromFlightCtrl_AccRoll < 0) sign = '-';
else sign = '+';
i1 = abs(FromFlightCtrl.AccRoll)/10;
i2 = abs(FromFlightCtrl.AccRoll)%10;
i1 = abs(FromFlightCtrl_AccRoll)/10;
i2 = abs(FromFlightCtrl_AccRoll)%10;
LCD_printfxy(0,3," AccRoll:%c%03ld.%01ld", sign, i1, i2);
break;
case 14: // gyros from FC
LCD_printfxy(0,0,"GyroNick: %4i", FromFlightCtrl.GyroNick);
LCD_printfxy(0,1,"GyroRoll: %4i", FromFlightCtrl.GyroRoll);
LCD_printfxy(0,2,"GyroYaw: %4i", FromFlightCtrl.GyroYaw);
if(FC_is_Calibrated) LCD_printfxy(0,3,"Calibrated ")
else LCD_printfxy(0,3,"not calibrated");
case 14:
LCD_printfxy(0,0,"Analog inputs");
LCD_printfxy(0,1,"A5:%3i ",AnalogData.Ch5);
LCD_printfxy(0,2,"A6:%3i ",AnalogData.Ch6);
LCD_printfxy(0,3,"A7:%3i ",AnalogData.Ch7);
break;
case 15:
LCD_printfxy(0,0,"Compass: %3i", FromFlightCtrl.GyroHeading / 10);
580,6 → 579,20
LCD_printfxy(0,3,"A6:%3i A7:%3i",AnalogData.Ch6,AnalogData.Ch7);
break;
*/
 
case 28:
// LCD_printfxy(0,0,"PPM Input");
/*
LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[1],PPM_In[2],PPM_In[3],PPM_In[4]);
LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[5],PPM_In[6],PPM_In[7],PPM_In[8]);
LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[9],PPM_In[10],PPM_In[11],PPM_In[12]);
LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[13],PPM_In[14],PPM_In[15],PPM_In[16]);
*/
LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[17],PPM_In[18],PPM_In[19],PPM_In[20]);
LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[21],PPM_In[22],PPM_In[23],PPM_In[24]);
LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[25],PPM_In[26],PPM_In[27],PPM_In[28]);
LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[29],PPM_In[30],PPM_In[31],PPM_In[32]);
break;
default:
//MaxMenuItem = MenuItem - 1;
MenuItem = 0;