/ - Diff - BRIX5 - Research for Cognitive Interaction

Revision 2fa9c672

     /* This driver uses the Adafruit unified sensor library (Adafruit_Sensor),
        which provides a common 'type' for sensor data and some helper functions.
        To use this driver you will also need to download the Adafruit_Sensor
        library and include it in your libraries folder.
-...
        sensor in any data logs, etc.  To assign a unique ID, simply
        provide an appropriate value in the constructor below (12345
        is used by default in this example).
        Connections
        ===========
        Connect SCL to analog 5
        Connect SDA to analog 4
        Connect VDD to 3.3-5V DC
        Connect GROUND to common ground
        History
        =======
 /MAR/03  - First release (KTOWN)
-...
       Serial.print  ("Unique ID:    "); Serial.println(sensor.sensor_id);
       Serial.print  ("Max Value:    "); Serial.print(sensor.max_value); Serial.println(" xxx");
       Serial.print  ("Min Value:    "); Serial.print(sensor.min_value); Serial.println(" xxx");
       Serial.print  ("Resolution:   "); Serial.print(sensor.resolution); Serial.println(" xxx");
       Serial.print  ("Resolution:   "); Serial.print(sensor.resolution); Serial.println(" xxx");
       Serial.println("------------------------------------");
       Serial.println("");
       delay(500);
-...
         Arduino setup function (automatically called at startup)
     */
     /**************************************************************************/
     void setup(void)
     void setup(void)
+    {
       Serial.begin(115200);
       Serial.println("Orientation Sensor Test"); Serial.println("");
       /* Initialise the sensor */
       if(!bno.begin())
+      {
-...
         Serial.print("Ooops, no BNO055 detected ... Check your wiring or I2C ADDR!");
         while(1);
+      }
       delay(1000);
       /* Display some basic information on this sensor */
       displaySensorDetails();
+    }
-...
         should go here)
     */
     /**************************************************************************/
     void loop(void)
     void loop(void)
+    {
       /* Get a new sensor event */
       sensors_event_t event;
       /* Get a new sensor event */
       sensors_event_t event;
       bno.getEvent(&event);
       /* Board layout:
              +----------+
              |         *| RST   PITCH  ROLL  HEADING
          ADR |*        *| SCL
          INT |*        *| SDA     ^            /->
          PS1 |*        *| GND     |            |
          PS1 |*        *| GND     |            |
          PS0 |*        *| 3VO     Y    Z-->    \-X
              |         *| VIN
              |         *| VIN
              +----------+
       */
-...
       Serial.print((float)event.orientation.z);
       Serial.println(F(""));
       /* Also send calibration data for each sensor. */
       uint8_t sys, gyro, accel, mag = 0;
       bno.getCalibration(&sys, &gyro, &accel, &mag);
       Serial.print(F("Calibration: "));
       Serial.print(sys, DEC);
       Serial.print(F(" "));
       Serial.print(gyro, DEC);
       Serial.print(F(" "));
       Serial.print(accel, DEC);
       Serial.print(F(" "));
       Serial.println(mag, DEC);
       delay(BNO055_SAMPLERATE_DELAY_MS);
+    }
+    }

     // Serial port state.
     Serial       port;
     String       buffer = "";
     final String serialConfigFile = "serialconfig.txt";
     boolean      printSerial = false;
-...
     GPanel    configPanel;
     GDropList serialList;
     GLabel    serialLabel;
     GLabel    calLabel;
     GCheckbox printSerialCheckbox;
     void setup()
+    {
       size(400, 550, OPENGL);
       size(640, 480, OPENGL);
       frameRate(30);
       model = new OBJModel(this);
       model.load("bunny.obj");
-...
       serialList = new GDropList(this, 90, 20, 200, 200, 6);
       serialList.setItems(availablePorts, selectedPort);
       configPanel.addControl(serialList);
       calLabel = new GLabel(this, 300, 20, 350, 25, "Calibration: Sys=? Gyro=? Accel=? Mag=?");
       configPanel.addControl(calLabel);
       printSerialCheckbox = new GCheckbox(this, 5, 50, 200, 20, "Print serial data");
       printSerialCheckbox.setSelected(printSerial);
       configPanel.addControl(printSerialCheckbox);
-...
       pointLight(200, 200, 255, -400, 400,  500);
       pointLight(255, 255, 255,    0,   0, -500);
       // Displace objects from 0,0
       translate(200, 300, 0);
       // Move bunny from 0,0 in upper left corner to roughly center of screen.
       translate(300, 380, 0);
       // Rotate shapes around the X/Y/Z axis (values in radians, 0..Pi*2)
       rotateZ(radians(roll));
-...
           roll  = float(list[3]); // Roll = Z
           pitch = float(list[2]); // Pitch = Y
           yaw   = float(list[1]); // Yaw/Heading = X
           buffer = incoming;
+        }
         if ( (list.length > 0) && (list[0].equals("Alt:")) )
+        {
           alt  = float(list[1]);
           buffer = incoming;
+        }
         if ( (list.length > 0) && (list[0].equals("Temp:")) )
+        {
           temp  = float(list[1]);
           buffer = incoming;
+        }
         if ( (list.length > 0) && (list[0].equals("Calibration:")) )
+        {
           int sysCal   = int(list[1]);
           int gyroCal  = int(list[2]);
           int accelCal = int(list[3]);
           int magCal   = int(list[4]);
           calLabel.setText("Calibration: Sys=" + sysCal + " Gyro=" + gyroCal + " Accel=" + accelCal + " Mag=" + magCal);
+        }
+      }
+    }
-...
       if (checkbox == printSerialCheckbox) {
         printSerial = printSerialCheckbox.isSelected();
+      }
+    }
+    }

Also available in: Unified diff