From: acevest <zhaoyanbai@126.com>
Date: Sun, 7 Jun 2015 09:24:08 +0000 (+0800)
Subject: ...
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=bd90e6f7618fefe69a35cfdd8ed1a3235b886ef5;p=acecode.git

...
---

diff --git a/arduino/Sensors/Sensors.ino b/arduino/Sensors/Sensors.ino
index 7db9b3f..cebfb47 100644
--- 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 6ff8ada..0af6509 100644
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 3b9dccf..0624362 100644
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 74b3f9b..bb6b9ec 100644
--- 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 6ff7f15..dca8d9e 100644
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 7a2852c..24b0287 100644
--- 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 286c512..857562d 100644
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