Revision dbc34b4d

View differences:

Adafruit_BNO055.cpp
40 40
 *          sensor ID
41 41
 *  @param  address
42 42
 *          i2c address
43
 *  @param  *theWire
44
 *          Wire object
43 45
 */
44 46
Adafruit_BNO055::Adafruit_BNO055(int32_t sensorID, uint8_t address,
45 47
                                 TwoWire *theWire) {
......
517 519
/*!
518 520
 *  @brief  Reads the sensor's offset registers into an offset struct
519 521
 *  @param  offsets_type
522
 *          type of offsets
520 523
 *  @return true if read is successful
521 524
 */
522 525
bool Adafruit_BNO055::getSensorOffsets(
......
576 579

  
577 580
/*!
578 581
 *  @brief  Writes an array of calibration values to the sensor's offset
579
<<<<<<< HEAD
580
 * registers
581
=======
582
 *          registers
583
>>>>>>> 75f03d2e1fd440e7febc0de8c47a52bab09c51b0
584
 *  @param  calibData
582
 *  @param  *calibData
585 583
 *          calibration data
586 584
 */
587 585
void Adafruit_BNO055::setSensorOffsets(const uint8_t *calibData) {
......
628 626
/*!
629 627
 *  @brief  Writes to the sensor's offset registers from an offset struct
630 628
 *  @param  offsets_type
631
<<<<<<< HEAD
632 629
 *          accel_offset_x = acceleration offset x
633 630
 *          accel_offset_y = acceleration offset y
634 631
 *          accel_offset_z = acceleration offset z
......
640 637
 *          gyro_offset_x  = gyroscrope offset x
641 638
 *          gyro_offset_y  = gyroscrope offset y
642 639
 *          gyro_offset_z  = gyroscrope offset z
643
 *
644
 *
645
=======
646
>>>>>>> 75f03d2e1fd440e7febc0de8c47a52bab09c51b0
647 640
 */
648 641
void Adafruit_BNO055::setSensorOffsets(
649 642
    const adafruit_bno055_offsets_t &offsets_type) {

Also available in: Unified diff