third-party
/
HamShield_KISS
mirror of https://github.com/EnhancedRadioDevices/HamShield_KISS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix naming conflict

This commit is contained in:
Morgan Redfield 2018-06-03 21:28:10 -07:00
parent 591796fb99
commit 37c93469c7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/AX25.cpp
View File

@ -13,7 +13,7 @@ volatile unsigned long lastTx = 0;
volatile unsigned long lastTxEnd = 0; volatile unsigned long lastTxEnd = 0;
volatile unsigned long lastRx = 0; volatile unsigned long lastRx = 0;
Bell202 afsk; Bell202 afsk_phy;
#ifdef PACKET_PREALLOCATE #ifdef PACKET_PREALLOCATE
SimpleFIFO<AX25::Packet *,PPOOL_SIZE> preallocPool; SimpleFIFO<AX25::Packet *,PPOOL_SIZE> preallocPool;
@ -21,13 +21,13 @@ AX25::Packet preallocPackets[PPOOL_SIZE];
#endif #endif
bool AX25::enabled() { return afsk.enabled(); } bool AX25::enabled() { return afsk_phy.enabled(); }
void AX25::start(DDS *d) { afsk.start(d); } void AX25::start(DDS *d) { afsk_phy.start(d); }
// Determine what we want to do on this ADC tick. // Determine what we want to do on this ADC tick.
void AX25::timer() { void AX25::timer() {
static uint8_t tcnt = 0; static uint8_t tcnt = 0;
if(++tcnt == T_BIT && afsk.isSending()) { if(++tcnt == T_BIT && afsk_phy.isSending()) {
PORTD |= _BV(6); PORTD |= _BV(6);
// Only run the encoder every 8th tick // Only run the encoder every 8th tick
// This is actually DDS RefClk / 1200 = 8, set as T_BIT // This is actually DDS RefClk / 1200 = 8, set as T_BIT
@ -115,15 +115,15 @@ void AX25::Encoder::process() {
// NRZI and AFSK uses toggling 0s, "no change" on 1 // NRZI and AFSK uses toggling 0s, "no change" on 1
// So, if not a 1, toggle to the opposite tone // So, if not a 1, toggle to the opposite tone
bool currentTone = afsk.encoderGetTone(); bool currentTone = afsk_phy.encoderGetTone();
if(!currentBit) if(!currentBit)
currentTone = !currentTone; currentTone = !currentTone;
afsk.encoderSetTone(currentTone); afsk_phy.encoderSetTone(currentTone);
} }
bool AX25::Encoder::start() { bool AX25::Encoder::start() {
if(!done || afsk.isSending()) { if(!done || afsk_phy.isSending()) {
return false; return false;
} }
@ -144,7 +144,7 @@ bool AX25::Encoder::start() {
maxTx = 3; maxTx = 3;
nextByte = 0; nextByte = 0;
afsk.encoderStart(); afsk_phy.encoderStart();
return true; return true;
} }
@ -152,7 +152,7 @@ void AX25::Encoder::stop() {
randomWait = 0; randomWait = 0;
done = true; done = true;
afsk.encoderStop(); afsk_phy.encoderStop();
} }
AX25::Decoder::Decoder() { AX25::Decoder::Decoder() {
@ -210,10 +210,10 @@ bool AX25::HDLCDecode::hdlcParse(bool bit, SimpleFIFO<uint8_t,AFSK_RX_FIFO_LEN>
// Handle the A/D converter interrupt (hopefully quickly :) // Handle the A/D converter interrupt (hopefully quickly :)
void AX25::Decoder::process(int8_t adc_val) { void AX25::Decoder::process(int8_t adc_val) {
bool parse_ready = afsk.decoderProcess(adc_val); bool parse_ready = afsk_phy.decoderProcess(adc_val);
if (parse_ready) { if (parse_ready) {
hdlc.hdlcParse(!EDGE_FOUND(afsk.found_bits), &rx_fifo); // Process it hdlc.hdlcParse(!EDGE_FOUND(afsk_phy.found_bits), &rx_fifo); // Process it
} }
} }
@ -304,7 +304,7 @@ bool AX25::Decoder::read() {
void AX25::Decoder::start() { void AX25::Decoder::start() {
// Do this in start to allocate our first packet // Do this in start to allocate our first packet
currentPacket = pBuf.makePacket(PACKET_MAX_LEN); currentPacket = pBuf.makePacket(PACKET_MAX_LEN);
afsk.decoderStart(); afsk_phy.decoderStart();
} }
AX25::PacketBuffer::PacketBuffer() { AX25::PacketBuffer::PacketBuffer() {