...

diff --git a/arduino/Sensors/Sensors.ino b/arduino/Sensors/Sensors.ino
index 7db9b3fa6fcf3f6c9ec63c98460c23d85e98e8b5..cebfb473381b7f677c09e0620ee67c026de62c1f 100644 (file)
--- a/arduino/Sensors/Sensors.ino
+++ b/arduino/Sensors/Sensors.ino
@@ -6,7 +6,7 @@ int cnt = 0;
 const int ledPin = 12;
 
 void setup() {
-  //Serial.begin(9600);
+  Serial.begin(9600);
   BTSerial.begin(9600);  // HC-06 current bound rate (default 9600)
   pinMode(ledPin, OUTPUT);
   pinMode(0, INPUT);
@@ -59,21 +59,21 @@ void loop() {
     Serial.print("Body: ");
     Serial.println(hb);
     */
-    /*
+    
     Serial.print(">");
     Serial.print(lv);
     Serial.print(":");
-    Serial.print(temperature);
+    Serial.print(tv);
     Serial.print(":");
     Serial.print(hb);
     Serial.print(":");
     Serial.print(hv);
-    Serial.println(" ");*/
+    Serial.println(" ");
     
     BTSerial.write(">");
     BTSerial.write(itos(lv));
     BTSerial.write(":");
-    BTSerial.write(itos(temperature));
+    BTSerial.write(itos(tv));
     BTSerial.write(":");
     BTSerial.write(itos(hb));
     BTSerial.write(":");

diff --git a/learn/swift/.DS_Store b/learn/swift/.DS_Store
index 6ff8adaf05313f183dc84d1017721242953fce99..0af6509e8bbda9106a7fcb0fe74feb24d9cbab14 100644 (file)
Binary files a/learn/swift/.DS_Store and b/learn/swift/.DS_Store differ

diff --git a/learn/swift/MyPlayground.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/learn/swift/MyPlayground.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate
index 3b9dccf4c8e5def86e48e57b79dbf41e2e653a4f..0624362111c67e7a0e26f04385fd652ca5b82dd9 100644 (file)
Binary files a/learn/swift/MyPlayground.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/learn/swift/MyPlayground.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/learn/swift/MyPlayground.playground/section-1.swift b/learn/swift/MyPlayground.playground/section-1.swift
index 74b3f9bc51a3640cba3d789092af97a1f1bf8ee5..bb6b9ec99103ca8bb6c2cbb96ddabd1f2072eb31 100644 (file)
--- a/learn/swift/MyPlayground.playground/section-1.swift
+++ b/learn/swift/MyPlayground.playground/section-1.swift
@@ -33,7 +33,6 @@ var dict = [
 ]
 println(dict)
 
-
 // 创建空数组和空字典
 var EmptyArray = [String]()
 var EmptyDict  = [String:String]()

diff --git a/tools/AceBox/.DS_Store b/tools/AceBox/.DS_Store
index 6ff7f1596d4448a3a1d49e1c25fafb8ee1c4e855..dca8d9e993a548c0f91d6f46a4cf61de703156cc 100644 (file)
Binary files a/tools/AceBox/.DS_Store and b/tools/AceBox/.DS_Store differ

diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout
index 7a2852c511ac6af53e7e668e4470779fd7ddfd43..24b02873d15311ac210fd59ffa9bacadc9bd2fe2 100644 (file)
--- a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout
+++ b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout
@@ -7,14 +7,14 @@
        <key>IDESourceControlProjectIdentifier</key>
        <string>A1372EDB-125D-4A73-9AE8-955FA3D42EAE</string>
        <key>IDESourceControlProjectName</key>
-       <string>AceBox</string>
+       <string>project</string>
        <key>IDESourceControlProjectOriginsDictionary</key>
        <dict>
                <key>BA634633803B1A00DDD2BCDEF5C645E5844F56E6</key>
                <string>https://github.com/acevest/acecode</string>
        </dict>
        <key>IDESourceControlProjectPath</key>
-       <string>tools/AceBox/AceBox.xcodeproj</string>
+       <string>tools/AceBox/AceBox.xcodeproj/project.xcworkspace</string>
        <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
        <dict>
                <key>BA634633803B1A00DDD2BCDEF5C645E5844F56E6</key>

diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate
index 286c512b084157538a616842133886ef4f729910..857562d398f0879939f509b1d7582b6b1ebacdc9 100644 (file)
Binary files a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ