Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1703 → Rev 1706

/C-OSD/trunk/CHANGE.LOG
18,6 → 18,9
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
20120723-1900
*expanded ampere wasted to 5digits in nc_mode_default
20120329-1324
*corrected bug in stats which caused maximal current to be overwritten
 
/C-OSD/trunk/c-osd.aws
1,0 → 0,0
<AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA162"/><Files><File00000 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\main.c" Position="249 215 1455 688" LineCol="146 9" State="Maximized"/><File00001 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\mk-data-structs.h" Position="275 260 1206 570" LineCol="221 0" State="Maximized"/><File00002 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.h" Position="297 282 1228 592" LineCol="42 0" State="Maximized"/><File00003 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.c" Position="319 304 1250 614" LineCol="180 0" State="Maximized"/><File00004 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.c" Position="341 326 1272 636" LineCol="224 0" State="Maximized"/><File00005 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.h" Position="363 348 1294 658" LineCol="25 0" State="Maximized"/><File00006 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.c" Position="385 370 1316 680" LineCol="0 0" State="Maximized"/><File00007 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\main.h" Position="253 238 1184 548" LineCol="39 0" State="Maximized"/><File00008 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.c" Position="275 260 1206 570" LineCol="0 0" State="Maximized"/><File00009 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.h" Position="297 282 1228 592" LineCol="0 0" State="Maximized"/><File00010 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.c" Position="319 304 1250 614" LineCol="25 0" State="Maximized"/><File00011 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.c" Position="341 326 1272 636" LineCol="12 0" State="Maximized"/><File00012 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\config.c" Position="363 348 1294 658" LineCol="159 0" State="Maximized"/><File00013 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\config.h" Position="385 370 1316 680" LineCol="0 0" State="Maximized"/><File00014 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.c" Position="253 238 1184 548" LineCol="0 0" State="Maximized"/><File00015 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.h" Position="275 260 1206 570" LineCol="0 0" State="Maximized"/><File00016 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.c" Position="297 282 1228 592" LineCol="0 0" State="Maximized"/><File00017 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.h" Position="319 304 1250 614" LineCol="0 0" State="Maximized"/><File00018 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.c" Position="341 326 1272 636" LineCol="0 0" State="Maximized"/><File00019 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.h" Position="363 348 1294 658" LineCol="0 0" State="Maximized"/><File00020 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.c" Position="385 370 1316 680" LineCol="25 0" State="Maximized"/><File00021 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.h" Position="253 238 1184 548" LineCol="25 0" State="Maximized"/><File00022 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.h" Position="275 260 1206 570" LineCol="25 0" State="Maximized"/><File00023 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.h" Position="297 282 1228 592" LineCol="0 0" State="Maximized"/><File00024 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.h" Position="319 304 1250 614" LineCol="0 0" State="Maximized"/><File00025 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_jopl.c" Position="341 326 1272 636" LineCol="28 0" State="Maximized"/><File00026 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\default\Makefile" Position="363 348 1294 658" LineCol="0 0" State="Maximized"/><File00027 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.c" Position="385 370 1316 680" LineCol="0 0" State="Maximized"/><File00028 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.h" Position="253 238 1184 548" LineCol="3 0" State="Maximized"/><File00029 Name="c:\WinAVR\avr\include\math.h" Position="275 260 1206 570" LineCol="0 0" State="Maximized"/></Files></AVRWorkspace>
<AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA162"/><Files><File00000 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\main.c" Position="2294 149 2964 612" LineCol="146 0" State="Maximized"/><File00001 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\mk-data-structs.h" Position="2316 171 3000 626" LineCol="221 0" State="Maximized"/><File00002 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.h" Position="2338 193 3022 648" LineCol="42 0" State="Maximized"/><File00003 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\max7456_software_spi.c" Position="2360 215 3044 670" LineCol="180 0" State="Maximized"/><File00004 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.c" Position="2382 237 3066 692" LineCol="224 0" State="Maximized"/><File00005 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart1.h" Position="2404 259 3088 714" LineCol="25 0" State="Maximized"/><File00006 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.c" Position="2426 281 3110 736" LineCol="0 0" State="Maximized"/><File00007 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\main.h" Position="2448 303 3132 758" LineCol="39 23" State="Maximized"/><File00008 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.c" Position="2470 325 3154 780" LineCol="360 0" State="Maximized"/><File00009 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_helpers.h" Position="2492 347 3176 802" LineCol="0 0" State="Maximized"/><File00010 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.c" Position="2290 126 3184 810" LineCol="229 35" State="Maximized"/><File00011 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.c" Position="2316 171 3000 626" LineCol="12 0" State="Maximized"/><File00012 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\config.c" Position="2338 193 3022 648" LineCol="159 0" State="Maximized"/><File00013 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\config.h" Position="2360 215 3044 670" LineCol="0 0" State="Maximized"/><File00014 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.c" Position="2382 237 3066 692" LineCol="0 0" State="Maximized"/><File00015 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\spi.h" Position="2404 259 3088 714" LineCol="0 0" State="Maximized"/><File00016 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.c" Position="2426 281 3110 736" LineCol="0 0" State="Maximized"/><File00017 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\buttons.h" Position="2448 303 3132 758" LineCol="0 0" State="Maximized"/><File00018 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.c" Position="2470 325 3154 780" LineCol="0 0" State="Maximized"/><File00019 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\ppm.h" Position="2492 347 3176 802" LineCol="0 0" State="Maximized"/><File00020 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.c" Position="2294 149 2978 604" LineCol="25 0" State="Maximized"/><File00021 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_default.h" Position="2316 171 3000 626" LineCol="25 0" State="Maximized"/><File00022 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_ncmode_minimal.h" Position="2338 193 3022 648" LineCol="25 0" State="Maximized"/><File00023 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_default.h" Position="2360 215 3044 670" LineCol="0 0" State="Maximized"/><File00024 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\characters.h" Position="2382 237 3066 692" LineCol="0 0" State="Maximized"/><File00025 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\osd_fcmode_jopl.c" Position="2404 259 3088 714" LineCol="28 0" State="Maximized"/><File00026 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\default\Makefile" Position="2426 281 3110 736" LineCol="0 0" State="Maximized"/><File00027 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.c" Position="2448 303 3132 758" LineCol="0 0" State="Maximized"/><File00028 Name="H:\Eigene Dateien\C-Projects\C-OSD\trunk\usart0.h" Position="2470 325 3154 780" LineCol="3 0" State="Maximized"/><File00029 Name="c:\WinAVR\avr\include\math.h" Position="2492 347 3176 802" LineCol="0 0" State="Maximized"/></Files></AVRWorkspace>
/C-OSD/trunk/default/dist.bat
19,7 → 19,9
:: * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
:: ****************************************************************************/
 
set DATE=20120329-1324
set OSDBUILDDATE=%DATE:~-4,4%%DATE:~-7,2%%DATE:~0,2%-%TIME:~0,2%%TIME:~3,2%
::set OSDBUILDDATE=20120723-1900
echo "Building: %OSDBUILDDATE%"
 
:: date /T
 
27,40 → 29,40
del *.hex
 
:: build pal hex
set CFLAGS=-DNTSC=0 -DBUILDDATE=\"%DATE%\"
set CFLAGS=-DNTSC=0 -DBUILDOSDBUILDDATE=\"%OSDBUILDDATE%\"
make clean
make
move C-OSD.hex C-OSD-%DATE%-pal.hex
move C-OSD.hex C-OSD-%OSDBUILDDATE%-pal.hex
 
 
:: build ntsc hex
set CFLAGS=-DNTSC=1 -DBUILDDATE=\"%DATE%\"
set CFLAGS=-DNTSC=1 -DBUILDOSDBUILDDATE=\"%OSDBUILDDATE%\"
make clean
make
move C-OSD.hex C-OSD-%DATE%-ntsc.hex
move C-OSD.hex C-OSD-%OSDBUILDDATE%-ntsc.hex
 
:: build pal hex FCONLY
set CFLAGS=-DNTSC=0 -DFCONLY=1 -DBUILDDATE=\"%DATE%\"
set CFLAGS=-DNTSC=0 -DFCONLY=1 -DBUILDOSDBUILDDATE=\"%OSDBUILDDATE%\"
make clean
make
move C-OSD.hex C-OSD-%DATE%-pal-fconly.hex
move C-OSD.hex C-OSD-%OSDBUILDDATE%-pal-fconly.hex
 
:: build ntsc hex FCONLY
set CFLAGS=-DNTSC=1 -DFCONLY=1 -DBUILDDATE=\"%DATE%\"
set CFLAGS=-DNTSC=1 -DFCONLY=1 -DBUILDOSDBUILDDATE=\"%OSDBUILDDATE%\"
make clean
make
move C-OSD.hex C-OSD-%DATE%-ntsc-fconly.hex
move C-OSD.hex C-OSD-%OSDBUILDDATE%-ntsc-fconly.hex
 
 
:: build character files
:: PAL
set CFLAGS=-DNTSC=0 -DWRITECHARS=1 -DBUILDDATE=\"%DATE%\"
set CFLAGS=-DNTSC=0 -DWRITECHARS=1 -DBUILDOSDBUILDDATE=\"%OSDBUILDDATE%\"
make clean
make
move C-OSD.hex C-OSD-characters-pal.hex
 
:: and NTSC as well
set CFLAGS=-DNTSC=1 -DWRITECHARS=1 -DBUILDDATE=\"%DATE%\"
set CFLAGS=-DNTSC=1 -DWRITECHARS=1 -DBUILDOSDBUILDDATE=\"%OSDBUILDDATE%\"
make clean
make
move C-OSD.hex C-OSD-characters-ntsc.hex
73,17 → 75,17
::dir /A *.hex
 
:: pack all stuff
mkdir C-OSD-%DATE%
move *.hex C-OSD-%DATE%
copy ..\CHANGE.LOG C-OSD-%DATE%
copy ..\LICENSE.TXT C-OSD-%DATE%
copy ..\README.TXT C-OSD-%DATE%
mkdir C-OSD-%OSDBUILDDATE%
move *.hex C-OSD-%OSDBUILDDATE%
copy ..\CHANGE.LOG C-OSD-%OSDBUILDDATE%
copy ..\LICENSE.TXT C-OSD-%OSDBUILDDATE%
copy ..\README.TXT C-OSD-%OSDBUILDDATE%
:: 7zip command line version from http://www.7-zip.org
7za a -tzip C-OSD-%DATE%.zip C-OSD-%DATE%
7za a -tzip C-OSD-%OSDBUILDDATE%.zip C-OSD-%OSDBUILDDATE%
 
rmdir /S /Q C-OSD-%DATE%
rmdir /S /Q C-OSD-%OSDBUILDDATE%
 
dir /A C-OSD-%DATE%.zip
dir /A C-OSD-%OSDBUILDDATE%.zip
 
::echo "building based on revision $REVISION is now DONE..."
 
/C-OSD/trunk/main.h
37,7 → 37,7
* Debugging and general purpose definitions
* ##########################################################################*/
#ifndef BUILDDATE
#define BUILDDATE "DEVEL-BUILD" // build date, this is testing...
#define BUILDDATE "DEV "__DATE__ // build date, this is testing...
#endif
 
#define ALLCHARSDEBUG 0 // set to 1 and flash firmware to see all chars
/C-OSD/trunk/osd_ncmode_default.c
224,11 → 224,10
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
//write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0);
write_ndigit_number_u_10th(2, bottom_line - 1, ampere / 10, 4, 0);
write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 4, 0);
 
write_ndigit_number_s(9, bottom_line - 1, ampere_wasted / 10, 5, 0);
} else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) {
write_ndigit_number_u_10th(2, bottom_line - 1, naviData.Current, 4, 0);
write_ndigit_number_u(10, bottom_line - 1, naviData.UsedCapacity, 4, 0);
write_ndigit_number_u(9, bottom_line - 1, naviData.UsedCapacity, 5, 0);
}
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) {
write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0);