Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Applications/Processing/SLIPSerialToUDP/SLIPSerialToUDP.pde
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void STOP() {
SERIAL
************************************************************************************/

//the Serial communcation to the Arduino
//the Serial communication to the Arduino
Serial serial;

String[] serialRateStrings = {
Expand Down Expand Up @@ -314,7 +314,7 @@ void UDPSendBuffer(byte[] data) {
udp.send( data, ipAddress, outPort );
}

//called when UDP recieves some data
//called when UDP receives some data
void receive( byte[] data) {
drawIncomingUDP();
//send it over to serial
Expand Down
4 changes: 2 additions & 2 deletions Applications/Processing/SLIPSerialToUDPp3
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void STOP() {
SERIAL
************************************************************************************/

//the Serial communcation to the Arduino
//the Serial communication to the Arduino
Serial serial;

String[] serialRateStrings = { //less baudrates, only hi speeds
Expand Down Expand Up @@ -315,7 +315,7 @@ void UDPSendBuffer(byte[] data) {
udp.send( data, ipAddress, outPort );
}

//called when UDP recieves some data
//called when UDP receives some data
void receive( byte[] data) {
drawIncomingUDP();
//send it over to serial
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Receives and visualizes OSCBundles sent over UDP
Use with /examples/UDPSendBundle

or with /examples/SerialSendBundle in conjunction
with /Applicaitons/Processing/SLIPSerialToUDP
with /Applications/Processing/SLIPSerialToUDP
*/

import oscP5.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Receives and visualizes OSCBundles sent over UDP
Use with /examples/UDPSendMessage

or with /examples/SerialSendMessage in conjunction
with /Applicaitons/Processing/SLIPSerialToUDP
with /Applications/Processing/SLIPSerialToUDP
*/

import oscP5.*;
Expand Down
2 changes: 1 addition & 1 deletion OSCBundle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ OSCBundle& OSCBundle::send(Print &p){
//turn the message size into a pointer
uint32_t s32 = BigEndian((uint32_t) msgSize);
uint8_t * sptr = (uint8_t *) &s32;
//write the messsage size
//write the message size
p.write(sptr, 4);
msg->send(p);
}
Expand Down
8 changes: 4 additions & 4 deletions OSCMessage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ OSCMessage::~OSCMessage(){

OSCMessage& OSCMessage::empty(){
error = OSC_OK;
//free each of hte data in the array
//free each of the data in the array
for (int i = 0; i < dataCount; i++){
OSCData * datum = getOSCData(i);
//explicitly destruct the data
Expand Down Expand Up @@ -449,7 +449,7 @@ int OSCMessage::bytes(){
//padding amount
int addrPad = padSize(addrLen);
messageSize += addrPad;
//add the comma seperator
//add the comma separator
messageSize += 1;
//add the types
messageSize += dataCount;
Expand Down Expand Up @@ -506,7 +506,7 @@ OSCMessage& OSCMessage::send(Print &p){
while(addrPad--){
p.write(nullChar);
}
//add the comma seperator
//add the comma separator
p.write((uint8_t) ',');
//add the types
#ifdef PAULSSUGGESTION
Expand Down Expand Up @@ -589,7 +589,7 @@ OSCMessage& OSCMessage::fill(uint8_t * incomingBytes, int length){

void OSCMessage::decodeAddress(){
setAddress((char *) incomingBuffer);
//change the error from invalide message
//change the error from invalid message
error = OSC_OK;
clearIncomingBuffer();
}
Expand Down
2 changes: 1 addition & 1 deletion OSCMessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class OSCMessage
//new constructor needs an address
OSCMessage (const char * _address);
//no address
//placeholder since it's invalide OSC
//placeholder since it's invalid OSC
OSCMessage();

//can optionally accept all of the data after the address
Expand Down
2 changes: 1 addition & 1 deletion SLIPEncodedSerial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
CONSTRUCTOR
*/
//instantiate with the tranmission layer
//instantiate with the transmission layer
//use HardwareSerial
SLIPEncodedSerial::SLIPEncodedSerial(HardwareSerial &s){
serial = &s;
Expand Down
2 changes: 1 addition & 1 deletion SLIPEncodedUSBSerial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/*
CONSTRUCTOR
*/
//instantiate with the tranmission layer
//instantiate with the transmission layer

#if (defined(CORE_TEENSY) && defined(USB_SERIAL)) || (!defined(CORE_TEENSY) && defined(__AVR_ATmega32U4__)) || defined(__SAM3X8E__) || (defined(_USB) && defined(_USE_USB_FOR_SERIAL_)) || defined(BOARD_maple_mini) || defined(_SAMD21_) || defined(__ARM__) || (defined(__PIC32MX__) || defined(__PIC32MZ__))

Expand Down
2 changes: 1 addition & 1 deletion examples/OSCEsplora/OSCEsplora.ino
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void loop(){

// The COOKED OSC address space and parameter mappings
// encode data for ease of use and legibility at the host. Unit intervals replace integers
// The names are chosen to clarify usage rather than adherance to the silkscreen
// The names are chosen to clarify usage rather than adherence to the silkscreen
// also values are acquired as close together as reasonably possible to increase
// their usability in sensor fusion contexts, i.e. in this case with the accelerometer

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void routeAnalog(OSCMessage &msg, int addrOffset ){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void routeAnalog(OSCMessage &msg, int addrOffset ){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
2 changes: 1 addition & 1 deletion examples/SerialOscuinoGemmaM0/SerialOscuinoGemmaM0.ino
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void routeAnalog(OSCMessage &msg, int addrOffset ){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void routeAnalog(OSCMessage &msg, int addrOffset ){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void routeAnalog(OSCMessage &msg, int addrOffset ){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
2 changes: 1 addition & 1 deletion examples/UDPOscuino/UDPOscuino.ino
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void routeAnalog(OSCMessage &msg, int addrOffset ){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
2 changes: 1 addition & 1 deletion examples/UDPReceive/UDPReceive.ino
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ char * numToOSCAddress( int pin){
* format:
* /tone/pin
*
* (digital value) (float value) = freqency in Hz
* (digital value) (float value) = frequency in Hz
* (no value) disable tone
*
**/
Expand Down
4 changes: 2 additions & 2 deletions test/OSCMessage_test/OSCMessage_test.ino
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#define HAS_DOUBLE sizeof(double) == 8


test(message_addres){
test(message_address){
OSCMessage msg("/hihi");
char addr[6];
msg.getAddress(addr);
assertEqual(strcmp(addr, "/hihi"), 0);
}

test(message_addres_offset){
test(message_address_offset){
OSCMessage msg("/foo/bar");
char addr[5];
msg.getAddress(addr, 4);
Expand Down