Changeset 1002

Timestamp:

11/17/08 11:41:40 (7 weeks ago)

Author:

liamMT

Message:

- stub out OscRangeHelper? class to deal with numeric OSC patterns

Location:

firmware/branches/cpp

Files:

• core/makingthings/osc_cpp.cpp (modified) (3 diffs)
• core/makingthings/osc_cpp.h (modified) (4 diffs)
• libraries/appled/appled_.cpp (modified) (3 diffs)

firmware/branches/cpp/core/makingthings/osc_cpp.cpp

@@ -7 +7 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
 
 extern "C" {
@@ -77 +79 @@
 }
 
-bool OSCC::receivePacket( int channel, char* packet, int length )
+bool OSCC::receivePacket( OscTransport t, char* packet, int length )
 {
   // Got a packet.  Unpacket.
@@ -115 +117 @@
 }
 
+OscRangeHelper::OscRangeHelper( OscMessage* msg, int element, int max, int min )
+{
+  remaining = 0;
+  single = -1;
+  if( !msg->address )
+    return;
+  const char* p = strchr(msg->address, '/'); // should give us the very first char of the OSC message
+  if( !p++ ) // step to the beginning of the address element
+    return;
+  int j;
+  for( j = 0; j < element; j++ )
+  {
+    p = strchr( p, '/');
+    if(!p++)
+      return;
+  }
+  
+  int n = 0;
+  int digits = 0;
+  // from OSC_NumberMatch()
+  while ( isdigit( *p ) )
+  {
+    digits++;
+    n = n * 10 + ( *p++ - '0' );
+  }
+
+  bits = -1;
+  if ( n >= max )
+    return; // -1;
+
+  switch ( *p )
+  {
+    case '*':
+    case '?':
+    case '[':
+    case '{':
+    {
+      int i;
+      int b = 0;
+      char s[ 5 ];
+      for ( i = max - 1; i >= min ; i-- )
+      {
+        b <<= 1;
+        sprintf( s, "%d", i );
+        // if ( Osc_PatternMatch( p, s ) )
+        // {
+        //   b |= 1;
+        //   remaining++;
+        // }
+      }
+      bits = b;
+      current = max;
+      return; // -1;
+    }
+    default:
+      if ( digits == 0 )
+        return; // -1;
+      else
+        single = n;
+        return; // n;
+  }
+}
+
+bool OscRangeHelper::hasNextIndex( )
+{
+  return remaining > 0;
+}
+
+int OscRangeHelper::nextIndex( )
+{
+  int retval = 0;
+  if( single != -1 )
+  {
+    remaining = 0;
+    return single;
+  }
+  bool cont = true;
+  while ( bits > 0 && remaining && cont )
+  { 
+    if ( bits & 1 )
+    {
+      retval = current;
+      remaining--;
+      cont = false;
+    }
+    current--;
+    bits >>= 1;
+  }
+  return retval;
+}
+
 int OscHandler::propertyLookup( const char* propertyList[], char* property )
 {

firmware/branches/cpp/core/makingthings/osc_cpp.h

@@ -8 +8 @@
 #define OSC_MAX_HANDLERS 56
 #define OSC_MSG_MAX_DATA_ITEMS 20
-// #define OSC_MSG_MAX_LEN 1024
 #define OSC_MAX_MESSAGE_IN   400
 #define OSC_MAX_MESSAGE_OUT  600
@@ -46 +45 @@
 };
 
+class OscRangeHelper
+{
+public:
+  OscRangeHelper( OscMessage* msg, int element, int max, int min = 0 );
+  bool hasNextIndex( );
+  int nextIndex( );
+private:
+  int remaining, bits, current, single;
+};
+
 class OscHandler
 {
 public:
+  // mandatory
   virtual int onNewMsg( OscMessage* msg, OscTransport t, int src_addr, int src_port ) = 0;
   virtual int onQuery( int element ) = 0;
   virtual const char* name( ) = 0;
+  // optional
+  bool autoSend( OscTransport t ) { (void)t; return false; }
 protected:
   int propertyLookup( const char* propertyList[], char* property );
@@ -81 +93 @@
   OSCC* instance( )
   {
-    if( _instance )
+    if( !_instance )
       _instance = new OSCC( );
     return _instance;
@@ -89 +101 @@
   OSCC( ) { }
   OSCC* _instance;
-  bool receivePacket( int channel, char* packet, int length );
+  bool receivePacket( OscTransport t, char* packet, int length );
   char* writePaddedString( char* buffer, int* length, char* string );
   char* writePaddedBlob( char* buffer, int* length, char* blob, int blen );

firmware/branches/cpp/libraries/appled/appled_.cpp

@@ -138 +138 @@
   (void)src_port;
   int replies = 0;
-  bool ok;
-  int index = msg->addressElementAsInt( 1, &ok ); // address element 1 should be our index
-  if( !ok )
-    return replies;
   char* property = msg->addressElementAsString( 2 ); // address element 2 should be the property
   if( !property )
@@ -150 +146 @@
     return replies;
   
-  AppLed led(index);
-  if( msg->data_count ) // this is a setter
+  int index;
+  OscRangeHelper rangeHelper(msg, 1, APPLED_COUNT); // element 1 should be our index
+  while( rangeHelper.hasNextIndex() )
   {
-    int value = msg->dataItemAsInt(0);
-    switch( prop_index )
+    index = rangeHelper.nextIndex();
+    if( index < 0 || index >= APPLED_COUNT )
+      continue;
+    AppLed led(index);
+    if( msg->data_count ) // setter...write the value to the led
     {
-      case 0: // state
-        led.setState(value);
-        break;
+      int value = msg->dataItemAsInt(0);
+      switch( prop_index )
+      {
+        case 0: // state
+          led.setState(value);
+          break;
+      }
     }
-  }
-  else // this is a getter
-  {
-    int value;
-    switch( prop_index )
+    else // getter...return a message
     {
-      case 0: // state
-        value = led.getState( );
-        // create new message to send it back
-        break;
+      int value;
+      switch( prop_index )
+      {
+        case 0: // state
+          value = led.getState( );
+          // create new message to send it back
+          replies++;
+          break;
+      }
     }
   }
@@ -190 +195 @@
 }
 
-// Need a list of property names
-// MUST end in zero
-// static char* AppLedOsc_Name = "appled";
-// static char* AppLedOsc_PropertyNames[] = { "active", "state", 0 }; // must have a trailing 0
-// 
-// int AppLedOsc_PropertySet( int index, int property, int value );
-// int AppLedOsc_PropertyGet( int index, int property );
-// 
-// // Returns the name of the subsystem
-// const char* AppLedOsc_GetName( )
-// {
-//   return AppLedOsc_Name;
-// }
-// 
-// // Now getting a message.  This is actually a part message, with the first
-// // part (the subsystem) already parsed off.
-// int AppLedOsc_ReceiveMessage( int channel, char* message, int length )
-// {
-//   int status = Osc_IndexIntReceiverHelper( channel, message, length, 
-//                                            APPLED_COUNT, AppLedOsc_Name,
-//                                            AppLedOsc_PropertySet, AppLedOsc_PropertyGet, 
-//                                            AppLedOsc_PropertyNames );
-// 
-//   if ( status != CONTROLLER_OK )
-//     return Osc_SendError( channel, AppLedOsc_Name, status );
-//   return CONTROLLER_OK;
-// }
-// 
-// // Set the index LED, property with the value
-// int AppLedOsc_PropertySet( int index, int property, int value )
-// {
-//   switch ( property )
-//   {
-//     case 0: 
-//       AppLed_SetActive( index, value );
-//       break;      
-//     case 1:
-//       AppLed_SetState( index, value );
-//       break;
-//   }
-//   return CONTROLLER_OK;
-// }
-// 
-// // Get the index LED, property
-// int AppLedOsc_PropertyGet( int index, int property )
-// {
-//   int value = 0;
-//   switch ( property )
-//   {
-//     case 0:
-//       value = AppLed_GetActive( index );
-//       break;
-//     case 1:
-//       value = AppLed_GetState( index );
-//       break;
-//   }
-//   
-//   return value;
-// }
-
 #endif // OSC