@@ -1921,70 +1921,66 @@ class Stream extends Thread {
19211921
19221922
19231923 void sendAccelerometerData () {
1924- // UNFILTERED & FILTERED, Accel data is not affected by filters anyways
1925- if (this . filter== false || this . filter== true ) {
1926- // OSC
1927- if (this . protocol. equals(" OSC" )) {
1928- for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1929- msg. clearArguments();
1930- msg. add(i+ 1 );
1931- // ADD Accelerometer data
1932- msg. add(w_accelerometer. getLastAccelVal(i));
1933- // println(i + " | " + w_accelerometer.getLastAccelVal(i));
1934- try {
1935- this . osc. send(msg,this . netaddress);
1936- } catch (Exception e) {
1937- println (e. getMessage());
1938- }
1939- }
1940- // UDP
1941- } else if (this . protocol. equals(" UDP" )) {
1942- String outputter = " {\" type\" :\" accelerometer\" ,\" data\" :[" ;
1943- for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1944- float accelData = w_accelerometer. getLastAccelVal(i);
1945- String accelData_3dec = threeDecimalPlaces. format(accelData);
1946- // String accelData_3dec = String.format("%.3f", accelData); //This does not work in all international settings
1947- outputter += accelData_3dec;
1948- if (i != NUM_ACCEL_DIMS - 1 ) {
1949- outputter += " ," ;
1950- } else {
1951- outputter += " ]}\r\n " ;
1952- }
1953- }
1954- try {
1955- this . udp. send(outputter, this . ip, this . port);
1956- } catch (Exception e) {
1957- println (e. getMessage());
1958- }
1959- // LSL
1960- } else if (this . protocol. equals(" LSL" )) {
1961- for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1962- dataToSend[i] = w_accelerometer. getLastAccelVal(i);
1963- }
1964- // Add timestamp to LSL Stream
1965- outlet_data. push_sample(dataToSend);
1966- } else if (this . protocol. equals(" Serial" )) {
1967- // Data Format: +0.900,-0.042,+0.254\n
1968- // 7 chars per axis, including \n char for Z
1969- serialMessage = " " ;
1970- for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1971- float accelData = w_accelerometer. getLastAccelVal(i);
1972- String accelData_3dec = String . format(" %.3f" , accelData);
1973- if (accelData >= 0 ) serialMessage += " +" ;
1974- serialMessage += accelData_3dec;
1975- if (i != NUM_ACCEL_DIMS - 1 ) {
1976- serialMessage += " ," ;
1977- } else {
1978- serialMessage += " \n " ;
1979- }
1924+ // Accelerometer data is not affected by filters
1925+ // OSC
1926+ if (this . protocol. equals(" OSC" )) {
1927+ msg. clearArguments();
1928+ msg. setAddrPattern(address + " /accelerometer/" );
1929+ for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1930+ msg. add(w_accelerometer. getLastAccelVal(i));
1931+ }
1932+ try {
1933+ this . osc. send(msg,this . netaddress);
1934+ } catch (Exception e) {
1935+ println (e. getMessage());
1936+ }
1937+ // UDP
1938+ } else if (this . protocol. equals(" UDP" )) {
1939+ String outputter = " {\" type\" :\" accelerometer\" ,\" data\" :[" ;
1940+ for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1941+ float accelData = w_accelerometer. getLastAccelVal(i);
1942+ String accelData_3dec = threeDecimalPlaces. format(accelData);
1943+ // String accelData_3dec = String.format("%.3f", accelData); //This does not work in all international settings
1944+ outputter += accelData_3dec;
1945+ if (i != NUM_ACCEL_DIMS - 1 ) {
1946+ outputter += " ," ;
1947+ } else {
1948+ outputter += " ]}\r\n " ;
19801949 }
1981- try {
1982- // println(serialMessage);
1983- this . serial_networking. write(serialMessage);
1984- } catch (Exception e) {
1985- println (e. getMessage());
1950+ }
1951+ try {
1952+ this . udp. send(outputter, this . ip, this . port);
1953+ } catch (Exception e) {
1954+ println (e. getMessage());
1955+ }
1956+ // LSL
1957+ } else if (this . protocol. equals(" LSL" )) {
1958+ for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1959+ dataToSend[i] = w_accelerometer. getLastAccelVal(i);
1960+ }
1961+ // Add timestamp to LSL Stream
1962+ outlet_data. push_sample(dataToSend);
1963+ } else if (this . protocol. equals(" Serial" )) {
1964+ // Data Format: +0.900,-0.042,+0.254\n
1965+ // 7 chars per axis, including \n char for Z
1966+ serialMessage = " " ;
1967+ for (int i = 0 ; i < NUM_ACCEL_DIMS ; i++ ) {
1968+ float accelData = w_accelerometer. getLastAccelVal(i);
1969+ String accelData_3dec = String . format(" %.3f" , accelData);
1970+ if (accelData >= 0 ) serialMessage += " +" ;
1971+ serialMessage += accelData_3dec;
1972+ if (i != NUM_ACCEL_DIMS - 1 ) {
1973+ serialMessage += " ," ;
1974+ } else {
1975+ serialMessage += " \n " ;
19861976 }
19871977 }
1978+ try {
1979+ // println(serialMessage);
1980+ this . serial_networking. write(serialMessage);
1981+ } catch (Exception e) {
1982+ println (e. getMessage());
1983+ }
19881984 }
19891985 }
19901986
0 commit comments