0.1.8 Pre-release

.github/workflows/devel.yml

@@ -34,9 +34,9 @@ jobs:
           export ICENAV3_LON=13.404
           export ICENAV3_LAT=52.520
           pio run
-      - name: Testing ESP32S3 MakerFabs Board
+      - name: Testing ESP32S3 T-Deck Board
         run: |
           export ICENAV3_LON=13.404
           export ICENAV3_LAT=52.520
-          pio run -e MAKERF_ESP32S3
+          pio run -e TDECK_ESP32S3
 

.github/workflows/platformio.yml

@@ -34,9 +34,10 @@ jobs:
           export ICENAV3_LON=13.404
           export ICENAV3_LAT=52.520
           pio run
-      - name: Testing ESP32S3 MakerFabs Board
+      - name: Testing ESP32S3 T-Deck Board
         run: |
           export ICENAV3_LON=13.404
           export ICENAV3_LAT=52.520
-          pio run -e MAKERF_ESP32S3
+          pio run -e TDECK_ESP32S3
 
+

.github/workflows/schedule.yml

@@ -36,6 +36,12 @@ jobs:
           export ICENAV3_LON=13.404
           export ICENAV3_LAT=52.520
           pio run -e MAKERF_ESP32S3
+      - name: Testing ESP32S3 T-Deck Board
+        run: |
+          export ICENAV3_LON=13.404
+          export ICENAV3_LAT=52.520
+          pio run -e TDECK_ESP32S3
 
+
 
 

SD Card File Structure/README.md

@@ -0,0 +1,40 @@
+## SD Renderized Map Tile File structure
+
+Using [Maperitive](http://maperitive.net/) select your zone and generate your tiles. For that enter to `MAP-> Set Geometry bounds` draw or expand the square of your zone and run the command `generate-tiles minzoom=6 maxzoom=17`, It could takes long time, maybe 1 hour or more depending your area.
+
+![Maperitive zone selection](/images/maperitive_zone_selection.jpg)
+
+After that, copy the contents of directory `Tiles` into your SD in a directory called `MAP`.
+
+On SD Card map tiles (256x256 PNG Format) should be stored, in these folders structure:
+
+      [ MAP ]
+         |________ [ zoom folder (number) ]
+                              |__________________ [ tile X folder (number) ]
+                                                             |_______________________ tile Y file.png
+
+## SD Vectorized Map File structure          
+
+Using [OSM_Extract](https://github.com/aresta/OSM_Extract) you can generate binary map files to later create vector maps. Once generated, these files should be saved in the `mymap` folder on the SD card.
+
+The PBF files can be downloaded from the [geofabrik](https://download.geofabrik.de/) website.
+
+The PBF files should be saved in the `pbf` directory. Once saved, you should select the region or boundaries for which the GeoJSON files will be generated.
+
+To obtain the boundaries, please check the [geojson.io](http://geojson.io) website.
+
+For generate GeoJSON files run inside `maps` directory:
+
+```bash
+ogr2ogr -t_srs EPSG:3857 -spat min_lon min_lat max_lon max_lat map_lines.geojson /pbf/downloaded.pbf lines
+
+ogr2ogr -t_srs EPSG:3857 -spat min_lon min_lat max_lon max_lat map_polygons.geojson /pbf/downloaded.pbf multipolygons
+```
+
+For generate binary map files run inside `maps` directory.
+```bash
+/scripts/./extract_features.py min_lon min_lat max_lon max_lat map
+```
+Once the process is completed, the maps will be inside the `maps/mymap` directory. Copy all folders to the SD card except the `test_imgs` directory.
+
+Please follow the instructions provided by [OSM_Extract](https://github.com/aresta/OSM_Extract) for any further questions.

SD Card File Structure/WPT/waypoint.gpx

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="IceNav" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+<wpt lat="48.890280"
+lon="2.306391">
+ <name>EXAMPLE WPT</name>
+</wpt>
+</gpx>

boards/T-Deck.json

@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default_16MB.csv",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": ["wifi"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "LilyGo T-Decl(16M Flash 8M OPI PSRAM )",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.lilygo.cc",
+  "vendor": "LilyGo"
+}

boards/elecrow-esp32-s3-n16r8v-terminal.json

@@ -8,7 +8,9 @@
       "core": "esp32",
       "extra_flags": [
         "-DBOARD_HAS_PSRAM",
-        "-DARDUINO_USB_MODE=1"
+        "-DARDUINO_USB_MODE=1",
+        "-DARDUINO_RUNNING_CORE=1",
+        "-DARDUINO_EVENT_RUNNING_CORE=1"
       ],
       "f_cpu": "240000000L",
       "f_flash": "80000000L",

boards/icenav-esp32-s3.json

@@ -11,9 +11,12 @@
         "-DBOARD_HAS_PSRAM",
         "-DARDUINO_USB_MODE=1",
         "-DARDUINO_USB_CDC_ON_BOOT=1",
-        "-DILI9488_FT5x06_SPI",
-        "-DTFT_BL=45",
-        "-DSPI_SHARED",
+        "-DARDUINO_RUNNING_CORE=1",
+        "-DARDUINO_EVENT_RUNNING_CORE=1",
+        "-DPOWER_SAVE",
+        "-DADC2",
+        "-DBATT_PIN=ADC2_CHANNEL_6",
+        "-DTFT_BL=46",
         "-DAT6558D_GPS",
         "-DQMC5883",
         "-DBME280"

include/hal.hpp

@@ -3,7 +3,7 @@
  * @author Jordi Gauchía ([email protected])
  * @brief  Boards Pin definitions
  * @version 0.1.8_Alpha
- * @date 2024-09
+ * @date 2024-11
  */
 
 #ifndef HAL_HPP
@@ -17,22 +17,39 @@
   #define I2C_SDA_PIN 38
   #define I2C_SCL_PIN 39
 
-  extern const uint8_t GPS_TX = 17;
-  extern const uint8_t GPS_RX = 18;
+  uint8_t GPS_TX = 43;
+  uint8_t GPS_RX = 44;
 
-  extern const uint8_t TFT_SPI_SCLK = 12;
-  extern const uint8_t TFT_SPI_MOSI = 11;
-  extern const uint8_t TFT_SPI_MISO = 13;
-  extern const uint8_t TFT_SPI_DC   = 3;
-  extern const uint8_t TFT_SPI_CS   = 10;
-  extern const uint8_t TFT_SPI_RST  = 6;
+  extern const uint8_t BOARD_BOOT_PIN = 0;
 
-  extern const uint8_t SD_CS = 21;
-  extern const uint8_t SD_MISO = 13;
-  extern const uint8_t SD_MOSI = 11;
-  extern const uint8_t SD_CLK = 12;
+  extern const uint8_t SD_CS = 1;
+  extern const uint8_t SD_MISO = 41;
+  extern const uint8_t SD_MOSI = 2;
+  extern const uint8_t SD_CLK = 42;
 
-  extern const uint8_t TCH_I2C_PORT = 0;
+  extern const uint8_t TFT_WR  = 18;
+  extern const uint8_t TFT_RD  = 48;
+  extern const uint8_t TFT_RS  = 45;
+  extern const uint8_t TFT_RST = -1;
+  extern const uint8_t TFT_CS  = -1;
+  extern const uint8_t TFT_D0  = 47;
+  extern const uint8_t TFT_D1  = 21;
+  extern const uint8_t TFT_D2  = 14;
+  extern const uint8_t TFT_D3  = 13;
+  extern const uint8_t TFT_D4  = 12;
+  extern const uint8_t TFT_D5  = 11;
+  extern const uint8_t TFT_D6  = 10;
+  extern const uint8_t TFT_D7  = 9;
+  extern const uint8_t TFT_D8  = 3;
+  extern const uint8_t TFT_D9  = 8;
+  extern const uint8_t TFT_D10 = 16;
+  extern const uint8_t TFT_D11 = 15;
+  extern const uint8_t TFT_D12 = 7;
+  extern const uint8_t TFT_D13 = 6;
+  extern const uint8_t TFT_D14 = 5;
+  extern const uint8_t TFT_D15 = 4;
+
+  extern const uint8_t TCH_I2C_PORT = 0;  
   extern const uint8_t TCH_I2C_SDA  = 38;
   extern const uint8_t TCH_I2C_SCL  = 39;
   extern const uint8_t TCH_I2C_INT  = 40;
@@ -50,12 +67,14 @@
   #define I2C_SCL_PIN 39
 
   // UART PORT
-  // extern const uint8_t GPS_TX = 44;  // UART PIN Terminal Port
-  // extern const uint8_t GPS_RX = 43;  // UART PIN Terminal Port
+  // uint8_t GPS_TX = 44;  // UART PIN Terminal Port
+  // uint8_t GPS_RX = 43;  // UART PIN Terminal Port
 
   // Alternative to UART PORT
-  extern const uint8_t GPS_TX = 40;  // Analog PIN Terminal Port
-  extern const uint8_t GPS_RX = 19;  // Digital PIN Terminal Port
+  uint8_t GPS_TX = 40;  // Analog PIN Terminal Port
+  uint8_t GPS_RX = 19;  // Digital PIN Terminal Port
+
+  extern const uint8_t BOARD_BOOT_PIN = 0;
 
   extern const uint8_t SD_CS = 1;
   extern const uint8_t SD_MISO = 41;
@@ -90,6 +109,38 @@
   extern const uint8_t TCH_I2C_INT  = -1;
 #endif
 
+#ifdef TDECK_ESP32S3   // Check GPS UART GPIO
+  #define I2C_SDA_PIN 18
+  #define I2C_SCL_PIN 8
+
+  #define BOARD_POWERON 10
+  extern const uint8_t BOARD_BOOT_PIN = 0;
+
+  uint8_t GPS_TX = 43;
+  uint8_t GPS_RX = 44;
+
+  extern const uint8_t TFT_SPI_SCLK = 40;
+  extern const uint8_t TFT_SPI_MOSI = 41;
+  extern const uint8_t TFT_SPI_MISO = 38;
+  extern const uint8_t TFT_SPI_DC   = 11;
+  extern const uint8_t TFT_SPI_CS   = 12;
+  extern const uint8_t TFT_SPI_RST  = -1;
+  extern const uint8_t TFT_SPI_BL   = 42;
+
+  extern const uint8_t SD_CS = 39;
+  extern const uint8_t SD_MISO = 38;
+  extern const uint8_t SD_MOSI = 41;
+  extern const uint8_t SD_CLK = 40;
+
+  extern const uint8_t BOARD_TFT_CS = 12;
+  extern const uint8_t RADIO_CS_PIN = 9;
+
+  extern const uint8_t TCH_I2C_PORT = 0;
+  extern const uint8_t TCH_I2C_SDA  = 18;
+  extern const uint8_t TCH_I2C_SCL  = 8;
+  extern const uint8_t TCH_I2C_INT  = 16;
+#endif
+
 /**
  * @brief MAKERFABS ESP32S3 BOARD pin definition
  *
@@ -101,8 +152,10 @@
   #define I2C_SDA_PIN 38
   #define I2C_SCL_PIN 39
 
-  extern const uint8_t GPS_TX = 17;
-  extern const uint8_t GPS_RX = 18;
+  uint8_t GPS_TX = 17;
+  uint8_t GPS_RX = 18;
+
+  extern const uint8_t BOARD_BOOT_PIN = 0;
 
   extern const uint8_t SD_CS = 1;
   extern const uint8_t SD_MISO = 41;
@@ -143,8 +196,10 @@
  */
 #ifdef ESP32_N16R4
 
-  extern const uint8_t GPS_TX = 25;
-  extern const uint8_t GPS_RX = 26;
+  uint8_t GPS_TX = 25;
+  uint8_t GPS_RX = 26;
+
+  extern const uint8_t BOARD_BOOT_PIN = 0;
 
   extern const uint8_t TFT_SPI_SCLK = 14;
   extern const uint8_t TFT_SPI_MOSI = 13;
@@ -178,8 +233,10 @@
   #define I2C_SDA_PIN 38
   #define I2C_SCL_PIN 39
 
-  extern const uint8_t GPS_TX = 17;
-  extern const uint8_t GPS_RX = 18;
+  uint8_t GPS_TX = 17;
+  uint8_t GPS_RX = 18;
+
+  extern const uint8_t BOARD_BOOT_PIN = 0;
 
   extern const uint8_t TFT_SPI_SCLK = 12;
   extern const uint8_t TFT_SPI_MOSI = 11;

lib/battery/battery.cpp

@@ -3,7 +3,7 @@
  * @author Jordi Gauchía ([email protected])
  * @brief  Battery monitor definition and functions
  * @version 0.1.8_Alpha
- * @date 2024-09
+ * @date 2024-11
  */
 
 
@@ -15,9 +15,11 @@
  */
 uint8_t battLevel = 0;
 uint8_t battLevelOld = 0;
+float batteryMax = 4.2;      // maximum voltage of battery
+float batteryMin = 3.6;      // minimum voltage of battery before shutdown
 
 /**
- * @brief Configurate ADC Channel for battery reading
+ * @brief Configure ADC Channel for battery reading
  *
  */
 void initADC()
@@ -26,14 +28,15 @@ void initADC()
   //     0dB attenuation (ADC_ATTEN_DB_0) gives full-scale voltage 1.1V
   //     2.5dB attenuation (ADC_ATTEN_DB_2_5) gives full-scale voltage 1.5V
   //     6dB attenuation (ADC_ATTEN_DB_6) gives full-scale voltage 2.2V
-  //     11dB attenuation (ADC_ATTEN_DB_11) gives full-scale voltage 3.9V
+  //     12dB attenuation (ADC_ATTEN_DB_12) gives full-scale voltage 3.9V
 
-  #ifndef ELECROW_ESP32
+  #ifdef ADC1
     adc1_config_width(ADC_WIDTH_BIT_12);
-    adc1_config_channel_atten(ADC1_CHANNEL_6, ADC_ATTEN_DB_12);
+    adc1_config_channel_atten(BATT_PIN, ADC_ATTEN_DB_12); 
   #endif
-  #ifdef ELECROW_ESP32
-    adc2_config_channel_atten(ADC2_CHANNEL_6, ADC_ATTEN_DB_12);
+
+  #ifdef ADC2
+    adc2_config_channel_atten(BATT_PIN, ADC_ATTEN_DB_12);
   #endif
 }
 
@@ -49,15 +52,18 @@ float batteryRead()
   float output = 0.0;  // output value
   for (int i = 0; i < 100; i++)
   {
-    #ifndef ELECROW_ESP32
-     sum += (long)adc1_get_raw(ADC1_CHANNEL_6);
+
+    #ifdef ADC1
+      sum += (long)adc1_get_raw(BATT_PIN);
     #endif
-    #ifdef ELECROW_ESP32
+
+    #ifdef ADC2
      int readRaw;
-     esp_err_t r = adc2_get_raw(ADC2_CHANNEL_6, ADC_WIDTH_BIT_12, &readRaw);
+     esp_err_t r = adc2_get_raw(BATT_PIN, ADC_WIDTH_BIT_12, &readRaw);
      if (r == ESP_OK)
       sum += (long)readRaw;
     #endif
+
     delayMicroseconds(150);
   }
   voltage = sum / (float)100;

lib/battery/battery.hpp

@@ -3,7 +3,7 @@
  * @author Jordi Gauchía ([email protected])
  * @brief  Battery monitor definition and functions
  * @version 0.1.8_Alpha
- * @date 2024-09
+ * @date 2024-11
  */
 
 #ifndef BATTERY_HPP
@@ -16,8 +16,8 @@
 static esp_adc_cal_characteristics_t characteristics;
 #define V_REF 3.9 // ADC reference voltage
 
-static float batteryMax = 4.20;     // 4.2;      // maximum voltage of battery
-static float batteryMin = 3.40;     // 3.6;      // minimum voltage of battery before shutdown
+extern float batteryMax;     // 4.2;      // maximum voltage of battery
+extern float batteryMin;     // 3.6;      // minimum voltage of battery before shutdown
 
 extern uint8_t battLevel;
 extern uint8_t battLevelOld;