fixed default pin output

dakhnod · Jul 21, 2024 · f715b8d · f715b8d
1 parent 698a06f
commit f715b8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ CUSTOM_INCLUDES_DIR = $(PROJ_DIR)/src/common
 ADB_TARGET ?= Pixel-5
 ADB_DIRECTORY ?= /sdcard/dfu
 
-FIRMWARE_VERSION := \"0.8.3\"
+FIRMWARE_VERSION := \"0.8.4\"
 
 # Source files common to all targets
 SRC_FILES += \

diff --git a/src/gpio/sensor_gpio.c b/src/gpio/sensor_gpio.c
@@ -163,8 +163,7 @@ void gpio_configure_aio_outputs_digital() {
     if(config->direction != OUTPUT){
       continue;
     }
-    nrf_gpio_cfg_output(config->pin.output.pin);
-    gpio_write_output_digital_pin(i, config->pin.output.default_state);
+    gpio_write_output_digital_pin(current_index, config->pin.output.default_state);
     current_index++;
   };
 }
@@ -309,7 +308,8 @@ void gpio_handle_parse_output_digital(uint32_t index, uint32_t pin, uint8_t defa
   config->direction = OUTPUT;
   config->pin.output.pin = pin;
   config->pin.output.default_state = default_state;
-  config->pin.output.invert = invert;
+  config->pin.output.invert = invert; 
+  config->pin.output.state = 0b10; // force output pin configuration
 }
 
 void gpio_handle_parse_output_analog(uint32_t index, uint32_t pin, uint8_t invert) {
@@ -355,6 +355,7 @@ void gpio_init(gpio_input_change_handler_t input_change_handler) {
       gpio_configs[current_index].pin.output.pin = pin_index; \
       gpio_configs[current_index].pin.output.invert = GPIO_CONFIGURATION_PIN_##pin_index##_INVERT; \
       gpio_configs[current_index].pin.output.default_state = GPIO_CONFIGURATION_PIN_##pin_index##_DEFAULT_OUTPUT; \
+      gpio_configs[current_index].pin.output.state = 0b10; \
     } \
   }while (false)
 

diff --git a/src/persistence/pin_configuration.c b/src/persistence/pin_configuration.c
@@ -23,7 +23,7 @@ uint8_t is_output_pin_analog(uint8_t pin_byte) {
 }
 
 uint8_t get_output_digital_pin_default_state(uint8_t pin_byte) {
-  return (pin_byte & 0b0010) & 0b0010;
+  return (pin_byte & 0b0010) == 0b0010;
 }
 
 uint8_t is_input_pin_enabled(uint8_t pin_byte) {
@@ -35,7 +35,7 @@ uint8_t get_input_digital_pin_pull(uint8_t pin_byte) {
 }
 
 uint8_t get_pin_invert(uint8_t pin_byte) {
-  return (pin_byte & 0b0001) & 0b0001;
+  return (pin_byte & 0b0001) == 0b0001;
 }
 
 void parse_pin_byte(uint32_t pin_index, uint8_t pin_data) {