mas cerca

2024-04-15 17:28:57 -04:00 · 2024-04-15 17:28:57 -04:00 · 56bec8db5a
parent 5ed2867d66
commit 56bec8db5a
5 changed files with 48 additions and 55 deletions
--- a/platformio.ini
+++ b/platformio.ini
@ -286,40 +286,39 @@ lib_deps =
 	${common.lib_deps}
 	jgromes/RadioLib @ 6.1.0
 	bodmer/TFT_eSPI@^2.5.43
-	
+

 [env:ttgo_t_deck_gps]
-board = esp32s3box
+board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
 build_flags = 
 	-DTTGO_T_DECK_GPS
 	-DHAS_SX126X
 	-DHAS_TFT
-    -D USER_SETUP_LOADED
-	-D TFT_WIDTH=240
-	-D TFT_HEIGHT=320
-    -D ST7789_DRIVER
-    -D TFT_RGB_ORDER=TFT_BGR
-	-D TFT_MISO=38
-    -D TFT_MOSI=41
-    -D TFT_SCLK=40
-    -D TFT_CS=12
-    -D TFT_DC=11
-    -D TFT_RST=-1
-	-D TFT_BL=42
-	-D TFT_BACKLIGHT_ON=1
-    -D TOUCH_CS=16
-    -D LOAD_GLCD
-    -D LOAD_FONT2
-    -D LOAD_FONT4
-    -D LOAD_FONT6
-    -D LOAD_FONT7
-    -D LOAD_FONT8
-    -D SPI_FREQUENCY=40000000
-	-D SPI_READ_FREQUENCY=16000000
-	-D SPI_TOUCH_FREQUENCY=2500000
-    -D LOAD_GFXFF
-    -D SMOOTH_FONT
+    -DUSER_SETUP_LOADED
+    -DST7789_DRIVER
+	-DTFT_WIDTH=240
+	-DTFT_HEIGHT=320
+    -DCGRAM_OFFSET
+    -DTFT_RGB_ORDER=TFT_BGR
+    -DTFT_INVERSION_ON
+    -DTFT_MISO=38
+    -DTFT_MOSI=41
+    -DTFT_SCLK=40
+    -DTFT_CS=12
+    -DTFT_DC=11
+    -DTFT_RST=-1
+	-DTFT_BL=42
+	-DTFT_BACKLIGHT_ON=1
+    -DTOUCH_CS=-1
+    -DLOAD_GLCD
+    -DLOAD_FONT2
+    -DLOAD_FONT4
+    -DLOAD_FONT6
+    -DLOAD_FONT7
+    -DLOAD_FONT8
+    -DSPI_FREQUENCY=40000000
+    -DSPI_READ_FREQUENCY=20000000
 lib_deps =
 	${common.lib_deps}
 	jgromes/RadioLib @ 6.1.0
--- a/src/LoRa_APRS_Tracker.cpp
+++ b/src/LoRa_APRS_Tracker.cpp
@ -134,15 +134,12 @@ logging::Logger                     logger;

 void setup() {
    Serial.begin(115200);
+
    #ifndef DEBUG
    logger.setDebugLevel(logging::LoggerLevel::LOGGER_LEVEL_INFO);
    #endif

    POWER_Utils::setup();
-    
-    /* para HELTEC WIRELESS TRACKER!
-    pinMode(internalLedPin ,OUTPUT);
-	digitalWrite(internalLedPin, LOW);*/

    setup_display();

@ -177,7 +174,6 @@ void setup() {
        pinMode(Config.ptt.io_pin, OUTPUT);
        digitalWrite(Config.ptt.io_pin, Config.ptt.reverse ? HIGH : LOW);
    }
-
    MSG_Utils::loadNumMessages();
    GPS_Utils::setup();
    currentLoRaType = &Config.loraTypes[loraIndex];
@ -213,8 +209,8 @@ void setup() {
    menuDisplay = 0;
 }

-void loop() {}
-    /*currentBeacon = &Config.beacons[myBeaconsIndex];
+void loop() {
+    currentBeacon = &Config.beacons[myBeaconsIndex];
    if (statusState) {
        Config.validateConfigFile(currentBeacon->callsign);
        miceActive = Config.validateMicE(currentBeacon->micE);
@ -276,4 +272,4 @@ void loop() {}
        MENU_Utils::showOnScreen();
        refreshDisplayTime = millis();
    }
-}*/
+}
--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@ -25,7 +25,7 @@ SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUS
 bool transmissionFlag = true;
 bool enableInterrupt = true;
 #endif
-#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
 SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
 bool transmissionFlag = true;
 bool enableInterrupt = true;
@ -53,7 +53,7 @@ namespace LoRa_Utils {
        float signalBandwidth = currentLoRaType->signalBandwidth/1000;
        radio.setBandwidth(signalBandwidth);
        radio.setCodingRate(currentLoRaType->codingRate4);
-        #if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+        #if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
        radio.setOutputPower(currentLoRaType->power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22.
        #endif
        #if defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom)
@ -105,7 +105,7 @@ namespace LoRa_Utils {
        #if defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom)
        radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
        #endif
-        #if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+        #if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
        state = radio.setOutputPower(currentLoRaType->power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22.
        #endif
        #if defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom)
--- a/src/pins_config.h
+++ b/src/pins_config.h
@ -6,7 +6,7 @@
 #undef OLED_RST


-#if !defined(TTGO_T_Beam_S3_SUPREME_V3) && !defined(HELTEC_V3_GPS) && !defined(ESP32_C3_DIY_LoRa_GPS)
+#if !defined(TTGO_T_Beam_S3_SUPREME_V3) && !defined(HELTEC_V3_GPS) && !defined(ESP32_C3_DIY_LoRa_GPS) || !defined(TTGO_T_DECK_GPS)
 #define OLED_SDA            21
 #define OLED_SCL            22
 #define OLED_RST            16
@ -159,13 +159,13 @@
 #define RADIO_BUSY_PIN      13  // SX1262 BUSY
 #endif

-#ifdef TTGO_T_DECK
+#ifdef TTGO_T_DECK_GPS
 #define GPS_RX              43
 #define GPS_TX              44
 #define BOARD_I2C_SDA       18
 #define BOARD_I2C_SCL       8
 #define BOARD_POWERON       10
-#define BOARD_SDCARD_CS     39
+//#define BOARD_SDCARD_CS     39

 #define RADIO_SCLK_PIN      40
 #define RADIO_MISO_PIN      38
@ -180,11 +180,11 @@
 #define BOARD_I2S_DOUT  6*/

 // trackbal
-/*#define TrackBallCenter     0
+#define TrackBallCenter     0
 #define TrackBallUp         3   // G S1
 #define TrackBallDown       15  // G S3
 #define TrackBallLeft       1   // G S4
-#define TrackBallRight      2   // G S2*/
+#define TrackBallRight      2   // G S2

 #endif

--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@ -86,7 +86,7 @@ namespace POWER_Utils {
        }

    bool isCharging() {
-        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
        return 0;
        #endif
        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
@ -103,7 +103,7 @@ namespace POWER_Utils {
    }

    double getBatteryChargeDischargeCurrent() {
-        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
        return 0;
        #endif
        #ifdef HAS_AXP192
@ -118,7 +118,7 @@ namespace POWER_Utils {
    }

    bool isBatteryConnected() {
-        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
        if(getBatteryVoltage() > 1.0) {
            return true;
        } else {
@ -135,7 +135,7 @@ namespace POWER_Utils {
        if (!(rate_limit_check_battery++ % 60))
            BatteryIsConnected = isBatteryConnected();
        if (BatteryIsConnected) {
-            #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(OE5HWN_MeshCom)  || defined(TTGO_T_DECK)
+            #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(OE5HWN_MeshCom)  || defined(TTGO_T_DECK_GPS)
            batteryVoltage       = String(getBatteryVoltage(), 2);
            #endif
            #ifdef HAS_AXP2101
@ -217,7 +217,7 @@ namespace POWER_Utils {
    }

    bool begin(TwoWire &port) {
-        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK)
+        #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
        return true; // no powerManagment chip for this boards (only a few measure battery voltage).
        #endif
        #ifdef HAS_AXP192
@ -342,29 +342,27 @@ namespace POWER_Utils {
        pinMode(BATTERY_PIN, INPUT);
        #endif

-        #if defined(TTGO_T_DECK)
+        #if defined(TTGO_T_DECK_GPS)
        pinMode(BOARD_POWERON, OUTPUT);
        //pinMode(BOARD_SDCARD_CS, OUTPUT);
        pinMode(RADIO_CS_PIN, OUTPUT);
        pinMode(TFT_CS, OUTPUT);

        digitalWrite(BOARD_POWERON, HIGH);
-        delay(3000);
+        //delay(3000);
        //digitalWrite(BOARD_SDCARD_CS, HIGH);
        digitalWrite(RADIO_CS_PIN, HIGH);
        digitalWrite(TFT_CS, HIGH);
        


-        /*pinMode(TrackBallCenter, INPUT_PULLUP);
+        pinMode(TrackBallCenter, INPUT_PULLUP);
        pinMode(TrackBallUp, INPUT_PULLUP);
        pinMode(TrackBallDown, INPUT_PULLUP);
        pinMode(TrackBallLeft, INPUT_PULLUP);
-        pinMode(TrackBallRight, INPUT_PULLUP);*/
-
-        //Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
-
+        pinMode(TrackBallRight, INPUT_PULLUP);

+        Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
        #endif
    }