Browse Source

Changed clock rate of NerdJack and added error checking to packets

git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7403 ddd99763-3ecb-0310-9145-efcb8ce7c51f
tags/ethstream-1.1
zacharyc 14 years ago
parent
commit
b1e049eed0
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      nerdjack.c
  2. +1
    -1
      nerdjack.h

+ 5
- 0
nerdjack.c View File

@@ -374,6 +374,11 @@ nerd_data_stream (int data_fd, int numChannels, int *channel_list,
alignment = 0;
numgroups = 0;

if(memused) {
printf("#Packet lost");
continue;
}

if (showmem)
{
printf ("%lX %hd %hd\n", memused, adcused, packetsready);


+ 1
- 1
nerdjack.h View File

@@ -16,7 +16,7 @@
#include "netutil.h"

#define NERDJACK_CHANNELS 12
#define NERDJACK_CLOCK_RATE 54000000
#define NERDJACK_CLOCK_RATE 60000000
#define NERDJACK_DATA_PORT 49155
#define NERDJACK_UDP_RECEIVE_PORT 49156
#define NERDJACK_COMMAND_PORT 49157


Loading…
Cancel
Save