summaryrefslogtreecommitdiff
path: root/OSCTest
diff options
context:
space:
mode:
authorbzztbomb <skinny@knowhere.net>2011-04-05 19:57:16 -0700
committerbzztbomb <skinny@knowhere.net>2011-04-05 19:57:16 -0700
commit73e16950d73578900d54f3470b57402a9e908c30 (patch)
tree4e24dd9b04bd432139c3ed61866459ac77e4024a /OSCTest
parent6827a350052baf3999cfa336411f5ec89bb9e769 (diff)
Public firmware release.
Diffstat (limited to 'OSCTest')
-rw-r--r--OSCTest/OSCTest.pde109
-rw-r--r--OSCTest/udpapp.cpp103
2 files changed, 0 insertions, 212 deletions
diff --git a/OSCTest/OSCTest.pde b/OSCTest/OSCTest.pde
deleted file mode 100644
index 8c7e37f..0000000
--- a/OSCTest/OSCTest.pde
+++ /dev/null
@@ -1,109 +0,0 @@
-
-/*
- * 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
-
-// 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;
-//---------------------------------------------------------------------------
-
-void setup()
-{
- Serial.begin(9600);
- Serial.println("init");
- WiFi.init();
-}
-
-void loop()
-{
- WiFi.run();
-}
-
-void handleOSCMessage(OSCMessage& oscMess)
-{
- uint16_t i;
- unsigned char *ip=oscMess.getIpAddress();
-
- long int intValue;
- float floatValue;
- char *stringValue;
-
- Serial.print(ip[0],DEC);
- Serial.print(".");
- Serial.print(ip[1],DEC);
- Serial.print(".");
- Serial.print(ip[2],DEC);
- Serial.print(".");
- Serial.print(ip[3],DEC);
- Serial.print(":");
-
- Serial.print(oscMess.getPortNumber());
- Serial.print(" ");
- Serial.print(oscMess.getOSCAddress());
- Serial.print(" ");
- Serial.print(oscMess.getTypeTags());
- Serial.print("--");
-
- for(i=0 ; i<oscMess.getArgsNum(); i++){
-
- switch( oscMess.getTypeTag(i) ){
-
- case 'i':
- intValue = oscMess.getInteger32(i);
-
- Serial.print(intValue);
- Serial.print(" ");
- break;
-
-
- case 'f':
- floatValue = oscMess.getFloat(i);
-
- Serial.print(floatValue);
- Serial.print(" ");
- break;
-
-
- case 's':
- stringValue = oscMess.getString(i);
-
- Serial.print(stringValue);
- Serial.print(" ");
- break;
- }
- }
- Serial.println("");
-}
-
diff --git a/OSCTest/udpapp.cpp b/OSCTest/udpapp.cpp
deleted file mode 100644
index dc96a31..0000000
--- a/OSCTest/udpapp.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-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 "OSCDecoder.h"
-
-static struct udpapp_state s;
-static OSCDecoder decoder;
-
-// This exists within the sketch for the user to modify.
-extern void handleOSCMessage(OSCMessage& oscMess);
-
-void dummy_app_appcall(void)
-{
-}
-
-void udpapp_init(void)
-{
- struct uip_udp_conn *c;
-
- c = uip_udp_new(NULL, HTONS(0));
- if(c != NULL) {
- uip_udp_bind(c, HTONS(12344));
- }
- PT_INIT(&s.pt);
-}
-
-static unsigned char parse_msg(void)
-{
-#if 0
- for (int i = 0; i < uip_datalen(); i++)
- Serial.print(((char*)(uip_appdata))[i]);
- Serial.println("");
-#endif
-
- OSCMessage m;
- decoder.decode(&m, (uint8_t*)(uip_appdata));
- handleOSCMessage(m);
-
- return 1;
-}
-
-static PT_THREAD(handle_connection(void))
-{
- PT_BEGIN(&s.pt);
-
- // No state machine here now, we just stay in "Parse OSC Message" state.
- while (true) {
- PT_WAIT_UNTIL(&s.pt, uip_newdata());
- if(uip_newdata() && parse_msg()) {
- uip_flags &= (~UIP_NEWDATA);
- }
- }
-
- PT_END(&s.pt);
-}
-
-void udpapp_appcall(void)
-{
- handle_connection();
-}