bugfix: gpio struct wrong mapping, refactor of hal methods

Author: MaksymShutiak

templates/blinky/nRF52840dk/hal.h

@@ -1,23 +1,47 @@
 #define P0 ((struct gpio *) 0x50000000)
 #define P1 ((struct gpio *) 0x50000300)
-#define BUILD_IN_LED_1 13
+
+#define BUILD_IN_BUTTON_4_PIN 25
+#define BUILD_IN_BUTTON_3_PIN 24
+#define BUILD_IN_BUTTON_2_PIN 12
+#define BUILD_IN_BUTTON_1_PIN 11
+#define BUILD_IN_LED_1_PIN 13
+#define BUILD_IN_LED_2_PIN 14
+#define BUILD_IN_LED_3_PIN 15
+#define BUILD_IN_LED_4_PIN 16
 
 enum { GPIO_MODE_INPUT, GPIO_MODE_OUTPUT };
 enum { LOW, HIGH };
 
 struct gpio {
-  volatile uint32_t RESERVED[321], OUT, OUTSET, OUTCLR, IN, DIR, DIRSET, DIRCLR, LATCH, DETECTMODE, PIN_CNF[32];
+  volatile uint32_t RESERVED[321], OUT, OUTSET, OUTCLR, IN, DIR, DIRSET, DIRCLR, LATCH, DETECTMODE, RESERVED_SECOND[118], PIN_CNF[32];
 };
 
-void set_gpio_mode(struct gpio * port, int pin, int mode) {
-  port->DIR |= mode << pin;
+void set_gpio_mode(struct gpio * port, int pin, int mode, int pull) {
+  if (pull == 0) {
+    port->PIN_CNF[pin] = mode << 0;
+  }
+  else {
+    port->PIN_CNF[pin] = mode << 0 | pull << 2;
+  }
 }
 
+int gpio_read(struct gpio * port, int pin) {
+  uint32_t button = ~(port->IN);
+  if (button & (1 << pin)) {
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
 void gpio_write(struct gpio * port, int pin, int value) {
-  if (value == 1)
-    port->OUTSET |= 1 << pin;
-  else
-    port->OUTCLR |= 1 << pin;
+  if (value == 0) {
+    port->OUTSET = 1 << pin;
+  }
+  else {
+    port->OUTCLR = 1 << pin;
+  }
 }
 
 static inline void spin(volatile uint32_t count) {

templates/blinky/nRF52840dk/main.c

@@ -2,12 +2,21 @@
 #include "hal.h"
 
 int main(void) {
-  set_gpio_mode(P0, BUILD_IN_LED_1, GPIO_MODE_OUTPUT);
+  set_gpio_mode(P0, BUILD_IN_LED_1_PIN, GPIO_MODE_OUTPUT, 0);
+  set_gpio_mode(P0, BUILD_IN_LED_2_PIN, GPIO_MODE_OUTPUT, 0);
+  set_gpio_mode(P0, BUILD_IN_LED_3_PIN, GPIO_MODE_OUTPUT, 0);
+  set_gpio_mode(P0, BUILD_IN_LED_4_PIN, GPIO_MODE_OUTPUT, 0);
 
   while (1) {
-    gpio_write(P0, BUILD_IN_LED_1, HIGH);
+    gpio_write(P0, BUILD_IN_LED_1_PIN, HIGH);
+    gpio_write(P0, BUILD_IN_LED_2_PIN, HIGH);
+    gpio_write(P0, BUILD_IN_LED_3_PIN, HIGH);
+    gpio_write(P0, BUILD_IN_LED_4_PIN, HIGH);
     spin(9999999);
-    gpio_write(P0, BUILD_IN_LED_1, LOW);
+    gpio_write(P0, BUILD_IN_LED_4_PIN, LOW);
+    gpio_write(P0, BUILD_IN_LED_3_PIN, LOW);
+    gpio_write(P0, BUILD_IN_LED_2_PIN, LOW);
+    gpio_write(P0, BUILD_IN_LED_1_PIN, LOW);
     spin(9999999);
   }
 }