nRF5x: Leave digital input disconnected for analog read (saves power)

nRF5x: Return 'analog' as pin mode for any pin where input is disconnected

Author: gfwilliams

ChangeLog

@@ -3,6 +3,8 @@
             Fix Array.fill crash if used to fill up all available memory (fix #1668)
             Fix NRF.requestDevice regression (clearInterval error) (fix #1669)
             Smartibot devices now advertise on BLE as 'Smartibot abcd'
+            nRF5x: Leave digital input disconnected for analog read (saves power)
+            nRF5x: Return 'analog' as pin mode for any pin where input is disconnected
 
      2v03 : nRF5x: Fix issue when calling NRF.setAdvertising while connected via BLE (fix #1659)
             nRF5x: 'dump()' not outputs `NRF.setSecurity` line if it has been called.

targets/nrf5x/jshardware.c

@@ -696,6 +696,7 @@ void jshPinSetState(Pin pin, JshPinState state) {
 #endif
   switch (state) {
     case JSHPINSTATE_UNDEFINED :
+    case JSHPINSTATE_ADC_IN :
       reg->PIN_CNF[ipin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
                               | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
                               | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
@@ -728,7 +729,6 @@ void jshPinSetState(Pin pin, JshPinState state) {
                               | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos);
       break;
     case JSHPINSTATE_GPIO_IN :
-    case JSHPINSTATE_ADC_IN :
     case JSHPINSTATE_USART_IN :
       nrf_gpio_cfg_input(ipin, NRF_GPIO_PIN_NOPULL);
       break;
@@ -784,13 +784,14 @@ JshPinState jshPinGetState(Pin pin) {
         return JSHPINSTATE_GPIO_OUT|hi;
     }
   } else {
+    bool pinConnected = ((p&GPIO_PIN_CNF_INPUT_Msk)>>GPIO_PIN_CNF_INPUT_Pos) == GPIO_PIN_CNF_INPUT_Connect;
     // Input
     if ((p&GPIO_PIN_CNF_PULL_Msk)==(GPIO_PIN_CNF_PULL_Pullup<<GPIO_PIN_CNF_PULL_Pos)) {
       return negated ? JSHPINSTATE_GPIO_IN_PULLDOWN : JSHPINSTATE_GPIO_IN_PULLUP;
     } else if ((p&GPIO_PIN_CNF_PULL_Msk)==(GPIO_PIN_CNF_PULL_Pulldown<<GPIO_PIN_CNF_PULL_Pos)) {
       return negated ? JSHPINSTATE_GPIO_IN_PULLUP : JSHPINSTATE_GPIO_IN_PULLDOWN;
     } else {
-      return JSHPINSTATE_GPIO_IN;
+      return pinConnected ? JSHPINSTATE_GPIO_IN : JSHPINSTATE_ADC_IN;
     }
   }
 }