Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2040 → Rev 2041

/C-OSD/trunk/main.c
368,12 → 368,13
rxd_buffer_locked = 0;
 
// init on first data retrival, distinguished by last battery :)
if (last_UBat == 255) {
if (!(COSD_FLAGS_RUNTIME & COSD_OSD_STARTED)) {
if (debugData.Analog[9] > 40) {
// fix for min_UBat
min_UBat = debugData.Analog[9];
last_UBat = debugData.Analog[9];
init_cosd(last_UBat);
COSD_FLAGS_RUNTIME |= COSD_OSD_STARTED;
}
} else {
osd_fcmode();
396,12 → 397,13
#endif
 
// init on first data retrival, distinguished by last battery :)
if (last_UBat == 255) {
if (!(COSD_FLAGS_RUNTIME & COSD_OSD_STARTED)) {
if (naviData.UBat > 40) {
// fix for min_UBat
min_UBat = naviData.UBat;
last_UBat = naviData.UBat;
init_cosd(last_UBat);
COSD_FLAGS_RUNTIME |= COSD_OSD_STARTED;
}
} else {
osd_ncmode();
/C-OSD/trunk/CHANGE.LOG
17,6 → 17,10
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
20140317-1730
*fixed battery-voltage >254 crash
 
20140313-2230
*adapted structs to reflect FC/NC software V2.04a
 
/C-OSD/trunk/main.h
113,6 → 113,7
#define COSD_WASFLYING 4
#define COSD_DATARECEIVED 8
#define COSD_BLANKBYSJ 16
#define COSD_OSD_STARTED 128
 
/* ##########################################################################
* LED controll
/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=20140313-2230
set OSDBUILDDATE=20140317-1730
echo "Building: %OSDBUILDDATE%"
 
:: date /T
/C-OSD/trunk/default/flash-usbasp.bat
20,7 → 20,7
:: ****************************************************************************/
 
:: set FIRMWAREFILE to current version
set FIRMWAREFILE=C-OSD-20140313-2230-pal.hex
set FIRMWAREFILE=C-OSD-20140317-1730-pal.hex
 
:: Read fuses as test
avrdude -c usbasp -p m162 -n -v
/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="240 96 1704 545" LineCol="35 0"/><File00001 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\mk-data-structs.h" Position="262 118 1740 559" LineCol="76 0"/><File00002 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.h" Position="284 140 1762 581" LineCol="42 0"/><File00003 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.c" Position="306 162 1784 603" LineCol="209 0"/><File00004 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.c" Position="328 184 1806 625" LineCol="146 0"/><File00005 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.h" Position="350 206 1828 647" LineCol="51 0"/><File00006 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.c" Position="372 228 1850 669" LineCol="0 0"/><File00007 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\main.h" Position="394 250 1872 691" LineCol="53 0"/><File00008 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.c" Position="416 272 1894 713" LineCol="211 0"/><File00009 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.h" Position="438 294 1916 735" LineCol="0 0"/><File00010 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.c" Position="240 96 1718 537" LineCol="95 0"/><File00011 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.c" Position="262 118 1740 559" LineCol="69 0"/><File00012 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.c" Position="284 140 1762 581" LineCol="134 0"/><File00013 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.h" Position="306 162 1784 603" LineCol="0 0"/><File00014 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.c" Position="328 184 1806 625" LineCol="0 0"/><File00015 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.h" Position="350 206 1828 647" LineCol="28 0"/><File00016 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.c" Position="372 228 1850 669" LineCol="0 0"/><File00017 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.h" Position="394 250 1872 691" LineCol="0 0"/><File00018 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.c" Position="416 272 1894 713" LineCol="44 0"/><File00019 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.h" Position="438 294 1916 735" LineCol="24 0"/><File00020 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.c" Position="240 96 1718 537" LineCol="19 0"/><File00021 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.h" Position="262 118 1740 559" LineCol="25 0"/><File00022 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.h" Position="284 140 1762 581" LineCol="25 0"/><File00023 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.h" Position="306 162 1784 603" LineCol="0 0"/><File00024 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.h" Position="328 184 1806 625" LineCol="0 0"/><File00025 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_jopl.c" Position="350 206 1828 647" LineCol="161 0"/><File00026 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\default\Makefile" Position="372 228 1850 669" LineCol="0 0"/><File00027 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.c" Position="394 250 1872 691" LineCol="85 0"/><File00028 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.h" Position="416 272 1894 713" LineCol="3 0"/><File00029 Name="c:\WinAVR\avr\include\math.h" Position="438 294 1916 735" 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="238 94 1702 543" LineCol="30 23" State="Maximized"/><File00001 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\mk-data-structs.h" Position="260 116 1738 557" LineCol="76 0" State="Maximized"/><File00002 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.h" Position="282 138 1760 579" LineCol="42 0" State="Maximized"/><File00003 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.c" Position="304 160 1782 601" LineCol="209 0" State="Maximized"/><File00004 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.c" Position="326 182 1804 623" LineCol="146 0" State="Maximized"/><File00005 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.h" Position="348 204 1826 645" LineCol="51 0" State="Maximized"/><File00006 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.c" Position="370 226 1848 667" LineCol="0 0" State="Maximized"/><File00007 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\main.h" Position="392 248 1870 689" LineCol="110 26" State="Maximized"/><File00008 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.c" Position="414 270 1892 711" LineCol="211 0" State="Maximized"/><File00009 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.h" Position="436 292 1914 733" LineCol="0 0" State="Maximized"/><File00010 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.c" Position="234 71 1922 741" LineCol="251 62" State="Maximized"/><File00011 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.c" Position="260 116 1738 557" LineCol="69 0" State="Maximized"/><File00012 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.c" Position="282 138 1760 579" LineCol="134 0" State="Maximized"/><File00013 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\config.h" Position="304 160 1782 601" LineCol="0 0" State="Maximized"/><File00014 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.c" Position="326 182 1804 623" LineCol="0 0" State="Maximized"/><File00015 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.h" Position="348 204 1826 645" LineCol="28 0" State="Maximized"/><File00016 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.c" Position="370 226 1848 667" LineCol="0 0" State="Maximized"/><File00017 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.h" Position="392 248 1870 689" LineCol="0 0" State="Maximized"/><File00018 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.c" Position="414 270 1892 711" LineCol="44 0" State="Maximized"/><File00019 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.h" Position="436 292 1914 733" LineCol="24 0" State="Maximized"/><File00020 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.c" Position="238 94 1716 535" LineCol="19 0" State="Maximized"/><File00021 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.h" Position="260 116 1738 557" LineCol="25 0" State="Maximized"/><File00022 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.h" Position="282 138 1760 579" LineCol="25 0" State="Maximized"/><File00023 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.h" Position="304 160 1782 601" LineCol="0 0" State="Maximized"/><File00024 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.h" Position="326 182 1804 623" LineCol="0 0" State="Maximized"/><File00025 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_jopl.c" Position="348 204 1826 645" LineCol="161 0" State="Maximized"/><File00026 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\default\Makefile" Position="370 226 1848 667" LineCol="0 0" State="Maximized"/><File00027 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.c" Position="392 248 1870 689" LineCol="85 0" State="Maximized"/><File00028 Name="I:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.h" Position="414 270 1892 711" LineCol="3 0" State="Maximized"/><File00029 Name="c:\WinAVR\avr\include\math.h" Position="436 292 1914 733" LineCol="116 0" State="Maximized"/></Files></AVRWorkspace>
/C-OSD/trunk/README.TXT
33,7 → 33,7
 
Instructions:
Connect the "To FC" port from EPi-OSD to the Debug port of the NaviCtrl.
You will need at least NaviCtrl 0.28h soft to fully enjoy the software.
You will need at least NaviCtrl 2.04a soft to fully enjoy the software.
 
S1 enters a menu where you can cycle through using S2 and toggle/accept choice with S1
 
72,12 → 72,14
- avrdude
HowTo:
- assuming your ISP programmer is a usbasp compatible connected via usb
- fuses:
avrdude -c usbasp -P usb -p m162 -u -v -U lfuse:w:0xff:m -U hfuse:w:0xD7:m -U efuse:w:0xFB:m
- firmware:
avrdude -c usbasp -P usb -p m162 -u -U flash:w:C-OSD-######.hex
- for serial port programming using the SerCon
avrdude -p m162 -c siprog -P COM1 *****************look above*****************
- adjust supplied flash-usbasp.bat (according to your programmer and recent firmware)
- OR use the following commands
- fuses:
avrdude -c usbasp -p m162 -u -v -U lfuse:w:0xff:m -U hfuse:w:0xd7:m -U efuse:w:0xfb:m
- firmware:
avrdude -c usbasp -P usb -p m162 -u -U flash:w:C-OSD-######.hex
- for serial port programming using the SerCon
avrdude -c siprog -P COM1 -p m162 *****************look above*****************
 
 
#EOF