WebSVN - NaviCtrl - Diff - Rev 482 and 483

 #include "91x_lib.h"
 #include "main.h"
 #include "config.h"
 #include "menu.h"
 #include "GPS.h"
+#include "i2c0.h"
-#include "i2c.h"
+#include "i2c1.h"
 #include "uart0.h"
 #include "uart1.h"
 #include "uart2.h"
 #include "timer1.h"
 #include "timer2.h"
         UART_InitStructure.UART_StopBits =                              UART_StopBits_1;
         UART_InitStructure.UART_Parity =                                UART_Parity_No ;
         UART_InitStructure.UART_BaudRate =                              UART1_BAUD_RATE;
-        UART_InitStructure. UART_HardwareFlowControl =  UART_HardwareFlowControl_None;
+        UART_InitStructure.UART_HardwareFlowControl =   UART_HardwareFlowControl_None;
         UART_InitStructure.UART_Mode =                                  UART_Mode_Tx_Rx;
-        UART_InitStructure.UART_FIFO =                                  UART_FIFO_Enable;
+//      UART_InitStructure.UART_FIFO =                                  UART_FIFO_Enable;
-        UART_InitStructure.UART_TxFIFOLevel =                   UART_FIFOLevel_1_2;
+        UART_InitStructure.UART_FIFO =                                  UART_FIFO_Disable;
-        UART_InitStructure.UART_RxFIFOLevel =                   UART_FIFOLevel_1_2;
+//      UART_InitStructure.UART_TxFIFOLevel =                   UART_FIFOLevel_1_2;
+        UART_InitStructure.UART_TxFIFOLevel =                   UART_FIFOLevel_1_8; // FIFO size 16 bytes, FIFO level 2 bytes
+        UART_InitStructure.UART_RxFIFOLevel =                   UART_FIFOLevel_1_2; // FIFO size 16 bytes, FIFO level 8 bytes
         UART_DeInit(UART1); // reset uart 1     to default
         UART_Init(UART1, &UART_InitStructure); // initialize uart 1
         // enable uart 1 interrupts selective
 /**************************************************************/
 void UART1_Transmit(void)
+{
         u8 tmp_tx;
         if(DebugUART != UART1) return;
+        if(I2C0_State != I2C_STATE_IDLE)   return;
         // if something has to be send and the txd fifo is not full
         if(UART1_tx_buffer.Locked == TRUE)
+        {
                 // while there is some space in the tx fifo
                 while(UART_GetFlagStatus(UART1, UART_FLAG_TxFIFOFull) != SET)
 //$GPGGA,191410,4735.5634,N,00739.3538,E,1,04,4.4,351.5,M,48.0,M,,*45
 //$GPGGA,092120.20,,,,,0,00,99.99,,,,,,*6C
 //http://www.kowoma.de/gps/zusatzerklaerungen/NMEA.htm
 void CreateNmeaGGA(void)
+{
-        u8 array[200], i = 0, crc = 0, x;
+ unsigned char array[200], i = 0, crc = 0, x;
-        s32 tmp1, tmp2;
+ long tmp1, tmp2;
-        i += sprintf(array, "$GPGGA,");
+ i += sprintf(array, "$GPGGA,");
-        // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-        if(SystemTime.Valid)
+ if(SystemTime.Valid)
+  {
-                i += sprintf(&array[i], "%02d%02d%02d.%02d,", SystemTime.Hour, SystemTime.Min, SystemTime.Sec, SystemTime.mSec/10);
+   i += sprintf(&array[i], "%02d%02d%02d.%02d,",SystemTime.Hour,SystemTime.Min,SystemTime.Sec,SystemTime.mSec/10);
+  }
-        // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-        if(GPSData.Flags & FLAG_GPSFIXOK)
+ if(GPSData.Flags & FLAG_GPSFIXOK)
+ {
-                tmp1 = abs(GPSData.Position.Latitude)/10000000L;
+  tmp1 = abs(GPSData.Position.Latitude)/10000000L;
-                i += sprintf(&array[i],"%02d",(s16)tmp1);
+  i += sprintf(&array[i],"%02d",(int)tmp1);
-                tmp1 = abs(GPSData.Position.Latitude)%10000000L;
+  tmp1 = abs(GPSData.Position.Latitude)%10000000L;
-                tmp1 *= 6; // in Minuten
+  tmp1 *= 6; // in Minuten
-                tmp2 = tmp1 / 1000000L;
+  tmp2 = tmp1 / 1000000L;
-                i += sprintf(&array[i],"%02d", (s16)tmp2);
+  i += sprintf(&array[i],"%02d",(int)tmp2);
-                tmp2 = tmp1 % 1000000L;
+  tmp2 = tmp1 % 1000000L;
-                tmp2 /= 10; // eine Stelle zu viel
+  tmp2 /= 10; // eine Stelle zu viel
-                i += sprintf(&array[i],".%05d,", (s16)tmp2);
+  i += sprintf(&array[i],".%05d,",(int)tmp2);
-                if(GPSData.Position.Latitude >= 0) i += sprintf(&array[i],"N,");
+  if(GPSData.Position.Latitude >= 0) i += sprintf(&array[i],"N,");
-                else i += sprintf(&array[i],"S,");
+  else i += sprintf(&array[i],"S,");
-                // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-                tmp1 = abs(GPSData.Position.Longitude)/10000000L;
+  tmp1 = abs(GPSData.Position.Longitude)/10000000L;
-                i += sprintf(&array[i],"%03d", (s16)tmp1);
+  i += sprintf(&array[i],"%03d",(int)tmp1);
-                tmp1 = abs(GPSData.Position.Longitude)%10000000L;
+  tmp1 = abs(GPSData.Position.Longitude)%10000000L;
-                tmp1 *= 6; // in Minuten
+  tmp1 *= 6; // in Minuten
-                tmp2 = tmp1 / 1000000L;
+  tmp2 = tmp1 / 1000000L;
-                i += sprintf(&array[i],"%02d", (s16)tmp2);
+  i += sprintf(&array[i],"%02d",(int)tmp2);
-                tmp2 = tmp1 % 1000000L;
+  tmp2 = tmp1 % 1000000L;
-                tmp2 /= 10; // eine Stelle zu viel
+  tmp2 /= 10; // eine Stelle zu viel
-                i += sprintf(&array[i],".%05d,", (s16)tmp2);
+  i += sprintf(&array[i],".%05d,",(int)tmp2);
-                if(GPSData.Position.Longitude >= 0) i += sprintf(&array[i],"E,");
+  if(GPSData.Position.Longitude >= 0) i += sprintf(&array[i],"E,");
-                else i += sprintf(&array[i],"W,");
+  else i += sprintf(&array[i],"W,");
-                i += sprintf(&array[i],"%d,",GPSData.SatFix);
+  i += sprintf(&array[i],"%d,",GPSData.SatFix);
-                i += sprintf(&array[i],"%d,",GPSData.NumOfSats);
+  i += sprintf(&array[i],"%d,",GPSData.NumOfSats);
-                i += sprintf(&array[i],"%d.%d,",(s16)(GPSData.Position_Accuracy/100),abs(GPSData.Position_Accuracy%100));
+  i += sprintf(&array[i],"%d.%d,",GPSData.Position_Accuracy/100,abs(GPSData.Position_Accuracy%100));
-                //  i += sprintf(&array[i],"%d.%d,M,",GPSData.Position.Altitude/1000,abs(GPSData.Position.Altitude%1000)/100);
+//  i += sprintf(&array[i],"%d.%d,M,",GPSData.Position.Altitude/1000,abs(GPSData.Position.Altitude%1000)/100);
-                tmp1 = NaviData.Altimeter / 2; // in dm
+ tmp1 = NaviData.Altimeter / 2; // in dm
 //$GPRMC,162614.123,A,5230.5900,N,01322.3900,E,10.0,90.0,131006,1.2,E,A*13
 //$GPRMC,HHMMSS.sss,A,BBBB.BBBB,b,LLLLL.LLLL,l,GG.G,RR.R,DDMMYY,M.M,m,F*PP
 void CreateNmeaRMC(void)
 {
-        u8 array[200], i = 0, crc = 0, x;
+ unsigned char array[200], i = 0, crc = 0, x;
-        s16 tmp_int;
+ int tmp_int;
-        s32 tmp1, tmp2;
+ long tmp1, tmp2;
-        // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-        i += sprintf(array, "$GPRMC,");
+ i += sprintf(array, "$GPRMC,");
-        // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-        if(SystemTime.Valid)
+ if(SystemTime.Valid)
+  }
-        if(GPSData.Flags & FLAG_GPSFIXOK)
+ if(GPSData.Flags & FLAG_GPSFIXOK)
+ {
-                // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-                tmp1 = abs(GPSData.Position.Latitude)/10000000L;
+  tmp1 = abs(GPSData.Position.Latitude)/10000000L;
-                i += sprintf(&array[i],"A,%02d", (s16)tmp1); // Status: A = Okay  V = Warnung
+  i += sprintf(&array[i],"A,%02d",(int)tmp1); // Status: A = Okay  V = Warnung
-                tmp1 = abs(GPSData.Position.Latitude)%10000000L;
+  tmp1 = abs(GPSData.Position.Latitude)%10000000L;
-                tmp1 *= 6; // in Minuten
+  tmp1 *= 6; // in Minuten
-                tmp2 = tmp1 / 1000000L;
+  tmp2 = tmp1 / 1000000L;
-                i += sprintf(&array[i],"%02d", (s16)tmp2);
+  i += sprintf(&array[i],"%02d",(int)tmp2);
-                tmp2 = tmp1 % 1000000L;
+  tmp2 = tmp1 % 1000000L;
-                tmp2 /= 10; // eine Stelle zu viel
+  tmp2 /= 10; // eine Stelle zu viel
-                i += sprintf(&array[i],".%05d,", (s16)tmp2);
+  i += sprintf(&array[i],".%05d,",(int)tmp2);
-                if(GPSData.Position.Latitude >= 0) i += sprintf(&array[i],"N,");
+  if(GPSData.Position.Latitude >= 0) i += sprintf(&array[i],"N,");
-                else i += sprintf(&array[i],"S,");
+  else i += sprintf(&array[i],"S,");
-                // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++
-                tmp1 = abs(GPSData.Position.Longitude)/10000000L;
+  tmp1 = abs(GPSData.Position.Longitude)/10000000L;
-                i += sprintf(&array[i],"%03d", (s16)tmp1);
+  i += sprintf(&array[i],"%03d",(int)tmp1);
-                tmp1 = abs(GPSData.Position.Longitude)%10000000L;
+  tmp1 = abs(GPSData.Position.Longitude)%10000000L;
-                tmp1 *= 6; // in Minuten
+  tmp1 *= 6; // in Minuten
-                tmp2 = tmp1 / 1000000L;
+  tmp2 = tmp1 / 1000000L;
-                i += sprintf(&array[i],"%02d", (s16)tmp2);
+  i += sprintf(&array[i],"%02d",(int)tmp2);
-                tmp2 = tmp1 % 1000000L;
+  tmp2 = tmp1 % 1000000L;
-                tmp2 /= 10; // eine Stelle zu viel
+  tmp2 /= 10; // eine Stelle zu viel
-                i += sprintf(&array[i],".%05d,", (s16)tmp2);
+  i += sprintf(&array[i],".%05d,",(int)tmp2);
-                if(GPSData.Position.Longitude >= 0) i += sprintf(&array[i],"E,");
+  if(GPSData.Position.Longitude >= 0) i += sprintf(&array[i],"E,");
-                else i += sprintf(&array[i],"W,");
+  else i += sprintf(&array[i],"W,");
-                // +++++++++++++++++++++++++++++++++++++++++++
+// +++++++++++++++++++++++++++++++++++++++++++

Subversion Repositories NaviCtrl

(root)/tags/V2.20f/uart1.c @ 870 - Rev 482 → 483