Commit b1e049ee by zacharyc

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
parent d4613652
Showing with 6 additions and 1 deletions
...@@ -374,6 +374,11 @@ nerd_data_stream (int data_fd, int numChannels, int *channel_list, ...@@ -374,6 +374,11 @@ nerd_data_stream (int data_fd, int numChannels, int *channel_list,
alignment = 0; alignment = 0;
numgroups = 0; numgroups = 0;
if(memused) {
printf("#Packet lost");
continue;
}
if (showmem) if (showmem)
{ {
printf ("%lX %hd %hd\n", memused, adcused, packetsready); printf ("%lX %hd %hd\n", memused, adcused, packetsready);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "netutil.h" #include "netutil.h"
#define NERDJACK_CHANNELS 12 #define NERDJACK_CHANNELS 12
#define NERDJACK_CLOCK_RATE 54000000 #define NERDJACK_CLOCK_RATE 60000000
#define NERDJACK_DATA_PORT 49155 #define NERDJACK_DATA_PORT 49155
#define NERDJACK_UDP_RECEIVE_PORT 49156 #define NERDJACK_UDP_RECEIVE_PORT 49156
#define NERDJACK_COMMAND_PORT 49157 #define NERDJACK_COMMAND_PORT 49157
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment