projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug found by Massimiliano Cialdi:
[bertos.git]
/
bertos
/
net
/
afsk_test.c
diff --git
a/bertos/net/afsk_test.c
b/bertos/net/afsk_test.c
index 7ce7b4c60d6c62c9ba61ff08a4af206779bde3bd..cd434084f83da2caf36817761260dece8e0b5a9e 100644
(file)
--- a/
bertos/net/afsk_test.c
+++ b/
bertos/net/afsk_test.c
@@
-51,6
+51,7
@@
#include <cfg/test.h>
#include <cfg/debug.h>
#include <cfg/test.h>
#include <cfg/debug.h>
+#include <cfg/kfile_debug.h>
#include <cpu/byteorder.h>
#include <cpu/byteorder.h>
@@
-61,16
+62,15
@@
FILE *fp_adc;
FILE *fp_dac;
uint32_t data_size;
uint32_t data_written;
FILE *fp_dac;
uint32_t data_size;
uint32_t data_written;
-bool afsk_tx_test;
Afsk afsk_fd;
AX25Ctx ax25;
Afsk afsk_fd;
AX25Ctx ax25;
-
-int8_t afsk_adc_val;
+KFileDebug dbg;
int msg_cnt;
int msg_cnt;
-static void message_hook(
UNUSED_ARG(struct AX25Msg *, msg)
)
+static void message_hook(
struct AX25Msg *msg
)
{
msg_cnt++;
{
msg_cnt++;
+ ax25_print(&dbg.fd, msg);
}
static FILE *afsk_fileOpen(const char *name)
}
static FILE *afsk_fileOpen(const char *name)
@@
-129,6
+129,7
@@
static FILE *afsk_fileOpen(const char *name)
int afsk_testSetup(void)
{
kdbg_init();
int afsk_testSetup(void)
{
kdbg_init();
+ kfiledebug_init(&dbg);
fp_adc = afsk_fileOpen("test/afsk_test.au");
#if CPU_AVR
#warning TODO: open the file?
fp_adc = afsk_fileOpen("test/afsk_test.au");
#if CPU_AVR
#warning TODO: open the file?
@@
-183,9
+184,13
@@
int afsk_testRun(void)
ax25_send(&ax25, AX25_CALL("abcdef", 0), AX25_CALL("123456", 1), buf, sizeof(buf));
ax25_send(&ax25, AX25_CALL("abcdef", 0), AX25_CALL("123456", 1), buf, sizeof(buf));
- while (afsk_tx_test)
- afsk_dac_isr(&afsk_fd);
-
+ do
+ {
+ int8_t val = afsk_dac_isr(&afsk_fd) - 128;
+ ASSERT(fwrite(&val, 1, sizeof(val), fp_dac) == sizeof(val));
+ data_written++;
+ }
+ while (afsk_fd.sending);
#define SND_DATASIZE_OFF 8
#if CPU_AVR
#define SND_DATASIZE_OFF 8
#if CPU_AVR