Changeset 1845

Timestamp:

04/29/12 23:08:36 (13 months ago)

Author:

thomas

Message:

basic client/server interaction

Location:

trunk

Files:

• firmware/openos/bsp/boards/pc/board.c (modified) (2 diffs)
• firmware/openos/bsp/boards/pc/bsp_timer.c (modified) (4 diffs)
• firmware/openos/bsp/boards/pc/leds.c (modified) (2 diffs)
• firmware/openos/bsp/boards/pc/opensim_client.c (modified) (6 diffs)
• firmware/openos/projects/common/01bsp_leds/SConscript (modified) (1 diff)
• software/opensim/SimEngine/MoteHandler.py (modified) (3 diffs)

trunk/firmware/openos/bsp/boards/pc/board.c

@@ -14 +14 @@
 #include "radiotimer.h"
 #include "eui64.h"
+// OpenSim environment
+#include "opensim_client.h"
 
 //=========================== variables =======================================
@@ -22 +24 @@
 
 void board_init() {
-   // poipoipoi stub
-   printf("TODO board_init\r\n");
+   //poipoiopensim_client_send(0);
 }
 
 void board_sleep() {
-   // poipoipoi stub
-   printf("TODO board_sleep\r\n");
+   //poipoiopensim_client_send(1);
 }
 

trunk/firmware/openos/bsp/boards/pc/bsp_timer.c

@@ -22 +22 @@
 //=========================== public ==========================================
 
-/**
-\brief Initialize this module.
-
-This functions starts the timer, i.e. the counter increments, but doesn't set
-any compare registers, so no interrupt will fire.
-*/
 void bsp_timer_init() {
    
@@ -37 +31 @@
 }
 
-/**
-\brief Register a callback.
-
-\param cb The function to be called when a compare event happens.
-*/
 void bsp_timer_set_callback(bsp_timer_cbt cb) {
    bsp_timer_vars.cb   = cb;
 }
 
-/**
-\brief Reset the timer.
-
-This function does not stop the timer, it rather resets the value of the
-counter, and cancels a possible pending compare event.
-*/
 void bsp_timer_reset() {
    // poipoipoi stub
@@ -57 +40 @@
 }
 
-/**
-\brief Schedule the callback to be called in some specified time.
-
-The delay is expressed relative to the last compare event. It doesn't matter
-how long it took to call this function after the last compare, the timer will
-expire precisely delayTicks after the last one.
-
-The only possible problem is that it took so long to call this function that
-the delay specified is shorter than the time already elapsed since the last
-compare. In that case, this function triggers the interrupt to fire right away.
-
-This means that the interrupt may fire a bit off, but this inaccuracy does not
-propagate to subsequent timers.
-
-\param delayTicks Number of ticks before the timer expired, relative to the
-                  last compare event.
-*/
 void bsp_timer_scheduleIn(PORT_TIMER_WIDTH delayTicks) {
    // poipoipoi stub
@@ -79 +45 @@
 }
 
-/**
-\brief Cancel a running compare.
-*/
 void bsp_timer_cancel_schedule() {
    // poipoipoi stub

trunk/firmware/openos/bsp/boards/pc/leds.c

@@ -6 +6 @@
 
 #include "leds.h"
+#include "opensim_proto.h"
 
 //=========================== defines =========================================
@@ -16 +17 @@
 
 void leds_init() {
-   // poipoipoi stub
-   printf("TODO leds_init\r\n");
+   opensim_requ_leds_init_t requ;
+   opensim_repl_leds_init_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_init;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_init_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_init_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_init\n",repl.rc);
+   }
 }
 
 void    leds_error_on() {
-   // poipoipoi stub
-   printf("TODO leds_error_on\r\n");
+   opensim_requ_leds_error_on_t requ;
+   opensim_repl_leds_error_on_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_error_on;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_error_on_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_error_on_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_error_on\n",repl.rc);
+   }
 }
 void    leds_error_off() {
-   // poipoipoi stub
-   printf("TODO leds_error_off\r\n");
+   opensim_requ_leds_error_off_t requ;
+   opensim_repl_leds_error_off_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_error_off;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_error_off_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_error_off_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_error_off\n",repl.rc);
+   }
 }
 void    leds_error_toggle() {
-   // poipoipoi stub
-   printf("TODO leds_error_toggle\r\n");
+   opensim_requ_leds_error_toggle_t requ;
+   opensim_repl_leds_error_toggle_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_error_toggle;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_error_toggle_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_error_toggle_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_error_toggle\n",repl.rc);
+   }
 }
 uint8_t leds_error_isOn() {
-   // poipoipoi stub
-   printf("TODO leds_error_isOn\r\n");
+   opensim_requ_leds_error_isOn_t requ;
+   opensim_repl_leds_error_isOn_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_error_isOn;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_error_isOn_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_error_isOn_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_error_isOn\n",repl.rc);
+   }
 }
 
 void    leds_radio_on() {
-   // poipoipoi stub
-   printf("TODO leds_radio_on\r\n");
+   opensim_requ_leds_radio_on_t requ;
+   opensim_repl_leds_radio_on_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_radio_on;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_radio_on_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_radio_on_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_radio_on\n",repl.rc);
+   }
 }
 void    leds_radio_off() {
-   // poipoipoi stub
-   printf("TODO leds_radio_off\r\n");
+   opensim_requ_leds_radio_off_t requ;
+   opensim_repl_leds_radio_off_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_radio_off;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_radio_off_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_radio_off_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_radio_off\n",repl.rc);
+   }
 }
 void    leds_radio_toggle() {
-   // poipoipoi stub
-   printf("TODO leds_radio_toggle\r\n");
+   opensim_requ_leds_radio_toggle_t requ;
+   opensim_repl_leds_radio_toggle_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_radio_toggle;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_radio_toggle_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_radio_toggle_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_radio_toggle\n",repl.rc);
+   }
 }
 uint8_t leds_radio_isOn() {
-   // poipoipoi stub
-   printf("TODO leds_radio_isOn\r\n");
+   opensim_requ_leds_radio_isOn_t requ;
+   opensim_repl_leds_radio_isOn_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_radio_isOn;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_radio_isOn_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_radio_isOn_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_radio_isOn\n",repl.rc);
+   }
 }
 
 // green
 void    leds_sync_on() {
-   // poipoipoi stub
-   printf("TODO leds_sync_on\r\n");
+   opensim_requ_leds_sync_on_t requ;
+   opensim_repl_leds_sync_on_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_sync_on;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_sync_on_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_sync_on_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_sync_on\n",repl.rc);
+   }
 }
 void    leds_sync_off() {
-   // poipoipoi stub
-   printf("TODO leds_sync_off\r\n");
+   opensim_requ_leds_sync_off_t requ;
+   opensim_repl_leds_sync_off_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_sync_off;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_sync_off_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_sync_off_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_sync_off\n",repl.rc);
+   }
 }
 void    leds_sync_toggle() {
-   // poipoipoi stub
-   printf("TODO leds_sync_toggle\r\n");
+   opensim_requ_leds_sync_toggle_t requ;
+   opensim_repl_leds_sync_toggle_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_sync_toggle;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_sync_toggle_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_sync_toggle_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_sync_toggle\n",repl.rc);
+   }
 }
 uint8_t leds_sync_isOn() {
-   // poipoipoi stub
-   printf("TODO leds_sync_isOn\r\n");
+   opensim_requ_leds_sync_isOn_t requ;
+   opensim_repl_leds_sync_isOn_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_sync_isOn;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_sync_isOn_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_sync_isOn_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_sync_isOn\n",repl.rc);
+   }
 }
 
 // yellow
 void    leds_debug_on() {
-   // poipoipoi stub
-   printf("TODO leds_debug_on\r\n");
+   opensim_requ_leds_debug_on_t requ;
+   opensim_repl_leds_debug_on_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_debug_on;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_debug_on_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_debug_on_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_debug_on\n",repl.rc);
+   }
 }
 void    leds_debug_off() {
-   // poipoipoi stub
-   printf("TODO leds_debug_off\r\n");
+   opensim_requ_leds_debug_off_t requ;
+   opensim_repl_leds_debug_off_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_debug_off;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_debug_off_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_debug_off_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_debug_off\n",repl.rc);
+   }
 }
 void    leds_debug_toggle() {
-   // poipoipoi stub
-   printf("TODO leds_debug_toggle\r\n");
+   opensim_requ_leds_debug_toggle_t requ;
+   opensim_repl_leds_debug_toggle_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_debug_toggle;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_debug_toggle_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_debug_toggle_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_debug_toggle\n",repl.rc);
+   }
 }
 uint8_t leds_debug_isOn() {
-   // poipoipoi stub
-   printf("TODO leds_debug_isOn\r\n");
+   opensim_requ_leds_debug_isOn_t requ;
+   opensim_repl_leds_debug_isOn_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_debug_isOn;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_debug_isOn_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_debug_isOn_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_debug_isOn\n",repl.rc);
+   }
 }
 
 void leds_all_on() {
-   // poipoipoi stub
-   printf("TODO leds_all_on\r\n");
+   opensim_requ_leds_all_on_t requ;
+   opensim_repl_leds_all_on_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_all_on;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_all_on_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_all_on_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_all_on\n",repl.rc);
+   }
 }
 void leds_all_off() {
-   // poipoipoi stub
-   printf("TODO leds_all_off\r\n");
+   opensim_requ_leds_all_off_t requ;
+   opensim_repl_leds_all_off_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_all_off;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_all_off_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_all_off_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_all_off\n",repl.rc);
+   }
 }
 void leds_all_toggle() {
-   // poipoipoi stub
-   printf("TODO leds_all_toggle\r\n");
+   opensim_requ_leds_all_toggle_t requ;
+   opensim_repl_leds_all_toggle_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_all_toggle;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_all_toggle_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_all_toggle_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_all_toggle\n",repl.rc);
+   }
 }
 
 void leds_circular_shift() {
-   // poipoipoi stub
-   printf("TODO leds_circular_shift\r\n");
+   opensim_requ_leds_circular_shift_t requ;
+   opensim_repl_leds_circular_shift_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_circular_shift;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_circular_shift_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_circular_shift_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_circular_shift\n",repl.rc);
+   }
 }
 
 void leds_increment() {
-   // poipoipoi stub
-   printf("TODO leds_increment\r\n");
+   opensim_requ_leds_increment_t requ;
+   opensim_repl_leds_increment_t repl;
+   
+   // prepare request
+   requ.cmdId = OPENSIM_CMD_leds_increment;
+   
+   // send request to server and get reply
+   opensim_client_send((void*)&requ,
+                       sizeof(opensim_requ_leds_increment_t),
+                       (void*)&repl,
+                       sizeof(opensim_repl_leds_increment_t));
+                       
+   // make sure server did not return any errors
+   if (repl.rc!=OPENSIM_ERR_NONE) {
+      printf("ERROR rc=%d for leds_increment\n",repl.rc);
+   }
 }
 

trunk/firmware/openos/bsp/boards/pc/opensim_client.c

@@ -1 +1 @@
 /**
-\brief Client program to the OpenSim engine
+\brief Client program to the OpenSim server.
 
 \author Thomas Watteyne <watteyne@eecs.berkeley.edu>, April 2012.
@@ -10 +10 @@
 #include <string.h>
 #include "tcp_port.h"
+#include "opensim_client.h"
 
-#define DEFAULT_SERVER_NAME "localhost"
-#define DEFAULT_SERVER_PORT 14159
+//=========================== variables =======================================
 
-void Usage(char* progname) {
-   fprintf(stderr,"Usage: %s -n [server_address name/IP address] -p [port_num] -l [iterations]\n", progname);
-   fprintf(stderr,"Where:\n\tprotocol is one of TCP or UDP\n");
-   fprintf(stderr,"\t- server_address is the IP address or name of server_address\n");
-   fprintf(stderr,"\t- port_num is the port to listen on\n");
-   WSACleanup();
-   exit(1);
-}
+typedef struct {
+   char    txBuffer[OPENCLIENT_BUFSIZE];
+   char    rxBuffer[OPENCLIENT_BUFSIZE];
+   SOCKET  conn_socket;
+} opensim_client_vars_t;
+
+opensim_client_vars_t opensim_client_vars;
+
+//=========================== prototypes ======================================
+
+void printUsage(char* progname);
+
+//=========================== main ============================================
 
 int main(int argc, char **argv) {
-   char                 Buffer[12];
    unsigned short       server_port;
    char*                server_name;
@@ -31 +35 @@
    int                  loopcount;
    int                  numloops;
-   SOCKET               conn_socket;
    int                  retval;
    
@@ -53 +56 @@
                   break;
                default:
-                  Usage(argv[0]);
+                  printUsage(argv[0]);
                   break;
             }
          } else {
-            Usage(argv[0]);
+            printUsage(argv[0]);
          }
       }
@@ -63 +66 @@
    
    // connect to the server
-   conn_socket = tcp_port_connect(server_name, server_port);
+   opensim_client_vars.conn_socket = tcp_port_connect(server_name, server_port);
    
-   // send some data
-   while(numloops>0) {
+   // wait for command from the server
+   while(1) {
       
-      // send to server
-      wsprintf(Buffer,"poipoipoipoi");
-      retval = send(conn_socket, Buffer, sizeof(Buffer), 0);
-      if (retval == SOCKET_ERROR) {
-         fprintf(stderr,"ERROR: send() failed (error=%d)\n", WSAGetLastError());
-         WSACleanup();
-         return -1;
-      }
-      printf("poipoi sent");
-
-      // receive from server
-      retval = recv(conn_socket, Buffer, sizeof(Buffer), 0);
+      // receive command from server
+      retval = recv(opensim_client_vars.conn_socket,
+                    opensim_client_vars.rxBuffer,
+                    sizeof(opensim_client_vars.rxBuffer),
+                    0);
       if (retval==SOCKET_ERROR) {
          fprintf(stderr,"ERROR: recv() failed (error=%d)\n", WSAGetLastError());
-         closesocket(conn_socket);
+         closesocket(opensim_client_vars.conn_socket);
          WSACleanup();
          return -1;
@@ -88 +84 @@
       if (retval == 0) {
          printf("WARNING: server closed connection.\n");
-         closesocket(conn_socket);
+         closesocket(opensim_client_vars.conn_socket);
          WSACleanup();
          return -1;
       }
-      printf("INFO: Received %d bytes, data \"%s\" from server_address.\n", retval, Buffer);
-      
-      // decrement number of loops
-      numloops--;
+      printf("INFO: Received %d bytes, data \"%s\"\n",
+                   retval,
+                   opensim_client_vars.rxBuffer);
+                   
+      mote_main();
    }
    
-   closesocket(conn_socket);
+   closesocket(opensim_client_vars.conn_socket);
    WSACleanup();
    return 0;
 }
+
+//=========================== public ==========================================
+
+int opensim_client_send(int* pTxData,
+                        int  txDataLength,
+                        int* pRxBuffer,
+                        int  maxRxBufferLength) {
+   int retval;
+   
+   // send command to OpenSim server
+   retval = send(opensim_client_vars.conn_socket,
+                 pTxData,
+                 txDataLength,
+                 0);
+   if (retval == SOCKET_ERROR) {
+      fprintf(stderr,"ERROR: send() failed (error=%d)\n", WSAGetLastError());
+      WSACleanup();
+      exit(1);
+   }
+   printf("command sent\r\n");
+   
+   // wait for reply
+   retval = recv(opensim_client_vars.conn_socket,
+                 opensim_client_vars.rxBuffer,
+                 sizeof(opensim_client_vars.rxBuffer),
+                 0);
+   if (retval==SOCKET_ERROR) {
+      fprintf(stderr,"FATAL: recv failed (error=%d)\n", WSAGetLastError());
+      closesocket(opensim_client_vars.conn_socket);
+      WSACleanup();
+      exit(1);
+   }
+   if (retval==0) {
+      fprintf(stderr,"FATAL: server closed connection.\n");
+      closesocket(opensim_client_vars.conn_socket);
+      WSACleanup();
+      exit(1);
+   }
+   if (retval>maxRxBufferLength) {
+      fprintf(stderr,"FATAL: expected at most %d bytes, got %d.\n",maxRxBufferLength,retval);
+      closesocket(opensim_client_vars.conn_socket);
+      WSACleanup();
+      exit(1);
+   }
+   
+   // copy reply in pRxBuffer
+   memcpy(pRxBuffer,opensim_client_vars.rxBuffer,retval);
+   
+   printf("INFO: received %d bytes\n",retval);
+   printf("ack received\r\n");
+   return 0;
+}
+
+//=========================== private =========================================
+
+void printUsage(char* progname) {
+   fprintf(stderr,"printUsage: %s -n [server_address name/IP address] -p [port_num] -l [iterations]\n", progname);
+   fprintf(stderr,"Where:\n\tprotocol is one of TCP or UDP\n");
+   fprintf(stderr,"\t- server_address is the IP address or name of server_address\n");
+   fprintf(stderr,"\t- port_num is the port to listen on\n");
+   WSACleanup();
+   exit(1);
+}

trunk/firmware/openos/projects/common/01bsp_leds/SConscript

@@ -15 +15 @@
 library_files = [
                    'libbsppc.lib',
+                   'ws2_32.lib',
+                   'user32.lib',
                 ]
 source_files =  ['01bsp_leds.c',
+                 os.path.join('#','firmware','openos','bsp','boards','pc','opensim_client.c'),
+                 os.path.join('#','firmware','openos','bsp','boards','pc','tcp_port.c'),
                 ]
 

trunk/software/opensim/SimEngine/MoteHandler.py

@@ -5 +5 @@
 import logging
 import os
+import time
 
 TCPRXBUFSIZE       = 4096    # size of the TCP reception buffer
@@ -47 +48 @@
         self.log.info('starting')
         
+        self.conn.send('poipoi')
+        
         while(1):
             try:
@@ -54 +57 @@
             else:
                 self.log.info('received input='+str(input))
-            self.conn.send('poipoipoipoi')
+            
+            print len(input)
+            
+            time.sleep(1)
+            
+            self.conn.send(chr(0))
     
     #======================== private =========================================