Merge branch 'master' of https://github.com/Rione/ssl-RACOON-Pi2

Author: Yuzz1e

gpio.go

@@ -53,13 +53,19 @@ func RunGPIO(chgpio chan bool) {
 	// time.Sleep(time.Millisecond * 100)
 	// buzzer.DutyCycle(0, 32)
 
-	ringBuzzer(0, 100*time.Millisecond, 1244)
-	ringBuzzer(0, 100*time.Millisecond, 1108)
-	ringBuzzer(0, 150*time.Millisecond, 739)
-	time.Sleep(100 * time.Millisecond)
-	ringBuzzer(0, 100*time.Millisecond, 1479)
-	time.Sleep(100 * time.Millisecond)
-	ringBuzzer(0, 100*time.Millisecond, 1479)
+	 ringBuzzer(1, 1000*time.Millisecond)  //シ
+	 ringBuzzer(9, 1000*time.Millisecond)  //ソ
+	 ringBuzzer(4, 1000*time.Millisecond)  //レ
+	 ringBuzzer(9, 1000*time.Millisecond)  //ソ
+	 ringBuzzer(11, 1000*time.Millisecond) //ラ
+	 ringBuzzer(16, 1000*time.Millisecond) //レ
+ 	 time.Sleep(1000 * time.Millisecond)
+	 ringBuzzer(16, 1000*time.Millisecond) //レ
+	 ringBuzzer(11, 1000*time.Millisecond) //ラ
+	 ringBuzzer(1, 1000*time.Millisecond)  //シ
+	 ringBuzzer(11, 1000*time.Millisecond) //ラ
+	 ringBuzzer(9, 1000*time.Millisecond)  //ソ
+	 ringBuzzer(16, 1000*time.Millisecond) //レ
 
 	// ringBuzzer(0, 1000*time.Millisecond)  //ラ#
 	// ringBuzzer(1, 1000*time.Millisecond)  //シ

serial.go

@@ -142,8 +142,8 @@ func RunSerial(chclient chan bool, MyID uint32) {
 				sendbytes[16] = 0
 			}
 		} else {
-			sendbytes[16] = byte(imageData.Image_x)
-			prevImageX = int(imageData.Image_x)
+			sendbytes[16] = byte(imageData.Image_x * 255 / 639)
+			prevImageX = int(imageData.Image_x * 255 / 639)
 			zeroCountX = 0
 		}
 
@@ -155,8 +155,8 @@ func RunSerial(chclient chan bool, MyID uint32) {
 				sendbytes[17] = 0
 			}
 		} else {
-			sendbytes[17] = byte(imageData.Image_y)
-			prevImageY = int(imageData.Image_y)
+			sendbytes[17] = byte(int(imageData.Image_y / 10))
+			prevImageY = int(imageData.Image_y / 10)
 			zeroCountY = 0
 		}