diff options
| -rw-r--r-- | Libraries/OSC/OSCEncoder.cpp | 111 | ||||
| -rw-r--r-- | Libraries/OSC/OSCEncoder.h | 34 | ||||
| -rw-r--r-- | OSCSendTest/OSCSendTest.pde | 63 | ||||
| -rw-r--r-- | OSCSendTest/udpapp.cpp | 73 |
4 files changed, 281 insertions, 0 deletions
diff --git a/Libraries/OSC/OSCEncoder.cpp b/Libraries/OSC/OSCEncoder.cpp new file mode 100644 index 0000000..66dd383 --- /dev/null +++ b/Libraries/OSC/OSCEncoder.cpp @@ -0,0 +1,111 @@ +/* + + ArdOSC - OSC Library for Arduino. + + -------- Lisence ----------------------------------------------------------- + + ArdOSC + + The MIT License + + Copyright (c) 2009 - 2010 recotana( http://recotana.com ) All right reserved + + */ + +#include <stdlib.h> +#include <string.h> + +#include "OSCcommon.h" +#include "OSCEncoder.h" + + + +int16_t OSCEncoder::encode( OSCMessage::OSCMessage *mes ,uint8_t *sendData ){ + + + uint8_t *packStartPtr=sendData; + + +//=========== OSC Address(String) -> BIN Encode =========== + + memcpy( sendData ,mes->oscAddress ,mes->oscAdrSize); + packStartPtr += mes->oscAdrPacSize; + mes->allPackSize = mes->oscAdrPacSize; + +//=========== TypeTag(String) -> BIN Encode =========== + + *packStartPtr=','; + memcpy(packStartPtr+1 ,mes->typeTag ,mes->argsNum); + packStartPtr += mes->typeTagPacSize; + + mes->allPackSize += mes->typeTagPacSize; + + +//=========== Auguments -> BIN Encode ================== + + + uint8_t *tmpPtr; + + uint32_t tmpInt; + +#ifdef _USE_FLOAT_ + float tmpFloat; +#endif + +#ifdef _USE_STRING_ + uint16_t strSize; +#endif + + for (int i=0; i< mes->argsNum; i++) { + + switch ( mes->typeTag[i] ) { + + case 'i': + + tmpInt = mes->getInteger32(i); + tmpPtr =(uint8_t*)(&tmpInt); + + *packStartPtr++=*(tmpPtr+3); + *packStartPtr++=*(tmpPtr+2); + *packStartPtr++=*(tmpPtr+1); + *packStartPtr++=*tmpPtr; + + mes->allPackSize += 4; + break; + +#ifdef _USE_FLOAT_ + case 'f': + + tmpFloat = mes->getFloat(i); + tmpPtr=(uint8_t*)(&tmpFloat); + + *packStartPtr++=*(tmpPtr+3); + *packStartPtr++=*(tmpPtr+2); + *packStartPtr++=*(tmpPtr+1); + *packStartPtr++=*tmpPtr; + + mes->allPackSize += 4; + break; +#endif + +#ifdef _USE_STRING_ + case 's': + strSize = strlen(mes->getString(i)); + + if(strSize > kMaxStringCharactor){ + + DBG_LOGLN("encode max str err"); + return 1; + } + + memcpy( (char*)packStartPtr ,mes->getString(i) ,strSize ); + packStartPtr += mes->getPackSize(strSize); + + mes->allPackSize += mes->getPackSize(strSize); + break; +#endif + + } + } + return 0; +} diff --git a/Libraries/OSC/OSCEncoder.h b/Libraries/OSC/OSCEncoder.h new file mode 100644 index 0000000..5361c86 --- /dev/null +++ b/Libraries/OSC/OSCEncoder.h @@ -0,0 +1,34 @@ +/* + + ArdOSC - OSC Library for Arduino. + + -------- Lisence ----------------------------------------------------------- + + ArdOSC + + The MIT License + + Copyright (c) 2009 - 2010 recotana( http://recotana.com ) All right reserved + + */ + + +#ifndef OSCEncoder_h +#define OSCEncoder_h + + + +#include "OSCMessage.h" + +class OSCEncoder{ + +private: + + +public: + + int16_t encode( OSCMessage::OSCMessage *mes ,uint8_t *sendData ); + +}; + +#endif
\ No newline at end of file diff --git a/OSCSendTest/OSCSendTest.pde b/OSCSendTest/OSCSendTest.pde new file mode 100644 index 0000000..67cdcd0 --- /dev/null +++ b/OSCSendTest/OSCSendTest.pde @@ -0,0 +1,63 @@ + +/* + * UDP endpoint + * + * A simple UDP endpoint example using the WiShield 1.0 + */ + +#include <WiShield.h> +#include <OSCMessage.h> + +#define WIRELESS_MODE_INFRA 1 +#define WIRELESS_MODE_ADHOC 2 + +extern void sendOSCMessage(OSCMessage& m, uint8 addr1, uint8 addr2, uint8 addr3, uint8 addr4, uint8 port); + +// Wireless configuration parameters ---------------------------------------- +unsigned char local_ip[] = {192,168,1,23}; // IP address of WiShield +unsigned char gateway_ip[] = {192,168,1,1}; // router or gateway IP address +unsigned char subnet_mask[] = {255,255,255,0}; // subnet mask for the local network +const prog_char ssid[] PROGMEM = {"craque"}; // max 32 bytes + +unsigned char security_type = 3; // 0 - open; 1 - WEP; 2 - WPA; 3 - WPA2 + +// WPA/WPA2 passphrase +const prog_char security_passphrase[] PROGMEM = {"DEADBEEF23"}; // max 64 characters + +// WEP 128-bit keys +// sample HEX keys +prog_uchar wep_keys[] PROGMEM = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, // Key 0 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Key 1 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Key 2 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Key 3 + }; + +// setup the wireless mode +// infrastructure - connect to AP +// adhoc - connect to another WiFi device +unsigned char wireless_mode = WIRELESS_MODE_INFRA; + +unsigned char ssid_len; +unsigned char security_passphrase_len; + +long startTime = 0; +//--------------------------------------------------------------------------- + +void setup() +{ + Serial.begin(9600); + Serial.println("init"); + WiFi.init(); +} + +void loop() +{ + WiFi.run(); + + if (millis() - startTime > 5000) + { + startTime = millis(); + OSCMessage oscMess("/TestMessage"); + sendOSCMessage(oscMess, 192, 168, 1, 100, 12345); + } +} diff --git a/OSCSendTest/udpapp.cpp b/OSCSendTest/udpapp.cpp new file mode 100644 index 0000000..a773df9 --- /dev/null +++ b/OSCSendTest/udpapp.cpp @@ -0,0 +1,73 @@ +/* + +Modified for OSC by Brian Richardson (skinny@knowhere.net) + +*/ + +/****************************************************************************** + + Filename: udpapp.h + Description: UDP app for the WiShield 1.0 + + ****************************************************************************** + + TCP/IP stack and driver for the WiShield 1.0 wireless devices + + Copyright(c) 2009 Async Labs Inc. All rights reserved. + + This program is free software; you can redistribute it and/or modify it + under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + Contact Information: + <asynclabs@asynclabs.com> + + Author Date Comment + --------------------------------------------------------------- + AsyncLabs 07/11/2009 Initial version + + *****************************************************************************/ +extern "C" { +#include "uip.h" +} +#include <string.h> +#include "udpapp.h" +#include "config.h" +#include "HardwareSerial.h" +#include "OSCMessage.h" +#include "OSCEncoder.h" + +static OSCEncoder encoder; + +void dummy_app_appcall(void) +{ +} + +void udpapp_init(void) +{ +} + +void udpapp_appcall(void) +{ +} + +void sendOSCMessage(OSCMessage& m, uint8 addr1, uint8 addr2, uint8 addr3, uint8 addr4, uint8 port) +{ + uip_ipaddr_t addr; + struct uip_udp_conn *c; + + uip_ipaddr(&addr, addr1, addr2, addr3, addr4); + c = uip_udp_new(&addr, HTONS(port)); + uint16_t len = encoder.encode(&m, (uint8_t*) uip_appdata); + uip_send(uip_appdata, len); + uip_close(); // Is this needed? UDP is connectionless, or we might be closing the connection before the data gets sent out.. +} |