Mirrors
/
OpenModem
mirror of https://github.com/markqvist/OpenModem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Still working

This commit is contained in:
Mark Qvist 2014-04-03 22:54:34 +02:00
parent 9b435bbd59
commit 73b8a6ed0b
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modem/afsk.c
View File

@ -20,8 +20,8 @@
#define PHASE_BIT 8
#define PHASE_INC 1
#define PHASE_MAX (SAMPLEPERBIT * PHASE_BIT)
#define PHASE_THRES (PHASE_MAX / 2) // - PHASE_BIT / 2)
#define PHASE_MAX (SAMPLESPERBIT * PHASE_BIT)
#define PHASE_THRES (PHASE_MAX / 2)
// Modulator constants
#define MARK_FREQ 1200
@ -32,7 +32,7 @@
//Ensure sample rate is a multiple of bit rate
STATIC_ASSERT(!(CONFIG_AFSK_DAC_SAMPLERATE % BITRATE));
#define DAC_SAMPLEPERBIT (CONFIG_AFSK_DAC_SAMPLERATE / BITRATE)
#define DAC_SAMPLESPERBIT (CONFIG_AFSK_DAC_SAMPLERATE / BITRATE)
/**
* Sine table for the first quarter of wave.
@ -252,7 +252,7 @@ void afsk_adc_isr(Afsk *af, int8_t curr_sample)
* otherwise is a 0.
* This algorithm presumes that there are 8 samples per bit.
*/
STATIC_ASSERT(SAMPLEPERBIT == 8);
STATIC_ASSERT(SAMPLESPERBIT == 8);
uint8_t bits = af->sampled_bits & 0x07;
if (bits == 0x07 // 111, 3 bits set to 1
|| bits == 0x06 // 110, 2 bits
@ -405,7 +405,7 @@ uint8_t afsk_dac_isr(Afsk *af)
/* Go to the next bit */
af->tx_bit <<= 1;
}
af->sample_count = DAC_SAMPLEPERBIT;
af->sample_count = DAC_SAMPLESPERBIT;
}
/* Get new sample and put it out on the DAC */
@ -508,7 +508,7 @@ void afsk_init(Afsk *af, int adc_ch, int dac_ch)
fifo_init(&af->rx_fifo, af->rx_buf, sizeof(af->rx_buf));
/* Fill sample FIFO with 0 */
for (int i = 0; i < SAMPLEPERBIT / 2; i++)
for (int i = 0; i < SAMPLESPERBIT / 2; i++)
fifo_push(&af->delay_fifo, 0);
fifo_init(&af->tx_fifo, af->tx_buf, sizeof(af->tx_buf));

6
Modem/afsk.h
View File

@ -12,7 +12,7 @@
#define SAMPLERATE 9600
#define BITRATE 1200
#define SAMPLEPERBIT (SAMPLERATE / BITRATE)
#define SAMPLESPERBIT (SAMPLERATE / BITRATE)
typedef struct Hdlc
{
@ -37,7 +37,7 @@ typedef struct Afsk
uint16_t phase_acc;
uint16_t phase_inc;
FIFOBuffer delay_fifo;
int8_t delay_buf[SAMPLEPERBIT / 2 + 1];
int8_t delay_buf[SAMPLESPERBIT / 2 + 1];
FIFOBuffer rx_fifo;
uint8_t rx_buf[CONFIG_AFSK_RX_BUFLEN];
FIFOBuffer tx_fifo;
@ -54,7 +54,7 @@ typedef struct Afsk
uint16_t trailer_len;
} Afsk;
#define KFT_AFSK MAKE_ID('A', 'F', 'S', 'K')
#define KFT_AFSK MAKE_ID('F', 'S', 'K', 'M')
INLINE Afsk *AFSK_CAST(KFile *fd)
{

5
Modem/hardware.h
View File

@ -10,13 +10,12 @@ struct Afsk;
void hw_afsk_adcInit(int ch, struct Afsk *_ctx);
void hw_afsk_dacInit(int ch, struct Afsk *_ctx);
// ADC initialization
#define AFSK_ADC_INIT(ch, ctx) hw_afsk_adcInit(ch, ctx)
// LED on/off (pin 13)
#define AFSK_STROBE_INIT() do { DDRB |= BV(5); } while (0)
#define AFSK_STROBE_ON() do { PORTB |= BV(5); } while (0)
#define AFSK_STROBE_OFF() do { PORTB &= ~BV(5); } while (0)
// Initialization, start and stop for DAC

2
Modem/main.c
View File

@ -30,7 +30,7 @@ static void init(void)
int main(void)
{
init();
ticks_t start = timer_clock();
//ticks_t start = timer_clock();
while (1)
{

2
buildrev.h
View File

@ -1,2 +1,2 @@
#define VERS_BUILD 30
#define VERS_BUILD 38
#define VERS_HOST "vixen"