Subversion Repositories MK3Mag

Compare Revisions

Ignore whitespace Rev 45 → Rev 46

/trunk/uart.c
371,7 → 371,7
 
 
// --------------------------------------------------------------------------
void SendOutData(uint8_t cmd,uint8_t module, uint8_t numofbuffers, ...) // uint8_t *pdata, uint8_t len, ...
void SendOutData(uint8_t cmd, uint8_t address, uint8_t numofbuffers, ...) // uint8_t *pdata, uint8_t len, ...
{
va_list ap;
uint16_t pt = 0;
381,9 → 381,9
uint8_t *pdata = 0;
int len = 0;
 
txd_buffer[pt++] = '#'; // Start character
txd_buffer[pt++] = module; // Address (a=0; b=1,...)
txd_buffer[pt++] = cmd; // Command
txd_buffer[pt++] = '#'; // Start character
txd_buffer[pt++] = 'a' + address; // Address (a=0; b=1,...)
txd_buffer[pt++] = cmd; // Command
 
va_start(ap, numofbuffers);
if(numofbuffers)
496,10 → 496,12
// if data in the rxd buffer are not locked immediately return
if(!rxd_buffer_locked) return;
 
Decode64(); // decode data block in rxd_buffer
 
switch(rxd_buffer[1]-'a') // check Slave Address
{
case MK3MAG_ADDRESS:
Decode64(); // decode data block in rxd_buffer
 
switch(rxd_buffer[2]) // check for CmdID
{
case 'w': // old style
514,11 → 516,10
default:
// unsupported command
break;
}
break; // case MK3MAG_ADDRESS:
} // case MK3MAG_ADDRESS:
 
default: // any Slave Adress
Decode64(); // decode data block in rxd_buffer
 
switch(rxd_buffer[2]) // check for CmdID
{
case 'b': // extern control