projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update changelogs for Debian build
[fw/altos]
/
src
/
ao_radio.c
diff --git
a/src/ao_radio.c
b/src/ao_radio.c
index c7c8dc8d7620bc69883bac47d76b4e004adba569..f4a9d3b265edb1a82ea37ee95cac9568022da9c6 100644
(file)
--- a/
src/ao_radio.c
+++ b/
src/ao_radio.c
@@
-28,14
+28,6
@@
* RX filter: 93.75 kHz
*/
* RX filter: 93.75 kHz
*/
-/*
- * For 434.550MHz, the frequency value is:
- *
- * 434.550e6 / (24e6 / 2**16) = 1186611.2
- */
-
-#define FREQ_CONTROL 1186611
-
/*
* For IF freq of 140.62kHz, the IF value is:
*
/*
* For IF freq of 140.62kHz, the IF value is:
*
@@
-124,10
+116,6
@@
static __code uint8_t radio_setup[] = {
RF_PA_TABLE1_OFF, RF_POWER,
RF_PA_TABLE0_OFF, RF_POWER,
RF_PA_TABLE1_OFF, RF_POWER,
RF_PA_TABLE0_OFF, RF_POWER,
- RF_FREQ2_OFF, (FREQ_CONTROL >> 16) & 0xff,
- RF_FREQ1_OFF, (FREQ_CONTROL >> 8) & 0xff,
- RF_FREQ0_OFF, (FREQ_CONTROL >> 0) & 0xff,
-
RF_FSCTRL1_OFF, (IF_FREQ_CONTROL << RF_FSCTRL1_FREQ_IF_SHIFT),
RF_FSCTRL0_OFF, (0 << RF_FSCTRL0_FREQOFF_SHIFT),
RF_FSCTRL1_OFF, (IF_FREQ_CONTROL << RF_FSCTRL1_FREQ_IF_SHIFT),
RF_FSCTRL0_OFF, (0 << RF_FSCTRL0_FREQOFF_SHIFT),
@@
-287,7
+275,7
@@
__xdata uint8_t ao_radio_done;
__xdata uint8_t ao_radio_mutex;
void
__xdata uint8_t ao_radio_mutex;
void
-ao_radio_general_isr(void) interrupt 16
+ao_radio_general_isr(void)
__
interrupt 16
{
S1CON &= ~0x03;
if (RFIF & RFIF_IM_TIMEOUT) {
{
S1CON &= ~0x03;
if (RFIF & RFIF_IM_TIMEOUT) {
@@
-329,21
+317,31
@@
ao_radio_idle(void)
{
if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
{
{
if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
{
- RFST = RFST_SIDLE;
do {
do {
+ RFST = RFST_SIDLE;
ao_yield();
} while (RF_MARCSTATE != RF_MARCSTATE_IDLE);
}
}
void
ao_yield();
} while (RF_MARCSTATE != RF_MARCSTATE_IDLE);
}
}
void
-ao_radio_
send(__xdata struct ao_telemetry *telemetry) __reentrant
+ao_radio_
get(void)
{
ao_config_get();
ao_mutex_get(&ao_radio_mutex);
ao_radio_idle();
{
ao_config_get();
ao_mutex_get(&ao_radio_mutex);
ao_radio_idle();
- ao_radio_done = 0;
RF_CHANNR = ao_config.radio_channel;
RF_CHANNR = ao_config.radio_channel;
+ RF_FREQ2 = (uint8_t) (ao_config.radio_cal >> 16);
+ RF_FREQ1 = (uint8_t) (ao_config.radio_cal >> 8);
+ RF_FREQ0 = (uint8_t) (ao_config.radio_cal);
+}
+
+
+void
+ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
+{
+ ao_radio_get();
+ ao_radio_done = 0;
ao_dma_set_transfer(ao_radio_dma,
telemetry,
&RFDXADDR,
ao_dma_set_transfer(ao_radio_dma,
telemetry,
&RFDXADDR,
@@
-358,16
+356,13
@@
ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
RFST = RFST_STX;
__critical while (!ao_radio_done)
ao_sleep(&ao_radio_done);
RFST = RFST_STX;
__critical while (!ao_radio_done)
ao_sleep(&ao_radio_done);
- ao_
mutex_put(&ao_radio_mutex
);
+ ao_
radio_put(
);
}
uint8_t
ao_radio_recv(__xdata struct ao_radio_recv *radio) __reentrant
{
}
uint8_t
ao_radio_recv(__xdata struct ao_radio_recv *radio) __reentrant
{
- ao_config_get();
- ao_mutex_get(&ao_radio_mutex);
- ao_radio_idle();
- RF_CHANNR = ao_config.radio_channel;
+ ao_radio_get();
ao_dma_set_transfer(ao_radio_dma,
&RFDXADDR,
radio,
ao_dma_set_transfer(ao_radio_dma,
&RFDXADDR,
radio,
@@
-382,7
+377,7
@@
ao_radio_recv(__xdata struct ao_radio_recv *radio) __reentrant
RFST = RFST_SRX;
__critical while (!ao_radio_dma_done)
ao_sleep(&ao_radio_dma_done);
RFST = RFST_SRX;
__critical while (!ao_radio_dma_done)
ao_sleep(&ao_radio_dma_done);
- ao_
mutex_put(&ao_radio_mutex
);
+ ao_
radio_put(
);
return (ao_radio_dma_done & AO_DMA_DONE);
}
return (ao_radio_dma_done & AO_DMA_DONE);
}
@@
-394,8
+389,8
@@
ao_radio_rdf(int ms)
{
uint8_t i;
uint8_t pkt_len;
{
uint8_t i;
uint8_t pkt_len;
- ao_mutex_get(&ao_radio_mutex);
- ao_radio_
idle
();
+
+ ao_radio_
get
();
ao_radio_rdf_running = 1;
for (i = 0; i < sizeof (rdf_setup); i += 2)
RF[rdf_setup[i]] = rdf_setup[i+1];
ao_radio_rdf_running = 1;
for (i = 0; i < sizeof (rdf_setup); i += 2)
RF[rdf_setup[i]] = rdf_setup[i+1];
@@
-431,7
+426,7
@@
ao_radio_rdf(int ms)
ao_radio_idle();
for (i = 0; i < sizeof (telemetry_setup); i += 2)
RF[telemetry_setup[i]] = telemetry_setup[i+1];
ao_radio_idle();
for (i = 0; i < sizeof (telemetry_setup); i += 2)
RF[telemetry_setup[i]] = telemetry_setup[i+1];
- ao_
mutex_put(&ao_radio_mutex
);
+ ao_
radio_put(
);
}
void
}
void
@@
-448,18
+443,19
@@
ao_radio_rdf_abort(void)
ao_radio_abort();
}
ao_radio_abort();
}
+
/* Output carrier */
void
ao_radio_test(void)
{
/* Output carrier */
void
ao_radio_test(void)
{
- ao_
config_get(
);
- ao_
mutex_get(&ao_radio_mutex
);
- ao_radio_
idle
();
+ ao_
set_monitor(0
);
+ ao_
packet_slave_stop(
);
+ ao_radio_
get
();
printf ("Hit a character to stop..."); flush();
RFST = RFST_STX;
getchar();
ao_radio_idle();
printf ("Hit a character to stop..."); flush();
RFST = RFST_STX;
getchar();
ao_radio_idle();
- ao_
mutex_put(&ao_radio_mutex
);
+ ao_
radio_put(
);
putchar('\n');
}
putchar('\n');
}