/C-OSD/trunk/CHANGE.LOG |
---|
18,6 → 18,10 |
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
****************************************************************************/ |
20141015-2300 |
*adapted structs to reflect FC/NC software V2.08a |
*changed hanging to 2min wait in case of version missmatch |
20140415-2130 |
*adapted structs to reflect FC/NC software V2.06a |
*added version check for FC/NC software |
/C-OSD/trunk/c-osd.aws |
---|
1,0 → 0,0 |
<AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA162"/><Files><File00000 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\main.c" Position="361 208 1392 573" LineCol="30 0"/><File00001 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\mk-data-structs.h" Position="383 230 1428 587" LineCol="305 0"/><File00002 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.h" Position="405 252 1450 609" LineCol="42 0"/><File00003 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.c" Position="427 274 1472 631" LineCol="209 0"/><File00004 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.c" Position="449 296 1494 653" LineCol="146 0"/><File00005 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.h" Position="471 318 1516 675" LineCol="51 0"/><File00006 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.c" Position="493 340 1538 697" LineCol="0 0"/><File00007 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\main.h" Position="515 362 1560 719" LineCol="110 0"/><File00008 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.c" Position="361 208 1406 565" LineCol="211 0"/><File00009 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.h" Position="383 230 1428 587" LineCol="0 0"/><File00010 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.c" Position="405 252 1450 609" LineCol="251 0"/><File00011 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.c" Position="427 274 1472 631" LineCol="69 0"/><File00012 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.c" Position="449 296 1494 653" LineCol="148 0"/><File00013 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.h" Position="471 318 1516 675" LineCol="0 0"/><File00014 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.c" Position="493 340 1538 697" LineCol="0 0"/><File00015 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.h" Position="515 362 1560 719" LineCol="28 0"/><File00016 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.c" Position="361 208 1406 565" LineCol="0 0"/><File00017 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.h" Position="383 230 1428 587" LineCol="0 0"/><File00018 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.c" Position="405 252 1450 609" LineCol="44 0"/><File00019 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.h" Position="427 274 1472 631" LineCol="24 0"/><File00020 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.c" Position="449 296 1494 653" LineCol="19 0"/><File00021 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.h" Position="471 318 1516 675" LineCol="25 0"/><File00022 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.h" Position="493 340 1538 697" LineCol="25 0"/><File00023 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.h" Position="515 362 1560 719" LineCol="0 0"/><File00024 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.h" Position="361 208 1406 565" LineCol="0 0"/><File00025 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_jopl.c" Position="383 230 1428 587" LineCol="161 0"/><File00026 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\default\Makefile" Position="405 252 1450 609" LineCol="0 0"/><File00027 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.c" Position="427 274 1472 631" LineCol="85 0"/><File00028 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.h" Position="449 296 1494 653" LineCol="3 0"/><File00029 Name="c:\WinAVR\avr\include\math.h" Position="471 318 1516 675" LineCol="116 0"/></Files></AVRWorkspace> |
<AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA162"/><Files><File00000 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\main.c" Position="560 98 1591 464" LineCol="30 0" State="Maximized"/><File00001 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\mk-data-structs.h" Position="582 120 1627 478" LineCol="170 0" State="Maximized"/><File00002 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.h" Position="604 142 1649 500" LineCol="42 0" State="Maximized"/><File00003 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.c" Position="626 164 1671 522" LineCol="209 0" State="Maximized"/><File00004 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.c" Position="648 186 1693 544" LineCol="146 0" State="Maximized"/><File00005 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.h" Position="670 208 1715 566" LineCol="29 0" State="Maximized"/><File00006 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.c" Position="692 230 1737 588" LineCol="0 0" State="Maximized"/><File00007 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\main.h" Position="714 252 1759 610" LineCol="110 0" State="Maximized"/><File00008 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.c" Position="560 98 1605 456" LineCol="211 0" State="Maximized"/><File00009 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.h" Position="582 120 1627 478" LineCol="0 0" State="Maximized"/><File00010 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.c" Position="604 142 1649 500" LineCol="251 0" State="Maximized"/><File00011 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.c" Position="626 164 1671 522" LineCol="69 0" State="Maximized"/><File00012 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.c" Position="556 75 1767 618" LineCol="153 29" State="Maximized"/><File00013 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.h" Position="670 208 1715 566" LineCol="0 0" State="Maximized"/><File00014 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.c" Position="692 230 1737 588" LineCol="0 0" State="Maximized"/><File00015 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.h" Position="714 252 1759 610" LineCol="28 0" State="Maximized"/><File00016 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.c" Position="560 98 1605 456" LineCol="0 0" State="Maximized"/><File00017 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.h" Position="582 120 1627 478" LineCol="0 0" State="Maximized"/><File00018 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.c" Position="604 142 1649 500" LineCol="44 0" State="Maximized"/><File00019 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.h" Position="626 164 1671 522" LineCol="24 0" State="Maximized"/><File00020 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.c" Position="648 186 1693 544" LineCol="19 0" State="Maximized"/><File00021 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.h" Position="670 208 1715 566" LineCol="25 0" State="Maximized"/><File00022 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.h" Position="692 230 1737 588" LineCol="25 0" State="Maximized"/><File00023 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.h" Position="714 252 1759 610" LineCol="0 0" State="Maximized"/><File00024 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.h" Position="560 98 1605 456" LineCol="0 0" State="Maximized"/><File00025 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_jopl.c" Position="582 120 1627 478" LineCol="161 0" State="Maximized"/><File00026 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\default\Makefile" Position="604 142 1649 500" LineCol="0 0" State="Maximized"/><File00027 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.c" Position="626 164 1671 522" LineCol="85 0" State="Maximized"/><File00028 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.h" Position="648 186 1693 544" LineCol="3 0" State="Maximized"/><File00029 Name="c:\WinAVR\avr\include\math.h" Position="670 208 1715 566" LineCol="116 0" State="Maximized"/></Files></AVRWorkspace> |
/C-OSD/trunk/config.c |
---|
141,7 → 141,7 |
write_ascii_string_pgm(3, 12, PSTR("OSD: FC:")); |
write_ndigit_number_u(8, 12, EEPARAM_REVISION, 3, 1); |
write_ndigit_number_u(15, 12, setting.param.Revision, 3, 1); |
while (1) {}; |
for (uint8_t i = 0; i < 120; i++) {_delay_ms(1000);} |
} |
#if FCONLY |
151,7 → 151,7 |
write_ascii_string_pgm(3, 12, PSTR("OSD: FC:")); |
write_ndigit_number_u(8, 12, NAVIDATA_VERSION, 3, 1); |
write_ndigit_number_u(15, 12, naviData.Version, 3, 1); |
while (1) {}; |
for (uint8_t i = 0; i < 120; i++) {_delay_ms(1000);} |
} |
#endif |
/C-OSD/trunk/default/dist.bat |
---|
20,7 → 20,7 |
:: ****************************************************************************/ |
set OSDBUILDDATE=%DATE:~-4,4%%DATE:~-7,2%%DATE:~0,2%-%TIME:~0,2%%TIME:~3,2% |
set OSDBUILDDATE=20140415-2130 |
set OSDBUILDDATE=20141015-2300 |
echo "Building: %OSDBUILDDATE%" |
:: date /T |
/C-OSD/trunk/mk-data-structs.h |
---|
168,10 → 168,10 |
/* |
* MikroKopter config struct |
* portions taken and adapted from |
* http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V2.06a/eeprom.h |
* http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V2.08a/eeprom.h |
*/ |
#define EEPARAM_REVISION 102 // is count up, if paramater stucture has changed (compatibility) |
#define EEPARAM_REVISION 103 // is count up, if paramater stucture has changed (compatibility) |
typedef struct |
186,7 → 186,7 |
unsigned char Hoehe_Verstaerkung; // Wert : 0-50 |
unsigned char Hoehe_ACC_Wirkung; // Wert : 0-250 |
unsigned char Hoehe_HoverBand; // Wert : 0-250 |
unsigned char Hoehe_GPS_Z; // Wert : 0-250 |
unsigned char Hoehe_TiltCompensation; // Wert : 0-250 |
unsigned char Hoehe_StickNeutralPoint;// Wert : 0-250 |
unsigned char Stick_P; // Wert : 1-6 |
unsigned char Stick_D; // Wert : 0-64 |
299,8 → 299,9 |
unsigned char GlobalConfig3; // bitcodiert |
char Name[12]; |
unsigned char crc; // must be the last byte! |
} paramset_t; // 127 bytes |
} paramset_t; // 134 bytes (V1.06) |
typedef struct { |
u8 SettingsIndex; |
paramset_t param; |
/C-OSD/trunk/usart1.h |
---|
27,7 → 27,7 |
#define baud 57600 |
#define RXD_BUFFER_LEN 220 |
#define RXD_BUFFER_LEN 250 |
#define TXD_BUFFER_LEN 20 // not so much needed |
#define REQUEST_OSD_DATA "#bo?]==EG\r" |