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

TCP mode

This commit is contained in:
Mark Qvist 2014-04-28 17:47:32 +02:00
parent 8ba0ce4fad
commit f960709e82
10 changed files with 131 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modem/config.h
View File

@ -19,7 +19,7 @@
#define CONFIG_AFSK_RXTIMEOUT 0 // How long a read operation from the modem
// will wait for data before timing out.
#define CONFIG_AFSK_PREAMBLE_LEN 550UL // The length of the packet preamble in milliseconds
#define CONFIG_AFSK_TRAILER_LEN 10UL // The length of the packet tail in milliseconds
#define CONFIG_AFSK_PREAMBLE_LEN 400UL // The length of the packet preamble in milliseconds
#define CONFIG_AFSK_TRAILER_LEN 50UL // The length of the packet tail in milliseconds
#endif

1
Modem/hardware.c
View File

@ -114,7 +114,6 @@ void hw_afsk_adcInit(int ch, Afsk *_modem)
bool hw_ptt_on;
bool hw_afsk_dac_isr;
DECLARE_ISR(ADC_vect) {
TIFR1 = BV(ICF1);
// Call the routine for analysing the captured sample

32
Modem/main.c
View File

@ -4,7 +4,6 @@
//////////////////////////////////////////////////////
#include <cpu/irq.h> // Interrupt functionality from BertOS
#include "cfg/debug.h" // Debug configuration from BertOS
#include <drv/ser.h> // Serial driver from BertOS
#include <drv/timer.h> // Timer driver from BertOS
@ -15,6 +14,10 @@
#include "afsk.h" // Header for AFSK modem
#include "protocol/mp1.h" // Header for MP.1 protocol
#if SERIAL_DEBUG
#include "cfg/debug.h" // Debug configuration from BertOS
#endif
//////////////////////////////////////////////////////
// A few definitions //
@ -34,6 +37,7 @@ static int sbyte; // For holding byte read from serial port
static size_t serialLen = 0; // Counter for counting length of data from serial
static bool sertx = false; // Flag signifying whether it's time to send data
// Received on the serial port.
#define SER_BUFFER_FULL (serialLen < MP1_MAX_DATA_SIZE-1)
//////////////////////////////////////////////////////
// And here comes the actual program :) //
@ -85,6 +89,7 @@ int main(void)
init();
// Record the current tick count for time-keeping
ticks_t start = timer_clock();
ticks_t frameQueued = 0;
// Go into ye good ol' infinite loop
while (1)
@ -106,7 +111,7 @@ int main(void)
// If SERIAL_DEBUG is specified we'll handle
// serial data as direct human input and only
// transmit when we get a LF character
if (SERIAL_DEBUG) {
#if SERIAL_DEBUG
// If we have not yet surpassed the maximum frame length
// and the byte is not a "transmit" (newline) character,
// we should store it for transmission.
@ -121,7 +126,7 @@ int main(void)
// transmission flag to true.
sertx = true;
}
} else {
#else
// Otherwise we assume the modem is running
// in automated mode, and we push out data
// as it becomes available. We either transmit
@ -143,7 +148,7 @@ int main(void)
}
start = timer_clock();
}
#endif
} else {
if (!SERIAL_DEBUG && serialLen > 0 && timer_clock() - start > ms_to_ticks(TX_MAXWAIT)) {
sertx = true;
@ -152,6 +157,12 @@ int main(void)
// Check whether we should send data in our serial buffer
if (sertx) {
#if MP1_USE_TX_QUEUE
mp1QueueFrame(&mp1, serialBuffer, serialLen);
frameQueued = timer_clock();
sertx = false;
serialLen = 0;
#else
// Wait until incoming packets are done
if (!mp1CarrierSense(&mp1)) {
// And then send the data
@ -161,7 +172,20 @@ int main(void)
sertx = false;
serialLen = 0;
}
#endif
}
#if MP1_USE_TX_QUEUE
// We first wait a little to see if more
// frames are coming in.
if (timer_clock() - frameQueued > ms_to_ticks(MP1_QUEUE_TX_WAIT)) {
if (!ser_available(&ser) && !mp1CarrierSense(&mp1)) {
// And if not, we send process the frame
// queue if possible.
mp1ProcessQueue(&mp1);
}
}
#endif
}
return 0;
}

65
Modem/protocol/mp1.c
View File

@ -125,7 +125,6 @@ static void mp1Decode(MP1 *mp1) {
////////////////////////////////////////////////////////////
void mp1Poll(MP1 *mp1) {
int byte; // A place to store our read byte
sendParityBlock = false; // Reset our parity tx indicator
// Read bytes from the modem until we reach EOF
while ((byte = kfile_getc(mp1->modem)) != EOF) {
@ -263,7 +262,9 @@ void mp1Poll(MP1 *mp1) {
// corrected bytes.
mp1->checksum_in ^= a;
mp1->checksum_in ^= b;
// DEL kprintf("wt %d %c\n", mp1->packetLength-(MP1_DATA_BLOCK_SIZE)+((i/3)*2), a);
mp1->buffer[mp1->packetLength-(MP1_DATA_BLOCK_SIZE)+((i/3)*2)] = a;
// DEL kprintf("wt %d %c\n", mp1->packetLength-(MP1_DATA_BLOCK_SIZE-1)+((i/3)*2), b);
mp1->buffer[mp1->packetLength-(MP1_DATA_BLOCK_SIZE-1)+((i/3)*2)] = b;
}
@ -340,7 +341,7 @@ void mp1Poll(MP1 *mp1) {
// Now let's get to the actual reading of the data
if (mp1->reading) {
if (mp1->packetLength < MP1_MAX_FRAME_LENGTH) {
if (mp1->packetLength < MP1_MAX_FRAME_LENGTH + MP1_INTERLEAVE_SIZE) {
// If the length of the current incoming frame is
// still less than our max length, put the incoming
// byte in the buffer. When we have collected 3
@ -389,6 +390,7 @@ static void mp1WriteByte(MP1 *mp1, uint8_t byte) {
// be 3 bytes long due to the added parity
// byte.
static void mp1Putbyte(MP1 *mp1, uint8_t byte) {
// DEL kprintf("wb %c\n", byte);
mp1Interleave(mp1, byte);
if (sendParityBlock) {
@ -404,12 +406,17 @@ static void mp1Putbyte(MP1 *mp1, uint8_t byte) {
// to be transmitted, and structures it into
// a valid packet.
void mp1Send(MP1 *mp1, void *_buffer, size_t length) {
// Reset our parity tx indicator
sendParityBlock = false;
// Open transmitter and wait for MP1_TXDELAY msecs
AFSK_HW_PTT_ON();
ticks_t start = timer_clock();
if (!mp1->queueProcessing) {
while (timer_clock() - start < ms_to_ticks(MP1_TXDELAY)) {
cpu_relax();
}
}
// Get the transmit data buffer
uint8_t *buffer = (uint8_t *)_buffer;
@ -527,21 +534,29 @@ void mp1Send(MP1 *mp1, void *_buffer, size_t length) {
kfile_putc(HDLC_FLAG, mp1->modem);
// Turn off manual PTT
AFSK_HW_PTT_OFF();
if (!mp1->queueProcessing) AFSK_HW_PTT_OFF();
}
// This function will simply initialize
// the protocol context and allocate the
// needed memory.
void mp1Init(MP1 *mp1, KFile *modem, mp1_callback_t callback) {
// Allocate memory for our protocol "object"
memset(mp1, 0, sizeof(*mp1));
// Set references to our modem "object" and
// a callback for when a packet has been decoded
mp1->modem = modem;
mp1->callback = callback;
mp1->settleTimer = timer_clock();
mp1->randomSeed = 0;
// This function accepts a frame and stores
// it in the transmission queue
void mp1QueueFrame(MP1 *mp1, void *_buffer, size_t length) {
if (mp1->queueLength < MP1_TX_QUEUE_LENGTH) {
uint8_t *buffer = (uint8_t *)_buffer;
mp1->frameLengths[mp1->queueLength] = length;
memcpy(mp1->frameQueue[mp1->queueLength++], buffer, length);
}
}
// This function processes the transmission
// queue.
void mp1ProcessQueue(MP1 *mp1) {
int i = 0;
while (mp1->queueLength) {
mp1Send(mp1, mp1->frameQueue[i], mp1->frameLengths[i]);
i++;
mp1->queueLength--;
}
AFSK_HW_PTT_OFF();
}
// A simple form of P-persistent CSMA.
@ -563,7 +578,7 @@ bool mp1CarrierSense(MP1 *mp1) {
if (r < MP1_P_PERSISTENCE) {
return false;
} else {
mp1->settleTimer = timer_clock();
mp1->settleTimer = timer_clock() - MP1_SETTLE_TIME + MP1_SLOT_TIME;
return true;
}
} else {
@ -574,6 +589,24 @@ bool mp1CarrierSense(MP1 *mp1) {
}
}
// This function will simply initialize
// the protocol context and allocate the
// needed memory.
void mp1Init(MP1 *mp1, KFile *modem, mp1_callback_t callback) {
// Allocate memory for our protocol "object"
memset(mp1, 0, sizeof(*mp1));
// Set references to our modem "object" and
// a callback for when a packet has been decoded
mp1->modem = modem;
mp1->callback = callback;
mp1->settleTimer = timer_clock();
mp1->randomSeed = 0;
#if MP1_USE_TX_QUEUE
mp1->queueLength = 0;
mp1->queueProcessing = false;
#endif
}
// A handy debug function that can determine
// how much available memory we have left.
#if SERIAL_DEBUG

27
Modem/protocol/mp1.h
View File

@ -5,7 +5,10 @@
#include <io/kfile.h>
// Options
#define MP1_ENABLE_COMPRESSION false
#define MP1_ENABLE_TCP_COMPATIBILITY true
#if MP1_ENABLE_TCP_COMPATIBILITY
#define MP1_ENABLE_COMPRESSION false
#endif
#define MP1_ENABLE_CSMA true
// Frame sizing & checksum
@ -13,7 +16,10 @@
#if MP1_ENABLE_COMPRESSION
#define MP1_MAX_FRAME_LENGTH 22 * MP1_INTERLEAVE_SIZE
#else
#define MP1_MAX_FRAME_LENGTH 56 * MP1_INTERLEAVE_SIZE
#define MP1_MAX_FRAME_LENGTH 25 * MP1_INTERLEAVE_SIZE
#define MP1_USE_TX_QUEUE true
#define MP1_TX_QUEUE_LENGTH 2
#define MP1_QUEUE_TX_WAIT 16UL
#endif
#define MP1_HEADER_SIZE 1
#define MP1_CHECKSUM_SIZE 1
@ -24,8 +30,9 @@
// These two parameters are used for
// P-persistent CSMA
#define MP1_SETTLE_TIME 250UL // The minimum wait time before considering sending
#define MP1_P_PERSISTENCE 64UL // The probability (between 0 and 255) for sending
#define MP1_SETTLE_TIME 175UL // The minimum wait time before considering sending
#define MP1_SLOT_TIME 100UL // The time to wait if deciding not to send
#define MP1_P_PERSISTENCE 85UL // The probability (between 0 and 255) for sending
#define MP1_TXDELAY 0UL // Delay between turning on the transmitter and sending
// We need to know some basic HDLC flag bytes
@ -50,8 +57,7 @@ typedef void (*mp1_callback_t)(struct MP1Packet *packet);
// Struct for a protocol context
typedef struct MP1 {
uint8_t buffer[MP1_MAX_FRAME_LENGTH]; // A buffer for incoming packets
uint8_t fecBuffer[3]; // Forward Error Correction buffer
uint8_t buffer[MP1_MAX_FRAME_LENGTH+MP1_INTERLEAVE_SIZE]; // A buffer for incoming packets
KFile *modem; // KFile access to the modem
size_t packetLength; // Counter for received packet length
size_t readLength; // This is the full read length, including parity bytes
@ -67,6 +73,13 @@ typedef struct MP1 {
uint8_t interleaveOut[MP1_INTERLEAVE_SIZE]; // A buffer for interleaving bytes before they are sent
uint8_t interleaveIn[MP1_INTERLEAVE_SIZE]; // A buffer for storing interleaved bytes before they are deinterleaved
uint8_t randomSeed; // A seed for the pseudo-random number generator
#if MP1_USE_TX_QUEUE
bool queueProcessing; // For sending queued frames without preamble after first one
size_t queueLength; // The length of the transmission queue
size_t frameLengths[MP1_TX_QUEUE_LENGTH]; // The lengths of the frames in the queue
uint8_t frameQueue[MP1_TX_QUEUE_LENGTH] // A buffer for a queued frame
[MP1_MAX_DATA_SIZE];
#endif
} MP1;
// A struct encapsulating a network packet
@ -80,6 +93,8 @@ void mp1Init(MP1 *mp1, KFile *modem, mp1_callback_t callback);
void mp1Read(MP1 *mp1, int byte);
void mp1Poll(MP1 *mp1);
void mp1Send(MP1 *mp1, void *_buffer, size_t length);
void mp1QueueFrame(MP1 *mp1, void *_buffer, size_t length);
void mp1ProcessQueue(MP1 *mp1);
bool mp1CarrierSense(MP1 *mp1);
int freeRam(void);

88
bertos/cfg/cfg_dac.h
View File

@ -1,88 +0,0 @@
/**
* \file
* <!--
* This file is part of BeRTOS.
*
* Bertos is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
* Copyright 2011 Develer S.r.l. (http://www.develer.com/)
* All Rights Reserved.
* -->
*
* \brief Configuration file for DAC module.
*
*
* \author Daniele Basile <asterix@develer.com>
*/
#ifndef CFG_DAC_H
#define CFG_DAC_H
/**
* Module logging level.
*
* $WIZ$ type = "enum"
* $WIZ$ value_list = "log_level"
*/
#define DAC_LOG_LEVEL LOG_LVL_WARN
/**
* Module logging format.
*
* $WIZ$ type = "enum"
* $WIZ$ value_list = "log_format"
*/
#define DAC_LOG_FORMAT LOG_FMT_TERSE
/**
* DAC Refresh Period = 1024*REFRESH/DACC Clock
*
* $WIZ$ type = "int"
* $WIZ$ supports = "sam3x"
* $WIZ$ min = 0
* $WIZ$ max = 65536
*/
#define CONFIG_DAC_REFRESH 16
/**
* DAC Startup Time Selection.
* see datasheet table.
*
* $WIZ$ type = "int"
* $WIZ$ supports = "sam3x"
* $WIZ$ min = 0
* $WIZ$ max = 63
*/
#define CONFIG_DAC_STARTUP 0
/**
* DAC Trigger Selection.
*
* $WIZ$ type = "enum"
* $WIZ$ value_list = "sam3x_dac_tc"
* $WIZ$ supports = "sam3x"
*/
#define CONFIG_DAC_TIMER DACC_TRGSEL_TIO_CH0
#endif /* CFG_DAC_H */

65
bertos/cfg/cfg_random.h
View File

@ -1,65 +0,0 @@
/**
* \file
* <!--
* This file is part of BeRTOS.
*
* Bertos is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
* Copyright 2011 Develer S.r.l. (http://www.develer.com/)
*
* -->
*
* \author Andrea Righi <arighi@develer.com>
*
* \brief Configuration file for the "random" module
*/
#ifndef CFG_RANDOM_H
#define CFG_RANDOM_H
/**
* Module logging level.
*
* $WIZ$ type = "enum"
* $WIZ$ value_list = "log_level"
*/
#define RANDOM_LOG_LEVEL LOG_LVL_INFO
/**
* module logging format.
*
* $WIZ$ type = "enum"
* $WIZ$ value_list = "log_format"
*/
#define RANDOM_LOG_FORMAT LOG_FMT_TERSE
/**
* Random security level.
*
* $WIZ$ type = "enum"
* $WIZ$ value_list = "random_level"
*/
#define RANDOM_SECURITY_LEVEL RANDOM_SECURITY_MINIMUM
#endif /* CFG_RANDOM_H */

55
bertos/cfg/cfg_randpool.h
View File

@ -1,55 +0,0 @@
/**
* \file
* <!--
* This file is part of BeRTOS.
*
* Bertos is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
* Copyright 2008 Develer S.r.l. (http://www.develer.com/)
* All Rights Reserved.
* -->
*
* \brief Configuration file for randpool module.
*
*
* \author Daniele Basile <asterix@develer.com>
*/
#ifndef CFG_RANDPOOL_H
#define CFG_RANDPOOL_H
/**
* Define a size, in byte, of entropy pool.
* $WIZ$ type = "int"
* $WIZ$ min = 1
*/
#define CONFIG_SIZE_ENTROPY_POOL 64
/// Enable timer in randpool algo. $WIZ$ type = "boolean"
#define CONFIG_RANDPOOL_TIMER 1
#endif /* CFG_RANDPOOL_H */

8
bertos/cfg/cfg_ser.h
View File

@ -113,7 +113,7 @@
* $WIZ$ min = 2
* $WIZ$ supports = "avr"
*/
#define CONFIG_SPI_TXBUFSIZE 32
#define CONFIG_SPI_TXBUFSIZE 0
/**
* Size of the inbound FIFO buffer for SPI port [bytes].
@ -121,7 +121,7 @@
* $WIZ$ min = 2
* $WIZ$ supports = "avr"
*/
#define CONFIG_SPI_RXBUFSIZE 32
#define CONFIG_SPI_RXBUFSIZE 0
/**
* Size of the outbound FIFO buffer for SPI port 0 [bytes].
@ -129,7 +129,7 @@
* $WIZ$ min = 2
* $WIZ$ supports = "at91"
*/
#define CONFIG_SPI0_TXBUFSIZE 32
#define CONFIG_SPI0_TXBUFSIZE 0
/**
* Size of the inbound FIFO buffer for SPI port 0 [bytes].
@ -137,7 +137,7 @@
* $WIZ$ min = 2
* $WIZ$ supports = "at91"
*/
#define CONFIG_SPI0_RXBUFSIZE 32
#define CONFIG_SPI0_RXBUFSIZE 0
/**
* Size of the outbound FIFO buffer for SPI port 1 [bytes].

2
buildrev.h
View File

@ -1,2 +1,2 @@
#define VERS_BUILD 1603
#define VERS_BUILD 1724
#define VERS_HOST "shard"