Merge branch 'master' into issue/electron_update

entrylabs · May 11, 2021 · 6de857f · 6de857f
2 parents dedbbba + c613743
commit 6de857f
Show file tree

Hide file tree

Showing 39 changed files with 89,172 additions and 11,220 deletions.
diff --git a/README.md b/README.md
@@ -52,5 +52,3 @@ npm install --global node-gyp
 
 [The MIT License (MIT)](https://github.com/entrylabs/entry-hw/blob/master/LICENSE)
 
-## History
-2020-09-26 Gorilla-Cell HW branch forked from origin, writed by Remoted
diff --git a/app/firmwares/examples/hasseam/hasseam.ino b/app/firmwares/examples/hasseam/hasseam.ino
@@ -64,7 +64,7 @@ union {
   2:Input_Pullup
 */
 int analogs[6] = {0, 0, 0, 0, 0, 0};
-int digitals[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+int digitals[20] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 int servo_pins[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
 // Ultrasonic             //초음파 센서
@@ -472,6 +472,9 @@ void setBluetoothMode(boolean mode) {
 }
 
 void sendUltrasonic() {
+  pinMode(trigPin,OUTPUT); //sendAnalogValue와 중복으로 한번더 초기화
+  pinMode(echoPin,INPUT);
+
   digitalWrite(trigPin, LOW);
   delayMicroseconds(2);
   digitalWrite(trigPin, HIGH);

diff --git a/app/firmwares/gbot.hex b/app/firmwares/gbot.hex
diff --git a/app/firmwares/hasseam.hex b/app/firmwares/hasseam.hex
diff --git a/app/firmwares/microbit2.hex b/app/firmwares/microbit2.hex
diff --git a/app/firmwares/microbit_compatible.hex b/app/firmwares/microbit_compatible.hex
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,5 +52,3 @@ npm install --global node-gyp

		[The MIT License (MIT)](https://github.com/entrylabs/entry-hw/blob/master/LICENSE)

		## History
		2020-09-26 Gorilla-Cell HW branch forked from origin, writed by Remoted