[tuxdroid-svn] r1283 - firmware/rf/trunk
Status: Beta
Brought to you by:
ks156
From: jaguarondi <c2m...@c2...> - 2008-06-30 14:26:35
|
Author: jaguarondi Date: 2008-06-30 16:26:38 +0200 (Mon, 30 Jun 2008) New Revision: 1283 Modified: firmware/rf/trunk/device.c firmware/rf/trunk/init.c firmware/rf/trunk/rf_ctrl.c Log: * Added some comments for future work. Modified: firmware/rf/trunk/device.c =================================================================== --- firmware/rf/trunk/device.c 2008-06-30 09:47:23 UTC (rev 1282) +++ firmware/rf/trunk/device.c 2008-06-30 14:26:38 UTC (rev 1283) @@ -110,7 +110,7 @@ // 6 - 7 -> Sync * // 8 - 11 -> SOF * // 12 -> LEN * -// 13 -> Command * +// 13 -> Command * // 14 - 30 -> Payload * // 31 -> Checksum * //***************************************************************************** @@ -121,6 +121,7 @@ volatile uint16_t _count=0; for (;_count<0xFFFF; _count++); if (!(PIND & 0x40)) /* if head is pushed at startup */ + /* TODO change to a rjump to 0x0F0A */ asm volatile ("rjmp bootloader" ::); /* jump to bootloader */ #elif defined(_MASTER) if (!(PINB & 0x04)) /* if SPI_SS is cleared at startup */ Modified: firmware/rf/trunk/init.c =================================================================== --- firmware/rf/trunk/init.c 2008-06-30 09:47:23 UTC (rev 1282) +++ firmware/rf/trunk/init.c 2008-06-30 14:26:38 UTC (rev 1283) @@ -137,6 +137,7 @@ rf_buffer_tx[6] = rf_buffer_tx[7] = 0xFF ^ SCRAMBLE_BYTE; //Default setup of the rf_buffer_tx// /* XXX to be cleaned */ + /* TODO sof_ary can be a pointer to rf_buffer_tx[8] */ sof_ary[0] = TRX_CHANNEL; sof_ary[1] = 0x56; sof_ary[2] = 0xFF; @@ -146,7 +147,7 @@ rf_buffer_tx[10]=sof_ary[2]; rf_buffer_tx[11]=sof_ary[3]; - //generate dummy packet + /* TODO increase the frame size to add the previosu audio data */ rf_buffer_tx[12]=52; /* Number of bytes from here */ rf_buffer_tx[13]=0x55; rf_buffer_tx[14]=0x55; @@ -199,10 +200,6 @@ rf_buffer_tx[61]=0x55; rf_buffer_tx[62]=0x55; rf_buffer_tx[63]=0x34; /* Parity checksum manually calculated */ - - /*uint8_t i;*/ - /*for (i=13; i<63; i++)*/ - /*rf_buffer_tx[i] = 0x01;//1<<(i&7);*/ } Modified: firmware/rf/trunk/rf_ctrl.c =================================================================== --- firmware/rf/trunk/rf_ctrl.c 2008-06-30 09:47:23 UTC (rev 1282) +++ firmware/rf/trunk/rf_ctrl.c 2008-06-30 14:26:38 UTC (rev 1283) @@ -155,6 +155,7 @@ /* Request a SPI communication. */ /* XXX Should check here whether we're connected or not */ if (rf_status) + /* XXX I think we don't need this 'if' anymore */ { spi_request(); } @@ -428,6 +429,7 @@ /* Last data buffered. */ if(tmp == rf_buffer_tx[12] + 11) { + /* TODO this can be moved out of the if/else */ UDR0 = rf_buffer_tx[tmp] ^ SCRAMBLE_BYTE; //UDR0 = (0-checksum_tx) ^ SCRAMBLE_BYTE; /* Enable USART Transmit complete interrupt (SIG_USART_TRANS) and |