make version 2 board work

Author: zagto

main/CMakeLists.txt

@@ -1,2 +1,2 @@
-idf_component_register(SRCS "main.c" "wifi.c" "server.c" "switch.c"
+idf_component_register(SRCS "main.c" "wifi.c" "server.c" "switch.c" "host.c"
                     INCLUDE_DIRS ".")

main/config.h

@@ -1,4 +1,4 @@
 #pragma once
 
-#define WIFI_SSID "my wifi name"
-#define WIFI_PASSWORD "my wifi password"
+#define WIFI_SSID "ZagtoNet"
+#define WIFI_PASSWORD "catlike relocate camper"

main/host.c

@@ -0,0 +1,29 @@
+#include "driver/gpio.h"
+#include "host.h"
+#include "switch.h"
+#include "pins.h"
+#include "freertos/task.h"
+#include "esp_log.h"
+
+
+void host_task(void) {
+    while (true) {
+        vTaskDelay(25);
+
+        while (gpio_get_level(HOST_VOLT_DETECT) == 0) {
+            vTaskDelay(25);
+        }
+        ESP_LOGI("host", "Detected host power up");
+        if (!enter_host_mode()) {
+            ESP_LOGE("host", "Could not enter host mode - Please disconnect NBD client!");
+            vTaskDelay(1000);
+            continue;
+        }
+
+        while (gpio_get_level(HOST_VOLT_DETECT) == 1) {
+            vTaskDelay(25);
+        }
+        ESP_LOGI("host", "Detected host power down");
+        leave_host_mode();
+    }
+}

main/host.h

@@ -0,0 +1,3 @@
+#pragma once
+
+__attribute__((noreturn)) void host_task(void);

main/main.c

@@ -1,10 +1,24 @@
 #include "driver/sdmmc_host.h"
 #include "wifi.h"
 #include "server.h"
+#include "host.h"
+#include "switch.h"
+#include <pthread.h>
 
+static void *server_thread_main(void *unused) {
+    server_task();
+}
+
+static void *host_thread_main(void *ununsed) {
+    host_task();
+}
 
 void app_main(void) {
     sdmmc_host_init();
+    initialize_switch();
     initialize_wifi();
+    pthread_t host_thread;
+    pthread_create(&host_thread, NULL, host_thread_main, NULL);
     server_task();
+    //host_task();
 }

main/pins.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#define LED_GN 25
+#define LED_RT 26
+
+#define BUS_SW_HOST 16
+
+#define BUS_SW_ESP 17
+
+// for Power over MOSFET
+
+#define POWER_OVER_MOSFET 0
+
+#define SD_MOSFET_POWER_SWITCH 32
+#define SD_POWER_HOST 33
+#define SD_POWER_ESP 27
+
+
+// SD Interface
+#define ESP_CLK 14
+#define ESP_CMD 15
+#define ESP_D0   2
+#define ESP_D1   4
+#define ESP_D2  12
+#define ESP_D3  13
+
+// SPI
+#define ESP_MOSI 23
+#define ESP_MISO 19
+#define ESP_SCLK 18
+#define ESP_CS    5
+#define SD_CS ESP_CS
+
+// I2C
+#define ESP_SDA 21
+#define ESP_SCL 22
+
+#define SD_DETECT_PIN 35
+
+#define HOST_VOLT_DETECT 39

main/server.c

@@ -226,15 +226,15 @@ static bool transfer_card_data(int fd, sdmmc_card_t *card, uint32_t action, uint
     esp_err_t status;
     assert(sizeof(buffer) >= sector_size);
 
-    ESP_LOGE("server", "Access action %u, global_offset %llu, length %llu", action, global_offset, length);
+    //ESP_LOGE("server", "Access action %u, global_offset %llu, length %llu", action, global_offset, length);
 
     while (num_sectors > 0) {
         size_t max_sectors_in_buffer = sizeof(buffer) / sector_size;
         size_t sectors_in_buffer = num_sectors > max_sectors_in_buffer ? max_sectors_in_buffer : num_sectors;
-        ESP_LOGE("server", "iteration sectors_in_buffer %u", sectors_in_buffer);
+        //ESP_LOGE("server", "iteration sectors_in_buffer %u", sectors_in_buffer);
 
         if (start_offset != 0 && action == NBD_CMD_WRITE) {
-            ESP_LOGE("server", "reading first sector");
+            //ESP_LOGE("server", "reading first sector");
             /* For writes which don't align with sector boarders, we need to read the first sector
              * to know what should be written into the area that should not be changed but is part
              * of the same sector */
@@ -246,7 +246,7 @@ static bool transfer_card_data(int fd, sdmmc_card_t *card, uint32_t action, uint
         }
 
         if (num_sectors == sectors_in_buffer && end_offset != 0 && (num_sectors > 1 || start_offset == 0)) {
-            ESP_LOGE("server", "reading last sector");
+            //ESP_LOGE("server", "reading last sector");
             /* same for the last block, unless there is only one sector that has just been written
              * as the first */
             status = sdmmc_read_sectors(card,
@@ -263,7 +263,7 @@ static bool transfer_card_data(int fd, sdmmc_card_t *card, uint32_t action, uint
         if (num_sectors == sectors_in_buffer) {
             transfer_length -= end_offset;
         }
-        ESP_LOGE("server", "iteration transfer_length %u", transfer_length);
+        //ESP_LOGE("server", "iteration transfer_length %u", transfer_length);
 
         if (action == NBD_CMD_READ) {
             status = sdmmc_read_sectors(card, buffer, first_sector, sectors_in_buffer);
@@ -296,7 +296,7 @@ static bool transfer_card_data(int fd, sdmmc_card_t *card, uint32_t action, uint
         start_offset = 0;
     }
 
-    ESP_LOGE("server", "Access successful");
+    //ESP_LOGE("server", "Access successful");
     return true;
 }
 

main/server.h

@@ -1,3 +1,3 @@
 #pragma once
 
-void server_task(void);
+__attribute__((noreturn)) void server_task(void);

main/switch.c

@@ -1,44 +1,35 @@
 #include <stdlib.h>
+#include <pthread.h>
 #include "esp_log.h"
 #include "sdmmc_cmd.h"
 #include "driver/sdmmc_host.h"
 #include "driver/gpio.h"
 #include "switch.h"
+#include "pins.h"
 #include "freertos/task.h"
 
 
 static const uint64_t ALL_SD_PINS = GPIO_SEL_14|GPIO_SEL_15|GPIO_SEL_2|GPIO_SEL_4|GPIO_SEL_12|GPIO_SEL_13;
-static const uint64_t POWER_PINS = GPIO_SEL_0|GPIO_SEL_16|GPIO_SEL_19|GPIO_SEL_21|GPIO_SEL_32|GPIO_SEL_33;
 
 enum Mode {
     IDLE, FLASH, DEVICE
 };
 static enum Mode active_mode = IDLE;
 
 
+static pthread_mutex_t access_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+
 bool enter_flash_mode(sdmmc_card_t *card) {
+    if (pthread_mutex_trylock(&access_mutex) != 0) {
+        return false;
+    }
     ESP_LOGI("flash-mode", "Entering...");
 
-    gpio_config_t power_config = {
-        POWER_PINS,
-        GPIO_MODE_OUTPUT,
-        GPIO_PULLUP_ENABLE,
-        GPIO_PULLDOWN_DISABLE,
-        GPIO_INTR_DISABLE
-    };
-    gpio_config(&power_config);
-    for (uint64_t pin = 0; pin < 64; pin++) {
-        if (POWER_PINS & (1ull << pin)) {
-            gpio_set_drive_capability(pin, GPIO_DRIVE_CAP_3);
-        }
-    }
-    for (uint64_t pin = 0; pin < 64; pin++) {
-        if (POWER_PINS & (1ull << pin)) {
-            gpio_set_level(pin, 1);
-        }
-    }
+    gpio_set_level(SD_POWER_ESP, 0);
+    gpio_set_level(BUS_SW_ESP, 1);
 
-    vTaskDelay(50);
+    vTaskDelay(25);
 
     sdmmc_host_t host = SDMMC_HOST_DEFAULT();
     sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
@@ -66,11 +57,67 @@ bool enter_flash_mode(sdmmc_card_t *card) {
     return true;
 }
 
-
-void leave_flash_mode() {
+void leave_flash_mode(void) {
+    ESP_LOGI("flash-mode", "Leaving...");
+    gpio_set_level(BUS_SW_ESP, 0);
     for (uint64_t pin = 0; pin < 64; pin++) {
         if (ALL_SD_PINS & (1ull << pin)) {
             gpio_reset_pin(pin);
         }
     }
+    vTaskDelay(25);
+    gpio_set_level(SD_POWER_ESP, 1);
+
+    vTaskDelay(25);
+    pthread_mutex_unlock(&access_mutex);
+}
+
+bool enter_host_mode() {
+    if (pthread_mutex_trylock(&access_mutex) != 0) {
+        return false;
+    }
+    ESP_LOGI("host-mode", "Entering...");
+
+    gpio_set_level(SD_POWER_HOST, 0);
+    gpio_set_level(BUS_SW_HOST, 1);
+    return true;
+}
+
+void leave_host_mode() {
+    ESP_LOGI("host-mode", "Leaving...");
+    gpio_set_level(BUS_SW_HOST, 0);
+    vTaskDelay(25);
+    gpio_set_level(SD_POWER_HOST, 1);
+    vTaskDelay(25);
+    pthread_mutex_unlock(&access_mutex);
+}
+
+void initialize_switch(void) {
+    gpio_config_t power_config = {
+        (1ull<<SD_POWER_HOST)|(1ull<<SD_POWER_ESP)|(1ull<<BUS_SW_ESP)|(1ull<<BUS_SW_HOST),
+        GPIO_MODE_OUTPUT,
+        GPIO_PULLUP_DISABLE,
+        GPIO_PULLDOWN_DISABLE,
+        GPIO_INTR_DISABLE
+    };
+
+    gpio_config(&power_config);
+
+    gpio_config_t input_config = {
+        (1ull<<HOST_VOLT_DETECT),
+        GPIO_MODE_INPUT,
+        GPIO_PULLUP_DISABLE,
+        GPIO_PULLDOWN_ENABLE,
+        GPIO_INTR_DISABLE
+    };
+    gpio_config(&input_config);
+
+   // leave_flash_mode();
+
+    gpio_set_level(SD_POWER_HOST, 1);
+    gpio_set_level(BUS_SW_HOST, 0);
+    gpio_set_level(SD_POWER_ESP, 1);
+    gpio_set_level(BUS_SW_ESP, 0);
+
+    vTaskDelay(25);
 }

main/switch.h

@@ -4,4 +4,7 @@
 #include "driver/sdmmc_host.h"
 
 bool enter_flash_mode(sdmmc_card_t *card);
-void leave_flash_mode();
+void leave_flash_mode(void);
+bool enter_host_mode(void);
+void leave_host_mode(void);
+void initialize_switch(void);