浏览代码

Bug fix for reset

Per Mårtensson 3 年之前
父节点
当前提交
c61baed60d
共有 4 个文件被更改,包括 7 次插入7 次删除
  1. 2 2
      sw/key800/platformio.ini
  2. 1 1
      sw/key800/src/abc800_gpio.cpp
  3. 2 2
      sw/key800/src/abc800_keyboard.cpp
  4. 2 2
      sw/key800/src/main.cpp

+ 2 - 2
sw/key800/platformio.ini

@@ -26,8 +26,8 @@ lib_deps =
     https://github.com/plerup/espsoftwareserial.git#master
 
 
-upload_port = com6
-monitor_port = com6
+upload_port = /dev/ttyUSB0
+monitor_port = /dev/ttyUSB0
 monitor_speed = 115200
 
 build_type = debug

+ 1 - 1
sw/key800/src/abc800_gpio.cpp

@@ -21,7 +21,7 @@ namespace abc800 {
         ledcSetup(KEY800_PWM_CHANNEL, KEY800_PWM_FREQ, KEY800_PWM_RES);
         pinMode(K800_RST ,INPUT);
         pinMode(A800_RST ,OUTPUT);
-        digitalWrite(A800_RST,LOW);
+        digitalWrite(A800_RST,HIGH);
         pinMode(K800_TRXC ,INPUT);
         pinMode(A800_TRXC ,OUTPUT);
         pinMode(K800_KD ,INPUT);

+ 2 - 2
sw/key800/src/abc800_keyboard.cpp

@@ -80,9 +80,9 @@ namespace abc800
                 if (keyboard_action == ABC800_KEY_RESET)
                 {
                     ESP_LOGI(TAG,"RESET");
-                    digitalWrite(A800_RST,HIGH);
-                    delay(1000);
                     digitalWrite(A800_RST,LOW);
+                    delay(200);
+                    digitalWrite(A800_RST,HIGH);
 
                 }
 

+ 2 - 2
sw/key800/src/main.cpp

@@ -60,7 +60,7 @@ void setup()
 {
   Serial.begin(KEY800_SERIAL_BAUD_RATE);
   Serial1.begin(650,SERIAL_8N2,A800_RXD,A800_TXD);
-  abc800_serial_keyboard.begin(650,SWSERIAL_8N2,K800_RXD,K800_TXD,false);
+  abc800_serial_keyboard.begin(KEY800_SERIAL_BAUD_RATE,SWSERIAL_8N2,K800_RXD,K800_TXD,false);
   abc800_littlefs.setup();
   abc800_littlefs.loadconfig();
   abc800_gpio.init();
@@ -76,7 +76,7 @@ void setup()
   digitalWrite(KEY800_LED,HIGH);
   abc800_keyboard.init();
   abc800_wifi.setup();
-  digitalWrite(A800_RST,HIGH);
+  //digitalWrite(A800_RST,HIGH);
 
 }