Diff: main.cpp

Revision:

3:ab3979b1ae40

Parent:

2:8b71db86f221

Child:

4:9b08534bc72f

--- a/main.cpp	Wed Apr 01 03:52:21 2015 +0000
+++ b/main.cpp	Wed Apr 01 05:02:17 2015 +0000
@@ -7,7 +7,7 @@
 //Serial pc(USBTX, USBRX);        // tx, rx
 
 
-/*--Ethernet:begin--------------------------------------------------------------------------------------------*/
+/*--Ethernet:begin----------------------------------------------------------------------------------------*/
 #include "mbed.h"
 #include "EthernetInterface.h" 
 
@@ -38,7 +38,7 @@
 /*--Ethernet:end--------------------------------------------------------------------------------------------*/
 
 
-/*--Dynamixel:begin-------------------------------------------------------------------------------------------*/
+/*--Dynamixel:begin-----------------------------------------------------------------------------------------*/
 #include "AX12.h"
 #include "MX28.h"
 
@@ -76,10 +76,10 @@
 //    pitch.TorqueEnable(0);
 //    yaw.TorqueEnable(0);
 }
-/*--Dynamixel:end-------------------------------------------------------------------------------------------*/
+/*--Dynamixel:end-----------------------------------------------------------------------------------------*/
 
 
-/*--Thermal_Sensor:begin--------------------------------------------------------------------------------------*/
+/*--Thermal_Sensor:begin----------------------------------------------------------------------------------*/
 /*MEMS非接触温度センサ：形D6T-44L-06 4×4素子タイプ*/
 /*データシート：http://www.omron.co.jp/ecb/products/sensor/special/mems/pdf/AN-D6T-01JP_r2.pdf*/
 #include "MEMS.h"
@@ -93,7 +93,7 @@
     MEMS1.temp(data1);
     MEMS2.temp(data2);
 }
-/*--Thermal_Sensor:end--------------------------------------------------------------------------------------*/
+/*--Thermal_Sensor:end------------------------------------------------------------------------------------*/
 
 
 /*--CO2_Sensor:begin--------------------------------------------------------------------------------------*/
@@ -132,7 +132,7 @@
     
     while(1) {
         
-    /*--Dynamixel:begin-------------------------------------------------------------------------------------------*/       
+    /*--Dynamixel:begin-----------------------------------------------------------------------------------*/       
         //現在の角度・電圧・電流を取得
         myled1=1;
         lP=linear.GetPosition(); lV=linear.GetVolts();
@@ -150,21 +150,21 @@
         pitch.SetGoal(pitch_goal);
         yaw.SetGoal(yaw_goal);
         myled2=0;
-    /*--Dynamixel:end-------------------------------------------------------------------------------------------*/       
+    /*--Dynamixel:end--------------------------------------------------------------------------------------*/       
 
-    /*--Thermal_Sensor:begin--------------------------------------------------------------------------------------*/
+    /*--Thermal_Sensor:begin-------------------------------------------------------------------------------*/
         //値を取得
         Thermal_Sensor();
         //値を送信
         
-    /*--Thermal_Sensor:end--------------------------------------------------------------------------------------*/
+    /*--Thermal_Sensor:end---------------------------------------------------------------------------------*/
 
-    /*--CO2_Sensor:begin--------------------------------------------------------------------------------------*/
+    /*--CO2_Sensor:begin-----------------------------------------------------------------------------------*/
         //値を取得
         CO2_data=CO2_Sensor();
         //値を送信
         
-    /*--CO2_Sensor:end--------------------------------------------------------------------------------------*/
+    /*--CO2_Sensor:end-------------------------------------------------------------------------------------*/
                 
         //ホームポジション
         if() Dyna_home_position();