ASSAN update

This commit is contained in:
pascallanger 2016-12-19 15:28:42 +01:00
parent 2be6fb13d2
commit e2d64e9140

View File

@ -51,12 +51,14 @@ void ASSAN_init()
void ASSAN_send_packet() void ASSAN_send_packet()
{ {
uint16_t temp; uint16_t temp;
for(uint8_t i=0;i<10;i++) for(uint8_t i=0;i<8;i++)
{ {
temp=Servo_data[i]<<3; temp=Servo_data[i]<<3;
packet[2*i]=temp>>8; packet[2*i]=temp>>8;
packet[2*i+1]=temp; packet[2*i+1]=temp;
} }
for(uint8_t i=0;i<ASSAN_ADDRESS_LENGTH;i++)
packet[16+i]=packet[23-i];
NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70); // Clear data ready, data sent, and retransmit NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70); // Clear data ready, data sent, and retransmit
NRF24L01_FlushTx(); NRF24L01_FlushTx();
NRF24L01_WritePayload(packet, ASSAN_PACKET_SIZE); NRF24L01_WritePayload(packet, ASSAN_PACKET_SIZE);
@ -87,7 +89,7 @@ uint16_t ASSAN_callback()
//Prepare bind packet //Prepare bind packet
memset(packet,0x05,ASSAN_PACKET_SIZE-5); memset(packet,0x05,ASSAN_PACKET_SIZE-5);
packet[15]=0x99; packet[15]=0x99;
for(uint8_t i=0;i<4;i++) for(uint8_t i=0;i<ASSAN_ADDRESS_LENGTH;i++)
packet[16+i]=packet[23-i]; packet[16+i]=packet[23-i];
packet_count=0; packet_count=0;
delayMilliseconds(260); delayMilliseconds(260);
@ -143,7 +145,7 @@ static void __attribute__((unused)) ASSAN_initialize_txid()
uint8_t freq=0,freq2; uint8_t freq=0,freq2;
for(uint8_t i=0;i<4;i++) for(uint8_t i=0;i<4;i++)
{ {
uint8_t temp=rx_tx_addr[0]; uint8_t temp=rx_tx_addr[i];
packet[i+20]=temp; packet[i+20]=temp;
packet[i+24]=temp+1; packet[i+24]=temp+1;
freq+=temp; freq+=temp;
@ -160,7 +162,7 @@ static void __attribute__((unused)) ASSAN_initialize_txid()
freq2+=freq*2-5; freq2+=freq*2-5;
} }
while( (freq2>118) || (freq2<freq+1) || (freq2==2*freq) ); while( (freq2>118) || (freq2<freq+1) || (freq2==2*freq) );
hopping_frequency[1]=freq2; // Add some random to the second channel hopping_frequency[1]=freq2;
} }
uint16_t initASSAN() uint16_t initASSAN()