APRS demonstration
This commit is contained in:
parent
a74a7ad1ce
commit
416247201e
|
@ -31,6 +31,7 @@ Modem_WIZARD_CSRC = \
|
||||||
bertos/mware/hex.c \
|
bertos/mware/hex.c \
|
||||||
bertos/struct/heap.c \
|
bertos/struct/heap.c \
|
||||||
bertos/net/ax25.c \
|
bertos/net/ax25.c \
|
||||||
|
bertos/algo/crc_ccitt.c \
|
||||||
#
|
#
|
||||||
|
|
||||||
# Files automatically generated by the wizard. DO NOT EDIT, USE Modem_USER_PCSRC INSTEAD!
|
# Files automatically generated by the wizard. DO NOT EDIT, USE Modem_USER_PCSRC INSTEAD!
|
||||||
|
|
129
Modem/main.c
129
Modem/main.c
|
@ -14,7 +14,6 @@
|
||||||
#include <net/ax25.h>
|
#include <net/ax25.h>
|
||||||
|
|
||||||
#include "afsk.h" // Header for AFSK modem
|
#include "afsk.h" // Header for AFSK modem
|
||||||
#include "protocol/mp1.h" // Header for MP.1 protocol
|
|
||||||
|
|
||||||
#if SERIAL_DEBUG
|
#if SERIAL_DEBUG
|
||||||
#include "cfg/debug.h" // Debug configuration from BertOS
|
#include "cfg/debug.h" // Debug configuration from BertOS
|
||||||
|
@ -26,19 +25,21 @@
|
||||||
//////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////
|
||||||
|
|
||||||
static Afsk afsk; // Declare a AFSK modem struct
|
static Afsk afsk; // Declare a AFSK modem struct
|
||||||
static MP1 mp1; // Declare a protocol struct
|
static AX25Ctx ax25; // Declare a protocol struct
|
||||||
static Serial ser; // Declare a serial interface struct
|
static Serial ser; // Declare a serial interface struct
|
||||||
|
|
||||||
#define ADC_CH 0 // Define which channel (pin) we want
|
#define ADC_CH 0 // Define which channel (pin) we want
|
||||||
// for the ADC (this is A0 on arduino)
|
// for the ADC (this is A0 on arduino)
|
||||||
|
|
||||||
|
#define YOUR_CALLSIGN "nocall"
|
||||||
|
#define TO_CALL "apzmdm"
|
||||||
|
static AX25Call path[] = AX25_PATH(AX25_CALL(TO_CALL, 0), AX25_CALL(YOUR_CALLSIGN, 0), AX25_CALL("wide1", 1), AX25_CALL("wide2", 2));
|
||||||
|
#define SEND_TEST_PACKETS true
|
||||||
|
#define TEST_INTERVAL 15000L
|
||||||
|
#define APRS_MSG "Test APRS packet"
|
||||||
|
|
||||||
|
|
||||||
static uint8_t serialBuffer[MP1_MAX_DATA_SIZE]; // This is a buffer for incoming serial data
|
|
||||||
|
|
||||||
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)
|
#define SER_BUFFER_FULL (serialLen < MP1_MAX_DATA_SIZE-1)
|
||||||
|
|
||||||
//////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////
|
||||||
|
@ -48,14 +49,14 @@ static bool sertx = false; // Flag signifying whether it's
|
||||||
// This is a callback we register with the protocol,
|
// This is a callback we register with the protocol,
|
||||||
// so we can process each packet as they are decoded.
|
// so we can process each packet as they are decoded.
|
||||||
// Right now it just prints the packet to the serial port.
|
// Right now it just prints the packet to the serial port.
|
||||||
static void mp1Callback(struct MP1Packet *packet) {
|
static void message_callback(struct AX25Msg *msg)
|
||||||
if (SERIAL_DEBUG) {
|
{
|
||||||
kfile_printf(&ser.fd, "%.*s\n", packet->dataLength, packet->data);
|
kfile_printf(&ser.fd, "\n\nSRC[%.6s-%d], DST[%.6s-%d]\r\n", msg->src.call, msg->src.ssid, msg->dst.call, msg->dst.ssid);
|
||||||
} else {
|
|
||||||
for (unsigned long i = 0; i < packet->dataLength; i++) {
|
for (int i = 0; i < msg->rpt_cnt; i++)
|
||||||
kfile_putc(packet->data[i], &ser.fd);
|
kfile_printf(&ser.fd, "via: [%.6s-%d]\r\n", msg->rpt_lst[i].call, msg->rpt_lst[i].ssid);
|
||||||
}
|
|
||||||
}
|
kfile_printf(&ser.fd, "DATA: %.*s\r\n", msg->len, msg->info);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Simple initialization function.
|
// Simple initialization function.
|
||||||
|
@ -80,7 +81,7 @@ static void init(void)
|
||||||
// Create a modem context
|
// Create a modem context
|
||||||
afsk_init(&afsk, ADC_CH);
|
afsk_init(&afsk, ADC_CH);
|
||||||
// ... and a protocol context with the modem
|
// ... and a protocol context with the modem
|
||||||
mp1Init(&mp1, &afsk.fd, mp1Callback);
|
ax25_init(&ax25, &afsk.fd, message_callback);
|
||||||
|
|
||||||
// That's all!
|
// That's all!
|
||||||
}
|
}
|
||||||
|
@ -91,105 +92,21 @@ int main(void)
|
||||||
init();
|
init();
|
||||||
// Record the current tick count for time-keeping
|
// Record the current tick count for time-keeping
|
||||||
ticks_t start = timer_clock();
|
ticks_t start = timer_clock();
|
||||||
#if MP1_USE_TX_QUEUE
|
|
||||||
ticks_t frameQueued = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Go into ye good ol' infinite loop
|
// Go into ye good ol' infinite loop
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
// First we instruct the protocol to check for
|
// First we instruct the protocol to check for
|
||||||
// incoming data
|
// incoming data
|
||||||
mp1Poll(&mp1);
|
ax25_poll(&ax25);
|
||||||
|
|
||||||
|
// Use AX.25 to send test data
|
||||||
// If there was actually some data waiting for us
|
if (SEND_TEST_PACKETS && timer_clock() - start > ms_to_ticks(TEST_INTERVAL))
|
||||||
// there, let's se what it tastes like :)
|
{
|
||||||
if (!sertx && ser_available(&ser)) {
|
start = timer_clock();
|
||||||
// We then read a byte from the serial port.
|
ax25_sendVia(&ax25, path, countof(path), APRS_MSG, sizeof(APRS_MSG));
|
||||||
// Notice that we use "_nowait" since we can't
|
|
||||||
// have this blocking execution until a byte
|
|
||||||
// comes in.
|
|
||||||
sbyte = ser_getchar_nowait(&ser);
|
|
||||||
|
|
||||||
// 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 we have not yet surpassed the maximum frame length
|
|
||||||
// and the byte is not a "transmit" (newline) character,
|
|
||||||
// we should store it for transmission.
|
|
||||||
if ((serialLen < MP1_MAX_DATA_SIZE) && (sbyte != 10)) {
|
|
||||||
// Put the read byte into the buffer;
|
|
||||||
serialBuffer[serialLen] = sbyte;
|
|
||||||
// Increment the read length counter
|
|
||||||
serialLen++;
|
|
||||||
} else {
|
|
||||||
// If one of the above conditions were actually the
|
|
||||||
// case, it means we have to transmit, se we set
|
|
||||||
// transmission flag to true.
|
|
||||||
sertx = true;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
// Otherwise we assume the modem is running
|
|
||||||
// in automated mode, and we push out data
|
|
||||||
// as it becomes available. We either transmit
|
|
||||||
// immediately when the max frame length has
|
|
||||||
// been reached, or when we get no input for
|
|
||||||
// a certain amount of time.
|
|
||||||
|
|
||||||
if (serialLen < MP1_MAX_DATA_SIZE-1) {
|
|
||||||
// Put the read byte into the buffer;
|
|
||||||
serialBuffer[serialLen] = sbyte;
|
|
||||||
// Increment the read length counter
|
|
||||||
serialLen++;
|
|
||||||
} else {
|
|
||||||
// If max frame length has been reached
|
|
||||||
// we need to transmit.
|
|
||||||
serialBuffer[serialLen] = sbyte;
|
|
||||||
serialLen++;
|
|
||||||
sertx = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
start = timer_clock();
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
if (!SERIAL_DEBUG && serialLen > 0 && timer_clock() - start > ms_to_ticks(TX_MAXWAIT)) {
|
|
||||||
sertx = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
|
||||||
mp1Send(&mp1, serialBuffer, serialLen);
|
|
||||||
|
|
||||||
// Reset the transmission flag and length counter
|
|
||||||
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;
|
return 0;
|
||||||
}
|
}
|
|
@ -0,0 +1,102 @@
|
||||||
|
/**
|
||||||
|
* \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 2003,2004 Develer S.r.l. (http://www.develer.com/)
|
||||||
|
* Copyright 1999 Bernie Innocenti <bernie@codewiz.org>
|
||||||
|
*
|
||||||
|
* -->
|
||||||
|
*
|
||||||
|
* \brief CRC table and support routines
|
||||||
|
*
|
||||||
|
* \author Bernie Innocenti <bernie@codewiz.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "crc.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The boot on AVR cpu is placed at the end of flash memory, but the avr
|
||||||
|
* address memory by byte and the pointers are 16bits long, so we are able
|
||||||
|
* to address 64Kbyte memory max. For this reason we can't read the crctab
|
||||||
|
* from flash, because it is placed at the end of memory. This is true every
|
||||||
|
* time we have an AVR cpu with more that 64Kbyte of flash. To fix this problem
|
||||||
|
* we let the compiler copy the table in RAM at startup. Obviously this solution
|
||||||
|
* is not efficent, but for now this is the only way.
|
||||||
|
*/
|
||||||
|
#if CPU_HARVARD && !(defined(ARCH_BOOT) && (ARCH & ARCH_BOOT))
|
||||||
|
#define CRC_TABLE const uint16_t PROGMEM crc16tab[256]
|
||||||
|
#else
|
||||||
|
#define CRC_TABLE const uint16_t crc16tab[256]
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* crctab calculated by Mark G. Mendel, Network Systems Corporation
|
||||||
|
*/
|
||||||
|
CRC_TABLE = {
|
||||||
|
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
|
||||||
|
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
|
||||||
|
0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
|
||||||
|
0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
|
||||||
|
0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
|
||||||
|
0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
|
||||||
|
0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
|
||||||
|
0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
|
||||||
|
0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
|
||||||
|
0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
|
||||||
|
0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
|
||||||
|
0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
|
||||||
|
0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
|
||||||
|
0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
|
||||||
|
0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
|
||||||
|
0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
|
||||||
|
0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
|
||||||
|
0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
|
||||||
|
0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
|
||||||
|
0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
|
||||||
|
0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
|
||||||
|
0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
|
||||||
|
0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
|
||||||
|
0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
|
||||||
|
0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
|
||||||
|
0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
|
||||||
|
0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
|
||||||
|
0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
|
||||||
|
0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
|
||||||
|
0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
|
||||||
|
0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
|
||||||
|
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
|
||||||
|
};
|
||||||
|
|
||||||
|
uint16_t crc16(uint16_t crc, const void *buffer, size_t len)
|
||||||
|
{
|
||||||
|
const unsigned char *buf = (const unsigned char *)buffer;
|
||||||
|
while(len--)
|
||||||
|
crc = UPDCRC16(*buf++, crc);
|
||||||
|
|
||||||
|
return crc;
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,115 @@
|
||||||
|
/**
|
||||||
|
* \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 2003, 2004 Develer S.r.l. (http://www.develer.com/)
|
||||||
|
* Copyright 1999 Bernie Innocenti <bernie@codewiz.org>
|
||||||
|
*
|
||||||
|
* -->
|
||||||
|
*
|
||||||
|
* \brief Cyclic Redundancy Check 16 (CRC). This algorithm is the one used by the XMODEM protocol.
|
||||||
|
*
|
||||||
|
* \note This algorithm is incompatible with the CCITT-CRC16.
|
||||||
|
*
|
||||||
|
* This code is based on the article Copyright 1986 Stephen Satchell.
|
||||||
|
*
|
||||||
|
* Programmers may incorporate any or all code into their programs,
|
||||||
|
* giving proper credit within the source. Publication of the
|
||||||
|
* source routines is permitted so long as proper credit is given
|
||||||
|
* to Stephen Satchell, Satchell Evaluations and Chuck Forsberg,
|
||||||
|
* Omen Technology.
|
||||||
|
*
|
||||||
|
* \author Bernie Innocenti <bernie@codewiz.org>
|
||||||
|
*
|
||||||
|
* $WIZ$ module_name = "crc16"
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ALGO_CRC_H
|
||||||
|
#define ALGO_CRC_H
|
||||||
|
|
||||||
|
#include "cfg/cfg_arch.h"
|
||||||
|
|
||||||
|
#include <cfg/compiler.h>
|
||||||
|
#include <cpu/pgm.h>
|
||||||
|
|
||||||
|
EXTERN_C_BEGIN
|
||||||
|
|
||||||
|
/* CRC table */
|
||||||
|
extern const uint16_t crc16tab[256];
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Compute the updated CRC16 value for one octet (macro version)
|
||||||
|
*
|
||||||
|
* \note This version is only intended for old/broken compilers.
|
||||||
|
* Use the inline function in new code.
|
||||||
|
*
|
||||||
|
* \param c New octet (range 0-255)
|
||||||
|
* \param oldcrc Previous CRC16 value (referenced twice, beware of side effects)
|
||||||
|
*/
|
||||||
|
#if CPU_HARVARD && !(defined(ARCH_BOOT) && (ARCH & ARCH_BOOT))
|
||||||
|
#define UPDCRC16(c, oldcrc) (pgm_read_uint16_t(&crc16tab[((oldcrc) >> 8) ^ ((unsigned char)(c))]) ^ ((oldcrc) << 8))
|
||||||
|
#else
|
||||||
|
#define UPDCRC16(c, oldcrc) ((crc16tab[((oldcrc) >> 8) ^ ((unsigned char)(c))]) ^ ((oldcrc) << 8))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/** CRC-16 init value */
|
||||||
|
#define CRC16_INIT_VAL ((uint16_t)0)
|
||||||
|
|
||||||
|
#ifdef INLINE
|
||||||
|
/**
|
||||||
|
* \brief Compute the updated CRC16 value for one octet (inline version)
|
||||||
|
*/
|
||||||
|
INLINE uint16_t updcrc16(uint8_t c, uint16_t oldcrc)
|
||||||
|
{
|
||||||
|
#if CPU_HARVARD && !(defined(ARCH_BOOT) && (ARCH & ARCH_BOOT))
|
||||||
|
return pgm_read_uint16_t(&crc16tab[(oldcrc >> 8) ^ c]) ^ (oldcrc << 8);
|
||||||
|
#else
|
||||||
|
return crc16tab[(oldcrc >> 8) ^ c] ^ (oldcrc << 8);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif // INLINE
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function implements the CRC 16 calculation on a buffer.
|
||||||
|
*
|
||||||
|
* \param crc Current CRC16 value.
|
||||||
|
* \param buf The buffer to perform CRC calculation on.
|
||||||
|
* \param len The length of the Buffer.
|
||||||
|
*
|
||||||
|
* \return The updated CRC16 value.
|
||||||
|
*/
|
||||||
|
extern uint16_t crc16(uint16_t crc, const void *buf, size_t len);
|
||||||
|
|
||||||
|
int crc_testSetup(void);
|
||||||
|
int crc_testRun(void);
|
||||||
|
int crc_testTearDown(void);
|
||||||
|
|
||||||
|
EXTERN_C_END
|
||||||
|
|
||||||
|
#endif /* ALGO_CRC_H */
|
|
@ -0,0 +1,83 @@
|
||||||
|
/**
|
||||||
|
* \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 2009 Develer S.r.l. (http://www.develer.com/)
|
||||||
|
*
|
||||||
|
* -->
|
||||||
|
*
|
||||||
|
* \brief CRC-CCITT table and support routines
|
||||||
|
*
|
||||||
|
* \author Francesco Sacchi <batt@develer.com>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "crc_ccitt.h"
|
||||||
|
|
||||||
|
const uint16_t PROGMEM crc_ccitt_tab[256] = {
|
||||||
|
0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
|
||||||
|
0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
|
||||||
|
0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
|
||||||
|
0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
|
||||||
|
0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
|
||||||
|
0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
|
||||||
|
0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
|
||||||
|
0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
|
||||||
|
0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
|
||||||
|
0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
|
||||||
|
0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
|
||||||
|
0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
|
||||||
|
0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
|
||||||
|
0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
|
||||||
|
0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
|
||||||
|
0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
|
||||||
|
0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
|
||||||
|
0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
|
||||||
|
0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
|
||||||
|
0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
|
||||||
|
0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
|
||||||
|
0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
|
||||||
|
0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
|
||||||
|
0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
|
||||||
|
0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
|
||||||
|
0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
|
||||||
|
0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
|
||||||
|
0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
|
||||||
|
0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
|
||||||
|
0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
|
||||||
|
0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
|
||||||
|
0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78,
|
||||||
|
};
|
||||||
|
|
||||||
|
uint16_t crc_ccitt(uint16_t crc, const void *buffer, size_t len)
|
||||||
|
{
|
||||||
|
const unsigned char *buf = (const unsigned char *)buffer;
|
||||||
|
while (len--)
|
||||||
|
crc = updcrc_ccitt(*buf++, crc);
|
||||||
|
|
||||||
|
return crc;
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,78 @@
|
||||||
|
/**
|
||||||
|
* \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 2009 Develer S.r.l. (http://www.develer.com/)
|
||||||
|
*
|
||||||
|
* -->
|
||||||
|
*
|
||||||
|
* \brief CCITT Cyclic Redundancy Check (CRC-CCITT).
|
||||||
|
*
|
||||||
|
* \note This algorithm is incompatible with the CRC16.
|
||||||
|
*
|
||||||
|
* \author Francesco Sacchi <batt@develer.com>
|
||||||
|
*
|
||||||
|
* $WIZ$ module_name = "crc-ccitt"
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ALGO_CRC_CCITT_H
|
||||||
|
#define ALGO_CRC_CCITT_H
|
||||||
|
|
||||||
|
#include <cfg/compiler.h>
|
||||||
|
#include <cpu/pgm.h>
|
||||||
|
|
||||||
|
EXTERN_C_BEGIN
|
||||||
|
|
||||||
|
/* CRC table */
|
||||||
|
extern const uint16_t crc_ccitt_tab[256];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Compute the updated CRC-CCITT value for one octet (inline version)
|
||||||
|
*/
|
||||||
|
INLINE uint16_t updcrc_ccitt(uint8_t c, uint16_t oldcrc)
|
||||||
|
{
|
||||||
|
return (oldcrc >> 8) ^ pgm_read16(&crc_ccitt_tab[(oldcrc ^ c) & 0xff]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** CRC-CCITT init value */
|
||||||
|
#define CRC_CCITT_INIT_VAL ((uint16_t)0xFFFF)
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function implements the CRC-CCITT calculation on a buffer.
|
||||||
|
*
|
||||||
|
* \param crc Current CRC-CCITT value.
|
||||||
|
* \param buf The buffer to perform CRC calculation on.
|
||||||
|
* \param len The length of the Buffer.
|
||||||
|
*
|
||||||
|
* \return The updated CRC-CCITT value.
|
||||||
|
*/
|
||||||
|
extern uint16_t crc_ccitt(uint16_t crc, const void *buf, size_t len);
|
||||||
|
|
||||||
|
EXTERN_C_END
|
||||||
|
|
||||||
|
#endif /* ALGO_CRC_CCITT_H */
|
|
@ -1,2 +1,2 @@
|
||||||
#define VERS_BUILD 1762
|
#define VERS_BUILD 1779
|
||||||
#define VERS_HOST "shard"
|
#define VERS_HOST "shard"
|
||||||
|
|
BIN
images/Modem.bin
BIN
images/Modem.bin
Binary file not shown.
BIN
images/Modem.elf
BIN
images/Modem.elf
Binary file not shown.
2710
images/Modem.hex
2710
images/Modem.hex
File diff suppressed because it is too large
Load Diff
1097
images/Modem.map
1097
images/Modem.map
File diff suppressed because it is too large
Load Diff
2710
images/Modem.s19
2710
images/Modem.s19
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue