Fixes

Author: KenVanHoeylandt

Devices/m5stack-tab5/Source/Configuration.cpp

@@ -1,5 +1,6 @@
 #include "devices/Display.h"
 #include "devices/SdCard.h"
+#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 

Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts

@@ -24,7 +24,7 @@
 		pin-scl-pullup;
 	};
 
-	uart0 {
+	uart1 {
 		compatible = "espressif,esp32-uart";
 		port = <UART_NUM_1>;
 		pin-tx = <43>;

Platforms/PlatformEsp32/Source/drivers/esp32_i2s.cpp

@@ -14,31 +14,31 @@
 
 #define TAG "esp32_i2s"
 
-struct Esp32SpiInternal {
+struct Esp32I2sInternal {
     Mutex mutex {};
     i2s_chan_handle_t tx_handle = nullptr;
     i2s_chan_handle_t rx_handle = nullptr;
     I2sConfig config {};
     bool config_set = false;
 
-    Esp32SpiInternal() {
+    Esp32I2sInternal() {
         mutex_construct(&mutex);
     }
 
-    ~Esp32SpiInternal() {
+    ~Esp32I2sInternal() {
         mutex_destruct(&mutex);
     }
 };
 
 #define GET_CONFIG(device) ((Esp32I2sConfig*)device->config)
-#define GET_DATA(device) ((Esp32SpiInternal*)device_get_driver_data(device))
+#define GET_DATA(device) ((Esp32I2sInternal*)device_get_driver_data(device))
 
 #define lock(data) mutex_lock(&data->mutex);
 #define unlock(data) mutex_unlock(&data->mutex);
 
 extern "C" {
 
-static error_t cleanup_channel_handles(Esp32SpiInternal* driver_data) {
+static error_t cleanup_channel_handles(Esp32I2sInternal* driver_data) {
     // TODO: error handling of i2ss functions
     if (driver_data->tx_handle) {
         i2s_channel_disable(driver_data->tx_handle);
@@ -188,7 +188,7 @@ static error_t get_config(Device* device, struct I2sConfig* config) {
 
 static error_t start(Device* device) {
     ESP_LOGI(TAG, "start %s", device->name);
-    auto* data = new(std::nothrow) Esp32SpiInternal();
+    auto* data = new(std::nothrow) Esp32I2sInternal();
     if (!data) return ERROR_OUT_OF_MEMORY;
 
     device_set_driver_data(device, data);

Platforms/PlatformEsp32/Source/drivers/esp32_spi.cpp

@@ -53,16 +53,14 @@ static error_t start(Device* device) {
     auto* data = new(std::nothrow) Esp32SpiInternal();
     if (!data) return ERROR_OUT_OF_MEMORY;
 
-    data->initialized = false;
+    if (data->initialized) {
+        return ERROR_INVALID_STATE;
+    }
+
     device_set_driver_data(device, data);
 
     auto* dts_config = GET_CONFIG(device);
 
-    if (data->initialized) {
-        spi_bus_free(dts_config->host);
-        data->initialized = false;
-    }
-
     spi_bus_config_t buscfg = {
         .mosi_io_num = dts_config->pin_mosi,
         .miso_io_num = dts_config->pin_miso,
@@ -73,7 +71,11 @@ static error_t start(Device* device) {
         .data5_io_num = GPIO_NUM_NC,
         .data6_io_num = GPIO_NUM_NC,
         .data7_io_num = GPIO_NUM_NC,
+        .data_io_default_level = false,
         .max_transfer_sz = dts_config->max_transfer_sz,
+        .flags = 0,
+        .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+        .intr_flags = 0
     };
 
     esp_err_t ret = spi_bus_initialize(dts_config->host, &buscfg, SPI_DMA_CH_AUTO);

Tactility/Private/Tactility/hal/gps/Ublox.h

@@ -14,13 +14,6 @@ void checksum(uint8_t* message, size_t length);
 // From https://github.com/meshtastic/firmware/blob/7648391f91f2b84e367ae2b38220b30936fb45b1/src/gps/GPS.cpp#L128
 uint8_t makePacket(uint8_t classId, uint8_t messageId, const uint8_t* payload, uint8_t payloadSize, uint8_t* bufferOut);
 
-template<size_t DataSize>
-inline void sendPacket(::Device* uart, uint8_t type, uint8_t id, uint8_t data[DataSize], const char* errorMessage, uint32_t timeout) {
-    static uint8_t buffer[250] = {0};
-    size_t length = makePacket(type, id, data, DataSize, buffer);
-//    hal::uart::writeBytes(port, buffer, length);
-}
-
 GpsModel probe(::Device* uart);
 
 bool init(::Device* uart, GpsModel model);

Tactility/Source/hal/gps/GpsInit.cpp

@@ -81,6 +81,7 @@ GpsResponse getACKCas(::Device* uart, uint8_t class_id, uint8_t msg_id, uint32_t
     uint32_t startTime = kernel::getMillis();
     uint8_t buffer[CAS_ACK_NACK_MSG_SIZE] = {0};
     uint8_t bufferPos = 0;
+    TickType_t waitTicks = pdMS_TO_TICKS(waitMillis);
 
     // CAS-ACK-(N)ACK structure
     //         | H1   | H2   | Payload Len | cls  | msg  | Payload                   | Checksum (4)              |
@@ -89,7 +90,7 @@ GpsResponse getACKCas(::Device* uart, uint8_t class_id, uint8_t msg_id, uint32_t
     // ACK-NACK| 0xBA | 0xCE | 0x04 | 0x00 | 0x05 | 0x00 | 0xXX | 0xXX | 0x00 | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX |
     // ACK-ACK | 0xBA | 0xCE | 0x04 | 0x00 | 0x05 | 0x01 | 0xXX | 0xXX | 0x00 | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX |
 
-    while (kernel::getTicks() - startTime < waitMillis) {
+    while (kernel::getTicks() - startTime < waitTicks) {
         size_t available = 0;
         uart_controller_get_available(uart, &available);
         if (available > 0) {

Tactility/Source/hal/gps/Ublox.cpp

@@ -64,6 +64,7 @@ GpsResponse getAck(::Device* uart, uint8_t class_id, uint8_t msg_id, uint32_t wa
     const uint8_t ackP[2] = {class_id, msg_id};
     uint8_t buf[10] = {0xB5, 0x62, 0x05, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint32_t startTime = kernel::getMillis();
+    TickType_t waitTicks = pdMS_TO_TICKS(waitMillis);
     const char frame_errors[] = "More than 100 frame errors";
     int sCounter = 0;
 #ifdef GPS_DEBUG
@@ -81,7 +82,7 @@ GpsResponse getAck(::Device* uart, uint8_t class_id, uint8_t msg_id, uint32_t wa
         buf[9] += buf[8];
     }
 
-    while (kernel::getTicks() - startTime < waitMillis) {
+    while (kernel::getTicks() - startTime < waitTicks) {
         if (ack > 9) {
 #ifdef GPS_DEBUG
             LOGGER.info("Got ACK for class {:02X} message {:02X} in {}ms", class_id, msg_id, kernel::getMillis() - startTime);

TactilityKernel/Include/tactility/device.h

@@ -46,7 +46,7 @@ struct Device {
 /**
  * Holds a device pointer and a compatible string.
  * The device must not be constructed, added or started yet.
- * This is used by the devicetree code generator and the application init sequence::.
+ * This is used by the devicetree code generator and the application init sequence.
  */
 struct CompatibleDevice {
     struct Device* device;