WebSVN - FlightCtrl - Path Comparison - / Rev 1443 and / Rev 1444

Ignore whitespace Rev 1443 → Rev 1444

/trunk/printf_P.c
File deleted

/trunk/flight.pnproj
1,0 → 0,0
<Project name="Flight-Ctrl"><File path="uart.h"></File><File path="jeti.h"></File><File path="main.c"></File><File path="main.h"></File><File path="makefile"></File><File path="uart.c"></File><File path="printf_P.h"></File><File path="printf_P.c"></File><File path="timer0.c"></File><File path="timer0.h"></File><File path="old_macros.h"></File><File path="twimaster.c"></File><File path="version.txt"></File><File path="twimaster.h"></File><File path="rc.c"></File><File path="rc.h"></File><File path="fc.h"></File><File path="menu.h"></File><File path="menu.c"></File><File path="_Settings.h"></File><File path="analog.c"></File><File path="analog.h"></File><File path="GPS.c"></File><File path="gps.h"></File><File path="License.txt"></File><File path="eeprom.c"></File><File path="spi.h"></File><File path="spi.c"></File><File path="led.h"></File><File path="led.c"></File><File path="fc.c"></File><File path="mymath.c"></File><File path="mymath.h"></File><File path="isqrt.S"></File><File path="Spektrum.c"></File><File path="Spektrum.h"></File></Project>
<Project name="Flight-Ctrl"><File path="uart.h"></File><File path="jeti.h"></File><File path="main.c"></File><File path="main.h"></File><File path="makefile"></File><File path="uart.c"></File><File path="printf_P.h"></File><File path="timer0.c"></File><File path="timer0.h"></File><File path="old_macros.h"></File><File path="twimaster.c"></File><File path="version.txt"></File><File path="twimaster.h"></File><File path="rc.c"></File><File path="rc.h"></File><File path="fc.h"></File><File path="menu.h"></File><File path="menu.c"></File><File path="_Settings.h"></File><File path="analog.c"></File><File path="analog.h"></File><File path="GPS.c"></File><File path="gps.h"></File><File path="License.txt"></File><File path="eeprom.c"></File><File path="spi.h"></File><File path="spi.c"></File><File path="led.h"></File><File path="led.c"></File><File path="fc.c"></File><File path="mymath.c"></File><File path="mymath.h"></File><File path="isqrt.S"></File><File path="Spektrum.c"></File><File path="Spektrum.h"></File></Project>

/trunk/libfc.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /trunk/main.c
 ,6 → 57,9
 unsigned char SendVersionToNavi = 1;
 unsigned char BattLowVoltageWarning = 94;
 unsigned int FlugMinuten = 0,FlugMinutenGesamt = 0;
+pVoidFnct_pVoidFnctChar_const_fmt _printf_P;
 // -- Parametersatz aus EEPROM lesen ---
 // number [1..5]
 void ReadParameterSet(unsigned char number, unsigned char *buffer, unsigned char length)
 ,7 → 191,7
         StickGier = 0; PPM_in[K_GAS] = 0;StickRoll = 0; StickNick = 0;
     if(PlatinenVersion >= 20)  GIER_GRAD_FAKTOR = 1160; else GIER_GRAD_FAKTOR = 1291; // unterschiedlich für ME und ENC
     ROT_OFF;
     Timer_Init();
         TIMER2_Init();
         UART_Init();
 ,7 → 200,6
         i2c_init();
         SPI_MasterInit();
         LIBFC_Init();
         GRN_ON;
     sei();
 ,6 → 365,7
     LipoDetection(1);
         LIBFC_ReceiverInit();
         printf("\n\r===================================\n\r");
 //SpektrumBinding();
     timer = SetDelay(2000);

 /trunk/makefile
 ,7 → 106,7
 ##########################################################################################################
 # List C source files here. (C dependencies are automatically generated.)
-SRC = main.c uart.c printf_P.c timer0.c  analog.c menu.c
+SRC = main.c uart.c timer0.c analog.c menu.c
 SRC += twimaster.c rc.c fc.c GPS.c spi.c led.c Spektrum.c
 SRC += mymath.c
 ,11 → 136,7
 #  -Wall...:  warning level
 #  -Wa,...:   tell GCC to pass this to the assembler.
 #    -ahlms:  create assembler listing
-CFLAGS = -O$(OPT) \
--funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums \
--Wall -Wstrict-prototypes \
--Wa,-adhlns=$(<:.c=.lst) \
-$(patsubst %,-I%,$(EXTRAINCDIRS))
+CFLAGS = -O$(OPT) -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -Wall -Wstrict-prototypes -Wa,-adhlns=$(<:%.c=%.lst) $(patsubst %,-I%,$(EXTRAINCDIRS))
 # Set a "language standard" compiler flag.
 ,7 → 147,7
 #CFLAGS += -std=c99
 CFLAGS += -std=gnu99
-CFLAGS += -DF_CPU=$(F_CPU) -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_PATCH=$(VERSION_PATCH) -DVERSION_SERIAL_MAJOR=$(VERSION_SERIAL_MAJOR)  -DVERSION_SERIAL_MINOR=$(VERSION_SERIAL_MINOR) -DNC_SPI_COMPATIBLE=$(NC_SPI_COMPATIBLE)
+CFLAGS += -DF_CPU=$(F_CPU) -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_PATCH=$(VERSION_PATCH) -DVERSION_SERIAL_MAJOR=$(VERSION_SERIAL_MAJOR) -DVERSION_SERIAL_MINOR=$(VERSION_SERIAL_MINOR) -DNC_SPI_COMPATIBLE=$(NC_SPI_COMPATIBLE)
 # Optional assembler flags.
 ,8 → 283,7
 # Default target.
-all: begin gccversion sizebefore $(TARGET).elf $(TARGET).hex $(TARGET).eep \
-        $(TARGET).lss $(TARGET).sym sizeafter finished end
+all: begin gccversion sizebefore $(TARGET).elf $(TARGET).hex sizeafter finished end
 # Eye candy.
 ,14 → 409,14
         @echo
         @echo $(MSG_CLEANING)
         $(REMOVE) Flight-Ctrl_*.hex
-        $(REMOVE) $(TARGET).eep
+        $(REMOVE) Flight-Ctrl_*.eep
         $(REMOVE) $(TARGET).obj
         $(REMOVE) $(TARGET).cof
-        $(REMOVE) $(TARGET).elf
-        $(REMOVE) $(TARGET).map
+        $(REMOVE) Flight-Ctrl_*.elf
+        $(REMOVE) Flight-Ctrl_*.map
         $(REMOVE) $(TARGET).obj
         $(REMOVE) $(TARGET).a90
-        $(REMOVE) $(TARGET).sym
+        $(REMOVE) Flight-Ctrl_*.sym
         $(REMOVE) $(TARGET).lnk
         $(REMOVE) $(TARGET).lss
         $(REMOVE) $(OBJ)
 ,7 → 441,7
 # Remove the '-' if you want to see the dependency files generated.
--include $(SRC:.c=.d)
+-include $(SRC:%.c=%.d)

 /trunk/menu.c
 ,6 → 29,11
  for(i=0;i<80;i++) DisplayBuff[i] = ' ';
 }
+void Menu_Putchar(char c)
+{
+        DisplayBuff[DispPtr++] = c;
+}
 void Menu(void)
  {

 /trunk/menu.h
 ,5 → 1,9
+#ifndef _MENU_H
+#define _MENU_H
 extern void Menu(void);
 extern void LcdClear(void);
+extern void Menu_Putchar(char c);
 extern char DisplayBuff[80];
 extern unsigned char DispPtr;
 ,3 → 11,7
 extern unsigned char MenuePunkt;
 extern unsigned char RemoteKeys;
+#define LCD_printfxy(x,y,format, args...)  { DispPtr = y * 20 + x; _printf_P(&Menu_Putchar,PSTR(format) , ## args);}
+#define LCD_printf(format, args...)        {  _printf_P(&Menu_Putchar, PSTR(format) , ## args);}
+#endif //_MENU_H

 /trunk/printf_P.h
 ,19 → 1,69
+// Die Funktion printf_P() unterliegt ihrer eigenen Lizenz und ist nicht von der Lizenz für den MikroKopter-Teil unterstellt
+/*
+Copyright (C) 1993 Free Software Foundation
+This file is part of the GNU IO Library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this library; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/******************************************************************************/
 #ifndef _PRINTF_P_H_
 #define _PRINTF_P_H_
 #include <avr/pgmspace.h>
-#define OUT_V24   0
-#define OUT_LCD   1
+// function pointer to external callback function
+typedef void (*pVoidFnctChar) (char );
+typedef void (*pVoidFnct_pVoidFnctChar_const_fmt) (pVoidFnctChar, char const *fmt0, ...);
+extern pVoidFnct_pVoidFnctChar_const_fmt _printf_P;
-void _printf_P (char, char const *fmt0, ...);
-extern char PrintZiel;
-#define printf_P(format, args...)   _printf_P(OUT_V24,format , ## args)
-#define printf(format, args...)     _printf_P(OUT_V24,PSTR(format) , ## args)
-#define LCD_printfxy(x,y,format, args...)  { DispPtr = y * 20 + x; _printf_P(OUT_LCD,PSTR(format) , ## args);}
-#define LCD_printf(format, args...)  {  _printf_P(OUT_LCD,PSTR(format) , ## args);}
-#endif
+#endif //_PRINTF_P_H_

 /trunk/uart.c
 ,17 → 473,14
 //############################################################################
 //Routine für die Serielle Ausgabe
-int uart_putchar (char c)
+void uart_putchar (char c)
 //############################################################################
 {
-        if (c == '\n')
-                uart_putchar('\r');
+        //if (c == '\n')                uart_putchar('\r');
         //Warten solange bis Zeichen gesendet wurde
         loop_until_bit_is_set(USR, UDRE);
         //Ausgabe des Zeichens
         UDR = c;
-        return (0);
 }

 /trunk/uart.h
 ,8 → 1,9
  #ifndef _UART_H
  #define _UART_H
+#define printf_P(format, args...)   _printf_P(&uart_putchar, format , ## args)
+#define printf(format, args...)     _printf_P(&uart_putchar, PSTR(format) , ## args)
 void BearbeiteRxDaten(void);
 extern unsigned char DebugGetAnforderung;
 ,7 → 17,7
 extern unsigned char RemotePollDisplayLine;
 extern int Debug_Timer,Kompass_Timer;
 extern void UART_Init (void);
-extern int uart_putchar (char c);
+extern void  uart_putchar (char c);
 extern void boot_program_page (uint32_t page, uint8_t *buf);
 extern void DatenUebertragung(void);
 extern void Uart1Init(void);

Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1443 → Rev 1444