changed to continuous_main.c (no change to .h files)

pull/1/head
alanbjohnston 7 years ago committed by GitHub
parent cb472f47ff
commit 2f345d8144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -31,10 +31,16 @@
#define MAX_MESSAGE_LENGTH (197) #define MAX_MESSAGE_LENGTH (197)
extern uint8_t axradio_rxbuffer[]; extern uint8_t axradio_rxbuffer[];
void *receive(void *arg);
void *transmit(void *arg); void *transmit(void *arg);
size_t get_message(uint8_t *buffer, size_t avail); int get_message(uint8_t *buffer, int avail);
int get_cw(uint8_t *buffer, int avail);
int add_dot(uint8_t *msg, int number);
int add_dash(uint8_t *msg, int number);
int add_space(uint8_t *msg, int number);
int lower_digit(int number);
int upper_digit(int number);
int encode_digit(uint8_t *msg, int number);
void config_cw();
enum RadioState {UnknownState, RxState, TxState}; enum RadioState {UnknownState, RxState, TxState};
enum RadioState currentState = UnknownState; enum RadioState currentState = UnknownState;
@ -44,6 +50,11 @@ enum ReceiveState {WaitingForNewPacket, WaitingForPacketCounter1,
WaitingForMessageLength2, WaitingForMessage, WaitingForMessageLength2, WaitingForMessage,
WaitingForChecksum1, WaitingForChecksum2}; WaitingForChecksum1, WaitingForChecksum2};
static uint8_t on_value = 0xff;
static uint8_t off_value = 0x00;
int spacing = 1; // integer number of octets for a dot
int main(void) int main(void)
{ {
uint8_t retVal; uint8_t retVal;
@ -75,14 +86,6 @@ int main(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
pthread_t receive_thread;
result = pthread_create(&receive_thread, NULL, receive, (void *)&ax5043_sem);
if (result != 0) {
fprintf(stderr, "ERROR: Unable to spawn receive thread with error %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
pthread_t transmit_thread; pthread_t transmit_thread;
result = pthread_create(&transmit_thread, NULL, transmit, (void *)&ax5043_sem); result = pthread_create(&transmit_thread, NULL, transmit, (void *)&ax5043_sem);
if (result != 0) { if (result != 0) {
@ -103,92 +106,118 @@ int main(void)
return 0; return 0;
} }
void *receive(void *arg) { void *transmit(void *arg) {
sem_t *sem; sem_t *sem;
sem = (sem_t *)arg; sem = (sem_t *)arg;
uint8_t retVal; uint8_t retVal;
uint16_t packetNumber; /*
uint16_t messageLength; int x;
uint16_t checksum; for (x = 0; x < 0x20; x++)
char ch; {
printf("Register %x contents: %x\n",x,(int)ax5043ReadReg(x));
enum ReceiveState currentReceiveState = WaitingForNewPacket; }
printf("Register Dump complete");
*/
for (;;) { for (;;) {
int result; int result;
// allocate space for the buffer
static uint8_t packet[MAX_MESSAGE_LENGTH + 1];
//uint16_t pkt_counter;
// ++pkt_counter;
int reserved_space = 0;
int msg_length = get_cw(&packet[reserved_space], (MAX_MESSAGE_LENGTH + 1) - reserved_space);
result = sem_wait(sem); result = sem_wait(sem);
if (result != 0) { if (result != 0) {
fprintf(stderr, "Failed to wait on semaphore with error %s\n", strerror(errno)); fprintf(stderr, "Failed to wait on semaphore with error %s\n", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// Enter transmit mode only if not already in receive mode
// Enter receive mode only if not already in receive mode if (currentState != TxState) {
if (currentState != RxState) { retVal = mode_tx();
retVal = mode_rx();
if (retVal != AXRADIO_ERR_NOERROR) { if (retVal != AXRADIO_ERR_NOERROR) {
fprintf(stderr, "ERROR: Unable to enter RX mode\n"); fprintf(stderr, "ERROR: Unable to enter TX mode\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
currentState = RxState; currentState = TxState;
} }
retVal = receive_packet(); printf("INFO: Sending another packet...\n");
if (retVal > 0) { printf("DEBUG: msg_length = %d\n", msg_length);
uint8_t counter = 0; printf("DEBUG: reserved_space = %d\n", reserved_space);
while (retVal-- > 0) {
switch(currentReceiveState) { while(1) {
case WaitingForNewPacket:
printf("Pkt Len: %d ", (int)axradio_rxbuffer[counter++]); /*
currentReceiveState = WaitingForPacketCounter1; int x;
break; for (x = 0; x < 0x20; x++)
case WaitingForPacketCounter1: {
packetNumber = (int)axradio_rxbuffer[counter++]; printf("Register %x contents: %x\n",x,(int)ax5043ReadReg(x));
currentReceiveState = WaitingForPacketCounter2;
break;
case WaitingForPacketCounter2:
packetNumber |= (uint16_t)(axradio_rxbuffer[counter++] << 8);
printf("Pkt Num: %d ", (int)packetNumber);
currentReceiveState = WaitingForMessageLength1;
break;
case WaitingForMessageLength1:
messageLength = (int)axradio_rxbuffer[counter++];
currentReceiveState = WaitingForMessageLength2;
break;
case WaitingForMessageLength2:
messageLength |= (uint16_t)(axradio_rxbuffer[counter++] << 8);
printf("Msg Len: %d ", (int)messageLength);
currentReceiveState = WaitingForMessage;
break;
case WaitingForMessage:
ch = (char)axradio_rxbuffer[counter++];
if (ch != '\n') {
printf("%c", ch);
} }
else {
printf(" "); printf("Register Dump complete");
currentReceiveState = WaitingForChecksum1; */
/*
printf("Register write to clear framing and crc\n");
ax5043WriteReg(0x12,0);
printf("Register write to disable fec\n");
ax5043WriteReg(0x18,0);
printf("Register write \n");
ax5043WriteReg(0x165,0);
ax5043WriteReg(0x166,0);
ax5043WriteReg(0x167,0x50); // 0x08); // 0x20);
ax5043WriteReg(0x161,0);
ax5043WriteReg(0x162,0x20);
long txRate;
txRate = ax5043ReadReg(0x167) + 256 * ax5043ReadReg(0x166) + 65536 * ax5043ReadReg(0x165);
printf("Tx Rate %x %x %x \n", ax5043ReadReg(0x165), ax5043ReadReg(0x166), ax5043ReadReg(0x167));
long fskDev;
fskDev = ax5043ReadReg(0x163) + 256 * ax5043ReadReg(0x162) + 65536 * ax5043ReadReg(0x161);
ax5043WriteReg(0x37,(ax5043ReadReg(0x37) + 4)); // Increase FREQA
printf("Tx Rate: %ld FSK Dev: %ld \n", txRate, fskDev);
ax5043WriteReg(0x10,0); // ASK
printf("Modulation: %x \n", (int)ax5043ReadReg(0x10));
printf("Frequency A: 0x%x %x %x %x \n",(int)ax5043ReadReg(0x34),(int)ax5043ReadReg(0x35),(int)ax5043ReadReg(0x36),(int)ax5043ReadReg(0x37));
*/
/* HERE */
/*
int x;
for (x = 0; x < 0x20; x++)
{
printf("Register %x contents: %x\n",x,(int)ax5043ReadReg(x));
} }
break;
case WaitingForChecksum1: printf("Register Dump complete");
checksum = (int)axradio_rxbuffer[counter++]; */
currentReceiveState = WaitingForChecksum2;
break; config_cw();
case WaitingForChecksum2:
checksum |= (uint16_t)(axradio_rxbuffer[counter++] << 8); retVal = transmit_packet(&remoteaddr_tx, packet, msg_length + reserved_space);
printf("(Chksum: %d)\n", (int)checksum); if (retVal != AXRADIO_ERR_NOERROR) {
currentReceiveState = WaitingForNewPacket; fprintf(stderr, "ERROR: Unable to transmit a packet\n");
break;
default:
fprintf(stderr, "ERROR: Unknown state in receive state machine\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
break;
}
} }
sleep(10);
fflush(stdout);
} }
@ -198,131 +227,287 @@ void *receive(void *arg) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
usleep(25000); usleep(200000);
} }
return NULL; return NULL;
} }
void *transmit(void *arg) { int get_cw(uint8_t *buffer, int avail) {
sem_t *sem;
sem = (sem_t *)arg;
uint8_t retVal; int count = 0;
/*
count += add_space(&buffer[count], 10);
for (;;) { count += add_dash(&buffer[count], 1); // c
int result; count += add_dot(&buffer[count], 1);
count += add_dash(&buffer[count], 1);
count += add_dot(&buffer[count], 1);
count += add_space(&buffer[count], 3);
// allocate space for the buffer count += add_dash(&buffer[count], 2); // q
static uint8_t packet[MAX_MESSAGE_LENGTH + 1]; count += add_dot(&buffer[count], 1);
uint16_t pkt_counter; count += add_dash(&buffer[count], 1);
count += add_space(&buffer[count], 7);
++pkt_counter; count += add_dot(&buffer[count], 4); // h
count += add_space(&buffer[count], 3);
// Calculate the number of reserved bytes at the beginning of the packet count += add_dot(&buffer[count], 2); // i
size_t reserved_space = 0; count += add_space(&buffer[count], 7);
// if transmitting a packet counter, reserve two bytes count += add_dot(&buffer[count], 4); // h
if (framing_insert_counter) { count += add_space(&buffer[count], 3);
reserved_space += 2;
}
// reserve two bytes for the overall length of the packet including the count += add_dot(&buffer[count], 2); // i
// packet counter, if present, and the field containing the length count += add_space(&buffer[count], 7);
reserved_space += 2; */
// get a message to transmit. int tlm_1a = 42;
size_t msg_length = get_message(&packet[reserved_space], (MAX_MESSAGE_LENGTH + 1) - reserved_space); int tlm_1b = 35;
// if message consists only of a newline, terminate count += encode_digit(&buffer[count], 1);
if (msg_length <= 1) { count += encode_digit(&buffer[count], upper_digit(tlm_1a));
break; count += encode_digit(&buffer[count], lower_digit(tlm_1a));
}
if (framing_insert_counter) { count += add_space(&buffer[count], 7);
packet[framing_counter_pos] = (uint8_t)(pkt_counter & 0xFF);
packet[framing_counter_pos+1] = (uint8_t)((pkt_counter>>8) & 0xFF);
// include the message length count += encode_digit(&buffer[count], 1);
packet[framing_counter_pos+2] = msg_length & 0xFF ; count += encode_digit(&buffer[count], upper_digit(tlm_1b));
packet[framing_counter_pos+3] = (msg_length>>8) & 0xFF; count += encode_digit(&buffer[count], lower_digit(tlm_1b));
}
else { // only include the message length count += add_space(&buffer[count], 14);
packet[framing_counter_pos] = msg_length & 0xFF ;
packet[framing_counter_pos+1] = (msg_length>>8) & 0xFF; count += encode_digit(&buffer[count], 1);
count += encode_digit(&buffer[count], upper_digit(tlm_1a++));
count += encode_digit(&buffer[count], lower_digit(tlm_1a));
count += add_space(&buffer[count], 7);
/*
count += encode_digit(&buffer[count], 1);
count += encode_digit(&buffer[count], upper_digit(tlm_1b++));
count += encode_digit(&buffer[count], lower_digit(tlm_1b));
count += add_space(&buffer[count], 14);
count += encode_digit(&buffer[count], 2);
count += encode_digit(&buffer[count], upper_digit(tlm_1a++));
count += encode_digit(&buffer[count], lower_digit(tlm_1a));
count += add_space(&buffer[count], 7);
count += encode_digit(&buffer[count], 2);
count += encode_digit(&buffer[count], upper_digit(tlm_1b++));
count += encode_digit(&buffer[count], lower_digit(tlm_1b));
count += add_space(&buffer[count], 14);
count += encode_digit(&buffer[count], 2);
count += encode_digit(&buffer[count], upper_digit(tlm_1a++));
count += encode_digit(&buffer[count], lower_digit(tlm_1a));
count += add_space(&buffer[count], 7);
count += encode_digit(&buffer[count], 2);
count += encode_digit(&buffer[count], upper_digit(tlm_1b++));
count += encode_digit(&buffer[count], lower_digit(tlm_1b));
count += add_space(&buffer[count], 14);
*/
printf("DEBUG count: %d avail: %d \n", count, avail);
if (count > avail) {
buffer[avail-1] = 0;
count = avail-1;
printf("DEBUG count > avail!\n");
} }
// printf("DEBUG get_cw: ***%s***\n", buffer);
result = sem_wait(sem); //return strlen((char *)buffer);
if (result != 0) { return count;
fprintf(stderr, "Failed to wait on semaphore with error %s\n", strerror(errno));
exit(EXIT_FAILURE);
} }
// Enter transmit mode only if not already in receive mode int add_dash(uint8_t *msg, int number) {
if (currentState != TxState) { int counter = 0;
retVal = mode_tx(); int i,j;
if (retVal != AXRADIO_ERR_NOERROR) { for (j=0; j < number; j++) {
fprintf(stderr, "ERROR: Unable to enter TX mode\n"); for (i=0; i < spacing * 3; i++) {
exit(EXIT_FAILURE); msg[counter++] = on_value;
} }
currentState = TxState; counter += add_space(&msg[counter], 1);
}
return counter;
} }
//printf("INFO: Sending another packet...\n"); int add_dot(uint8_t *msg, int number) {
//printf("DEBUG: msg_length = %d\n", msg_length); int counter = 0;
//printf("DEBUG: reserved_space = %d\n", reserved_space); int i,j;
retVal = transmit_packet(&remoteaddr_tx, packet, (uint16_t)(msg_length + reserved_space)); for (j=0; j < number; j++) {
if (retVal != AXRADIO_ERR_NOERROR) { for (i=0; i < spacing; i++) {
fprintf(stderr, "ERROR: Unable to transmit a packet\n"); msg[counter++] = on_value;
exit(EXIT_FAILURE);
} }
result = sem_post(sem); counter += add_space(&msg[counter], 1);
if (result != 0) { }
fprintf(stderr, "Failed to post on semaphore with error %s\n", strerror(errno)); return counter;
exit(EXIT_FAILURE);
} }
usleep(200000); int add_space(uint8_t *msg, int number) {
int j;
int counter = 0;
for (j=0; j < number * spacing; j++) {
msg[counter++] = off_value;
}
return counter;
} }
return NULL; int encode_digit(uint8_t *buffer, int digit) {
int count = 0;
switch(digit)
{
case 0:
count += add_dash(&buffer[count], 5); // 0
count += add_space(&buffer[count], 3);
break;
case 1:
count += add_dot(&buffer[count], 1); // 1
count += add_dash(&buffer[count], 4);
count += add_space(&buffer[count], 3);
break;
case 2:
count += add_dot(&buffer[count], 2); // 2
count += add_dash(&buffer[count], 3);
count += add_space(&buffer[count], 3);
break;
case 3:
count += add_dot(&buffer[count], 3); // 3
count += add_dash(&buffer[count], 2);
count += add_space(&buffer[count], 3);
break;
case 4:
count += add_dot(&buffer[count], 4); // 4
count += add_dash(&buffer[count], 1);
count += add_space(&buffer[count], 3);
break;
case 5:
count += add_dot(&buffer[count], 5); // 5
count += add_space(&buffer[count], 3);
break;
case 6:
count += add_dash(&buffer[count], 1); // 6
count += add_dot(&buffer[count], 4);
count += add_space(&buffer[count], 3);
break;
case 7:
count += add_dash(&buffer[count], 2); // 7
count += add_dot(&buffer[count], 3);
count += add_space(&buffer[count], 3);
break;
case 8:
count += add_dash(&buffer[count], 3); // 8
count += add_dot(&buffer[count], 2);
count += add_space(&buffer[count], 3);
break;
case 9:
count += add_dash(&buffer[count], 4); // 9
count += add_dot(&buffer[count], 1);
count += add_space(&buffer[count], 3);
break;
default:
printf("ERROR: Not a digit!\n");
return 0;
} }
return count;
}
int lower_digit(int number) {
size_t get_message(uint8_t *buffer, size_t avail) { int digit = 0;
static int instructionsPrinted = 0; if (number < 100)
digit = number - ((int)(number/10) * 10);
else
printf("ERROR: Not a digit in lower_digit!\n");
// obtain a line of text. We state the message is limited to avail-2 to return digit;
// leave space for the newline and the null terminator
if (!instructionsPrinted) {
printf("Please enter your message, up to %d characters\n (empty message to terminate the program):\n", (int)(avail-2));
instructionsPrinted = 1;
} }
fgets((char *)buffer, (int)avail, stdin);
// check for end-of-file (for redirecting stdin) int upper_digit(int number) {
if (feof(stdin)) {
buffer[0] = '\n'; int digit = 0;
buffer[1] = 0;
if (number < 100)
digit = (int)(number/10);
else
printf("ERROR: Not a digit in upper_digit!\n");
return digit;
} }
// If the newline isn't present, the message is too long void config_cw() {
printf("Register write to clear framing and crc\n");
ax5043WriteReg(0x12,0);
//printf("DEBUG: ***%s***\n", buffer); printf("Register write to disable fec\n");
ax5043WriteReg(0x18,0);
if (buffer[strlen((char *)buffer) - 1] != '\n') { printf("Register write \n");
buffer[strlen((char *)buffer) - 1] = '\n'; ax5043WriteReg(0x165,0);
printf("WARNING: message too long. It will be truncated to\n%s", (char *)buffer);
// If the newline isn't in the buffer, read characters from the keyboard buffer to the newline ax5043WriteReg(0x166,0);
int c; ax5043WriteReg(0x167,0x50); // 0x08); // 0x20);
do {
c = getchar(); ax5043WriteReg(0x161,0);
} while (c != '\n' && c != EOF); ax5043WriteReg(0x162,0x20);
long txRate;
txRate = ax5043ReadReg(0x167) + 256 * ax5043ReadReg(0x166) + 65536 * ax5043ReadReg(0x165);
printf("Tx Rate %x %x %x \n", ax5043ReadReg(0x165), ax5043ReadReg(0x166), ax5043ReadReg(0x167));
long fskDev;
fskDev = ax5043ReadReg(0x163) + 256 * ax5043ReadReg(0x162) + 65536 * ax5043ReadReg(0x161);
ax5043WriteReg(0x37,(ax5043ReadReg(0x37) + 4)); // Increase FREQA
printf("Tx Rate: %ld FSK Dev: %ld \n", txRate, fskDev);
ax5043WriteReg(0x10,0); // ASK
printf("Modulation: %x \n", (int)ax5043ReadReg(0x10));
printf("Frequency A: 0x%x %x %x %x \n",(int)ax5043ReadReg(0x34),(int)ax5043ReadReg(0x35),(int)ax5043ReadReg(0x36),(int)ax5043ReadReg(0x37));
/* HERE */
/*
int x;
for (x = 0; x < 0x20; x++)
{
printf("Register %x contents: %x\n",x,(int)ax5043ReadReg(x));
} }
//printf("DEBUG: ***%s***\n", buffer); printf("Register Dump complete");
*/
return;
return strlen((char *)buffer);
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.