Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2600 → Rev 2601

/C-OSD/trunk/buttons.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/max7456_software_spi.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/buttons.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/max7456_software_spi.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_helpers.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_helpers.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/usart0.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/usart1.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_ncmode_minimal.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/usart0.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/CHANGE.LOG
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
17,6 → 17,9
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
20180509-1200
*adapted structs to reflect FC/NC software V2.20c/V2.20h
 
20170511-1145
*adapted structs to reflect FC/NC software V2.18a
/C-OSD/trunk/main.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/usart1.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_ncmode_minimal.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_fcmode_jopl.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/mk-data-structs.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
85,7 → 85,7
/*
* NaviCtrl OSD Structs
* portions taken and adapted from
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V2.18a/uart1.h
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V2.20h/uart1.h
*/
typedef struct {
u16 Distance; // distance to target in dm
134,6 → 134,7
u8 reserve1; // to fit into 84 bytes (must be divisible by 3)
u8 reserve2; // to fit into 84 bytes (must be divisible by 3)
} __attribute__((packed)) NaviData_t;
extern NaviData_t NaviData;
 
/*
* NaviCtrl & FCFlags Flags
200,12 → 201,12
/*
* MikroKopter config struct
* portions taken and adapted from
* http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V2.16a/eeprom.h
* http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V2.20c/eeprom.h
*/
 
#define EEPARAM_REVISION 110 // !!!Update NC also!!! is count up, if paramater stucture has changed (compatibility)
#define EEPARAM_REVISION 113 // -> InsertDefaultParameters()
#define EEMIXER_REVISION 1 // is count up, if mixer stucture has changed (compatibility)
#define EE_BACKWARD_COMP 1 // change if the eepropm parameters are not backwards compatible
#define EE_BACKWARD_COMP 1 // count up if the eepropm parameters are not backwards compatible
 
 
 
333,7 → 334,11
unsigned char MenuKeyChannel;
unsigned char CamCtrlModeChannel;
unsigned char CamCtrlZoomChannel;
unsigned char reserved[32]; // for later use
unsigned char FailsSafeAltitude;
unsigned char GimbalYawChannel;
unsigned char GimbalOut1Channel;
unsigned char GimbalOut2Channel;
unsigned char reserved[28]; // for later use
//------------------------------------------------
unsigned char BitConfig; // (war Loop-Cfg) Bitcodiert: 0x01=oben, 0x02=unten, 0x04=links, 0x08=rechts / wird getrennt behandelt
unsigned char ServoCompInvert; // // 0x01 = Nick, 0x02 = Roll, 0x04 = relative moving // WICHTIG!!! am Ende lassen
/C-OSD/trunk/main.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_fcmode_jopl.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/spi.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/ppm.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/spi.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/ppm.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/default/dist.bat
1,6 → 1,6
@echo off
:: /****************************************************************************
:: * Copyright (C) 2010-2017 by Claas Anders "CaScAdE" Rathje *
:: * Copyright (C) 2010-2018 by Claas Anders "CaScAdE" Rathje *
:: * admiralcascade@gmail.com *
:: * Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
:: * *
20,7 → 20,7
:: ****************************************************************************/
 
set OSDBUILDDATE=%DATE:~-4,4%%DATE:~-7,2%%DATE:~0,2%-%TIME:~0,2%%TIME:~3,2%
set OSDBUILDDATE=20170511-1145
set OSDBUILDDATE=20180509-1200
echo "Building: %OSDBUILDDATE%"
 
:: date /T
/C-OSD/trunk/default/dist.sh
1,6 → 1,6
#!/bin/sh
#/****************************************************************************
# * Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
# * Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
# * admiralcascade@gmail.com *
# * Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
# * *
/C-OSD/trunk/default/flash-usbasp.bat
1,6 → 1,6
@echo off
:: /****************************************************************************
:: * Copyright (C) 2014-2017 by Claas Anders "CaScAdE" Rathje *
:: * Copyright (C) 2014-2018 by Claas Anders "CaScAdE" Rathje *
:: * admiralcascade@gmail.com *
:: * Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
:: * *
20,7 → 20,7
:: ****************************************************************************/
 
:: set FIRMWAREFILE to current version
set FIRMWAREFILE=C-OSD-20170511-1145-pal.hex
set FIRMWAREFILE=C-OSD-20180509-1200-pal.hex
 
:: Read fuses as test
avrdude -c usbasp -p m162 -n -v
/C-OSD/trunk/config.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_fcmode_default.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/config.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_fcmode_default.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_ncmode_default.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/characters.c
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/osd_ncmode_default.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/characters.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
/C-OSD/trunk/README.TXT
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *