Merge pull request #3 from adam2872/revert-2-RAK4631-user-button

Revert "RAK4631 analogue user button on input 31"

examples/companion_radio/UITask.cpp

@@ -209,50 +209,40 @@ void UITask::userLedHandler() {
 }
 
 void UITask::buttonHandler() {
-  #ifdef PIN_USER_BTN || PIN_USER_BTN_ANA
-    static int prev_btn_state = !USER_BTN_PRESSED;
-    static int prev_btn_state_ana = !USER_BTN_PRESSED;
-    static unsigned long btn_state_change_time = 0;
-    static unsigned long next_read = 0;
-    int cur_time = millis();
-    if (cur_time >= next_read) {
-      int btn_state = 0;
-      int btn_state_ana = 0;
-      #ifdef PIN_USER_BTN
-      btn_state = digitalRead(PIN_USER_BTN);
-      #endif
-      #ifdef PIN_USER_BTN_ANA
-      btn_state_ana = (analogRead(PIN_USER_BTN_ANA) < 20); // analogRead returns a value hopefully below 20 when button is pressed. 
-      #endif
-      //Serial.println(analogRead(PIN_USER_BTN_ANA));
-      if (btn_state != prev_btn_state || btn_state_ana != prev_btn_state_ana) { // check for either digital or analogue button change of state
-        if (btn_state == USER_BTN_PRESSED || btn_state_ana == USER_BTN_PRESSED) {  // pressed?
-          if (_display != NULL) {
-            if (_display->isOn()) {
-              clearMsgPreview();
-            } else {
-              _display->turnOn();
-              _need_refresh = true;
-            }
-            _auto_off = cur_time + AUTO_OFF_MILLIS;   // extend auto-off timer
-          }
-        } else { // unpressed ? check pressed time ...
-          if ((cur_time - btn_state_change_time) > 5000) {
-          #ifdef PIN_STATUS_LED
-            digitalWrite(PIN_STATUS_LED, LOW);
-            delay(10);
-          #endif
-            _board->powerOff();
+#ifdef PIN_USER_BTN
+  static int prev_btn_state = !USER_BTN_PRESSED;
+  static unsigned long btn_state_change_time = 0;
+  static unsigned long next_read = 0;
+  int cur_time = millis();
+  if (cur_time >= next_read) {
+    int btn_state = digitalRead(PIN_USER_BTN);
+    if (btn_state != prev_btn_state) {
+      if (btn_state == USER_BTN_PRESSED) {  // pressed?
+        if (_display != NULL) {
+          if (_display->isOn()) {
+            clearMsgPreview();
+          } else {
+            _display->turnOn();
+            _need_refresh = true;
           }
+          _auto_off = cur_time + AUTO_OFF_MILLIS;   // extend auto-off timer
+        }
+      } else { // unpressed ? check pressed time ...
+        if ((cur_time - btn_state_change_time) > 5000) {
+        #ifdef PIN_STATUS_LED
+          digitalWrite(PIN_STATUS_LED, LOW);
+          delay(10);
+        #endif
+          _board->powerOff();
         }
-        btn_state_change_time = millis();
-        prev_btn_state = btn_state;
-        prev_btn_state_ana = btn_state_ana;
       }
-      next_read = millis() + 100;  // 10 reads per second
+      btn_state_change_time = millis();
+      prev_btn_state = btn_state;
     }
-  #endif
+    next_read = millis() + 100;  // 10 reads per second
   }
+#endif
+}
 
 void UITask::loop() {
   buttonHandler();

src/helpers/nrf52/RAK4631Board.cpp

@@ -25,9 +25,6 @@ void RAK4631Board::begin() {
 #ifdef PIN_USER_BTN
   pinMode(PIN_USER_BTN, INPUT_PULLUP);
 #endif
-#ifdef PIN_USER_BTN_ANA
-  pinMode(PIN_USER_BTN_ANA, INPUT_PULLUP);
-#endif
 
 #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
   Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL);

variants/rak4631/platformio.ini

@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
   -I variants/rak4631
   -D RAK_4631
   -D PIN_USER_BTN=9
-  -D PIN_USER_BTN_ANA=31
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1