Merge pull request #38 from jancumps/issue-5-query-gpio-input

Issue 35 refactor i2c initialisation

Author: jancumps

source/gpio/gpio_utils.c

@@ -9,7 +9,8 @@ uint outPins[] = {
     if you want to use this pin, remove the led_blinking_task() */
     22, 14, 15};
 
-// TODO input pins
+uint inPins[] = {
+    20, 21, 27};
 
 void initGpioUtils() {
     return; // nothing needed
@@ -19,14 +20,26 @@ uint32_t outPinCount() {
     return sizeof(outPins)/sizeof(outPins[0]);
 }
 
+uint32_t inPinCount() {
+    return sizeof(inPins)/sizeof(inPins[0]);
+}
+
 void initOutPins() {
     for (uint32_t i = 0; i < outPinCount(); i++) {
         gpio_init(outPins[i]);
-        gpio_set_dir(outPins[i], 1);
+        gpio_set_dir(outPins[i], true);
         gpio_put(outPins[i], 0);
     }
 }
 
+void initInPins() {
+    for (uint32_t i = 0; i < inPinCount(); i++) {
+        gpio_init(inPins[i]);
+        gpio_set_dir(inPins[i], false);
+        gpio_put(inPins[i], 0);
+    }
+}
+
 void setOutPinAt(uint32_t index, bool on) {
     gpio_put(outPins[index], on);
 }
@@ -35,4 +48,6 @@ bool isOutPinAt(uint32_t index) {
     return gpio_get_out_level(outPins[index]);
 }
 
-// TODO input pins
+bool isInPinAt(uint32_t index) {
+    return gpio_get(inPins[index]);
+}

source/gpio/gpio_utils.h

@@ -1,13 +1,17 @@
 #ifndef _GPIO_UTILS_H
 #define _GPIO_UTILS_H
 
+void initGpioUtils();
 
 uint32_t outPinCount();
-void initGpioUtils();
+
 void initOutPins();
 void setOutPinAt(uint32_t index, bool on);
 bool isOutPinAt(uint32_t index);
 
-// TODO gpio input pins
+uint32_t inPinCount();
+
+void initInPins();
+bool isInPinAt(uint32_t index);
 
 #endif // _GPIO_UTILS_H

source/scpi/scpi-def.c

@@ -110,7 +110,19 @@ static scpi_result_t SCPI_DigitalOutputQ(scpi_t * context) {
   return SCPI_RES_OK;
 }
 
-// TODO gpio in commands
+static scpi_result_t SCPI_DigitalInputQ(scpi_t * context) {
+  int32_t numbers[1];
+
+  // retrieve the output index
+  SCPI_CommandNumbers(context, numbers, 1, 0);
+  if (! ((numbers[0] > -1) && (numbers[0] < inPinCount()))) {
+    SCPI_ErrorPush(context, SCPI_ERROR_INVALID_SUFFIX);
+    return SCPI_RES_ERR;
+  }
+
+  SCPI_ResultBool(context, isInPinAt(numbers[0]));
+  return SCPI_RES_OK;
+}
 
 static scpi_result_t SCPI_AnalogInputQ(scpi_t * context) {
   int32_t numbers[1];
@@ -200,7 +212,7 @@ const scpi_command_t scpi_commands[] = {
     /* custom commands for the switch */
     {.pattern = "DIGItal:OUTPut#", .callback = SCPI_DigitalOutput,},
     {.pattern = "DIGItal:OUTPut#?", .callback = SCPI_DigitalOutputQ,},
-    // TODO gpio in commands
+    {.pattern = "DIGItal:INPut#?", .callback = SCPI_DigitalInputQ,},
     // adc commands
     {.pattern = "ANAlog:INPut#:RAW?", .callback = SCPI_AnalogInputQ,},
     {.pattern = "ANAlog:HIRES:INPut#:RAW?", .callback = SCPI_Analog16InputQ,},
@@ -265,8 +277,8 @@ scpi_result_t SCPI_Reset(scpi_t * context) {
 void initInstrument() {
     initGpioUtils();
     initOutPins();
+    initInPins();
     initI2CUtils();
-    // TODO input pins
     initAdcUtils();
     initAdcPins();
     initAdc16Reg();