Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1800 → Rev 1801

/C-OSD/trunk/config.c
24,6 → 24,7
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <util/delay.h>
#include <string.h>
#include "max7456_software_spi.h"
#include "config.h"
#include "buttons.h"
128,13 → 129,22
usart1_DisableTXD();
#endif
 
paramset_serial setting;
 
//#define NOFCOMMUNICATION
#ifndef NOFCOMMUNICATION
usart1_request_blocking('Q', PSTR(REQUEST_CURRENT_SETTING));
 
memcpy((char*)(&setting), (char*)pRxData, sizeof(paramset_serial));
//setting = *((paramset_serial*)pRxData);
#else
// manual stuff?
memcpy((char*)setting.param.Name, "NO FC COMMUN", 12);
setting.param.UnterspannungsWarnung = 94;
#endif // #ifndef NOFCOMMUNICATION
//write_ascii_char(4 + 12 * 30, rxd_buffer[2]);
 
paramset_serial setting;
setting = *((paramset_serial*)pRxData);
 
write_ndigit_number_u(10, 7, setting.SettingsIndex, 1, 1);
write_ascii_string_len(13, 7, setting.param.Name, 12);
 
182,7 → 192,8
usart1_request_blocking('V', PSTR(REQUEST_NC_VERSION));
#endif
str_VersionInfo VersionInfo;
VersionInfo = *((str_VersionInfo*)pRxData);
//VersionInfo = *((str_VersionInfo*)pRxData);
memcpy((char*)(&VersionInfo), (char*)pRxData, sizeof(str_VersionInfo));
 
write_ndigit_number_u(14, 11, VersionInfo.SWMajor, 3, 1);
write_ndigit_number_u(18, 11, VersionInfo.SWMinor, 3, 1);