Merge pull request #248 from ROBOTIS-GIT/develop

Develop

Author: ROBOTIS-Will

arduino/opencr_arduino/opencr/libraries/CAN/CAN.cpp

@@ -55,7 +55,7 @@ uint8_t CANClass::read(void)  //read one byte
     return drvCanRead(OPENCR_CAN_CHANNEL);
 }
 
-uint32_t  CANClass::avaliable(void)
+uint32_t  CANClass::available(void)
 {
     return drvCanAvailable(OPENCR_CAN_CHANNEL); 
 }
@@ -92,7 +92,7 @@ bool CANClass::readMessage(can_message_t *p_msg)
     return ret;
 }
 
-uint32_t CANClass::avaliableMessage(void)
+uint32_t CANClass::availableMessage(void)
 {
      return drvCanAvailableMsg(OPENCR_CAN_CHANNEL);
 }

arduino/opencr_arduino/opencr/libraries/CAN/CAN.h

@@ -35,10 +35,10 @@ class CANClass
     uint32_t write(uint32_t id, uint8_t *p_data, uint32_t length);  //write data
     uint32_t write(uint32_t id, uint8_t *p_data, uint32_t length, uint8_t format);
     uint8_t read(void); //read one byte
-    uint32_t  avaliable(void);
+    uint32_t  available(void);
     uint32_t writeMessage(can_message_t *p_msg);
     bool readMessage(can_message_t *p_msg);
-    uint32_t avaliableMessage(void);
+    uint32_t availableMessage(void);
 
     uint8_t getErrCount(void);
     uint32_t getError(void);

arduino/opencr_arduino/opencr/libraries/Eigen331/src/Eigen/src/OrderingMethods/Eigen_Colamd.h

@@ -1688,7 +1688,7 @@ static void detect_super_cols
 
 /*
   Defragments and compacts columns and rows in the workspace A.  Used when
-  all avaliable memory has been used while performing row merging.  Returns
+  all available memory has been used while performing row merging.  Returns
   the index of the first free position in A, after garbage collection.  The
   time taken by this routine is linear is the size of the array A, which is
   itself linear in the number of nonzeros in the input matrix.

arduino/opencr_arduino/opencr/libraries/IMU/imu_selector.cpp

@@ -207,8 +207,8 @@ void cIMUDevice::mag_get_adc( void )
   {
     case MPU9250:
       DEV1.mag_get_adc();
-      memcpy(magRAW,DEV2.magRAW,3*sizeof(int16_t));
-      memcpy(magADC,DEV2.magADC,3*sizeof(int16_t));
+      memcpy(magRAW,DEV1.magRAW,3*sizeof(int16_t));
+      memcpy(magADC,DEV1.magADC,3*sizeof(int16_t));
       break;
     case ICM20468:
       DEV2.mag_get_adc();

arduino/opencr_arduino/opencr/libraries/OpenCR/examples/10. Etc/CAN/canTxRxByte/canTxRxByte.ino

@@ -74,7 +74,7 @@ void setup()
 
 void loop() 
 {
-  if(CanBus.avaliableMessage())
+  if(CanBus.availableMessage())
   {
     Serial.print((char)CanBus.read());
   }

arduino/opencr_arduino/opencr/libraries/OpenCR/examples/10. Etc/CAN/canTxRxMessage/canTxRxMessage.ino

@@ -77,7 +77,7 @@ void setup()
 
 void loop()
 {
-  if (CanBus.avaliableMessage())
+  if (CanBus.availableMessage())
   {
     if(CanBus.readMessage(&rx_msg))
     {

arduino/opencr_arduino/opencr/libraries/OpenManipulator/src/delta_libs/src/delta.cpp

@@ -163,7 +163,7 @@ void Delta::initOpenManipulator(bool using_actual_robot_state, STRING usb_port,
   if (using_actual_robot_state_)
   {
     /*****************************************************************************
-    ** Initialize ㅓoint Actuator
+    ** Initialize Joint Actuator
     *****************************************************************************/
     joint_ = new delta_dynamixel::JointDynamixelProfileControl(control_rate);
 
@@ -240,4 +240,4 @@ void Delta::setReceiveDataFlag(bool receive_data_flag)
 void Delta::setPrevReceiveTime(double prev_receive_time)  
 {
   prev_receive_time_ = prev_receive_time;
-}
+}