fix tire temp calulation + buzzer sound onf DPF regen

Author: anegrin

.vscode/settings.json

@@ -19,6 +19,8 @@
         "unordered_set": "cpp",
         "vector": "cpp",
         "memory": "cpp",
-        "gt_main.h": "c"
+        "gt_main.h": "c",
+        "new": "cpp",
+        "initializer_list": "cpp"
     }
 }

README.md

@@ -23,11 +23,13 @@ Secondary screen:
 - Battery voltage (V) 
 - Battery IBS (%)
 - Engine oil degradation (%)
-- Tires temperatures (°C) - *validation in progress*
+- Tires temperatures (°C)
 - Gearbox oil temperature (°C)
 
 On first boot a touch screen calibration display wizard will start and calibration data will be persisted. On the devices screen, after scanning, you can pick an adapter to connect to.
 
+If you have a buzzer connected you will get a 5 beeps warning when DPF regeneration process starts.
+
 ## Screenshots on 3.5'' and 2.8'' TFT displays (values are random):
 
 | Screen                        |                                             2.8''                                             |                                             3.5''                                             |
@@ -58,6 +60,7 @@ Relevant `build_flags`:
 - `GT_VERBOSE_LOG`: enable verbose serial logging
 - `SPI_FREQUENCY`: display refresh frequency; the TFT I'm using for this project is serial and it' pretty slow but good enough
 - `ELM_DEBUG`: enable VERY verbose ELM protocol logs
+- `GT_BUZZER_PIN`: buzzer connection GPIO
 
 # Right-Hand Drive models
 
@@ -77,10 +80,10 @@ Libraries:
 
 - [TFT_eSPI](https://github.com/Bodmer/TFT_eSPI) licensed [MIT](https://github.com/Bodmer/TFT_eSPI/blob/master/license.txt)
 - [ELMDuino](https://github.com/PowerBroker2/ELMduino) licensed [MIT](https://github.com/PowerBroker2/ELMduino/blob/master/LICENSE.md)
+- [ESP32-Buzzer](https://github.com/hammikb/ESP32-Buzzer) licensed [MIT](https://github.com/hammikb/ESP32-Buzzer/blob/main/LICENSE)
 - [LVGL](https://github.com/lvgl/lvgl) licensed [MIT](https://github.com/lvgl/lvgl/blob/master/LICENCE.txt)
 - [TFT_eWidget](https://github.com/Bodmer/TFT_eWidget) licensed [0BSD](https://github.com/Bodmer/TFT_eWidget/blob/main/license.txt)
 - [log4arduino](https://github.com/jandelgado/log4arduino) licensed [MIT](https://github.com/jandelgado/log4arduino/blob/master/LICENSE)
-- [XTronical_XT_DAC_Audio](https://github.com/WeekendWarrior1/XTronical_XT_DAC_Audio_Mirror) licensed [GPLv3](https://www.gnu.org/licenses/gpl-3.0.txt)
 - [lv_drivers](https://github.com/lvgl/lv_drivers) emulator only - licensed [MIT](https://github.com/lvgl/lv_drivers/blob/master/LICENSE)
 
 # Support

platformio.ini

@@ -33,8 +33,9 @@ build_flags =
 	-D GT_FONT_SEGMENTS_96=0
 	'-D GT_FONT_SEGMENTS=&gt_font_segments_128'
 	-D GT_FONT_SEGMENTS_SIZE=128
-;    -D GT_DEMO=true
-;    -D GT_VERBOSE_LOG
+; 	-D GT_BUZZER_PIN=25
+;   -D GT_DEMO=true
+;   -D GT_VERBOSE_LOG
 	-D LV_USE_CHECKBOX=0
 	-D LV_USE_DROPDOWN=0
 	-D LV_USE_SLIDER=0
@@ -82,15 +83,15 @@ build_flags =
 	-D SD_SCK=18
 	-D SD_CS=5
 	-D ENABLE_LOG4ARDUINO
+    -D DPF_AUDIO_NOTIFICATION
 ;	-D ELM_DEBUG=true
-;   -D DPF_AUDIO_NOTIFICATION
 lib_deps = 
 	bodmer/TFT_eSPI@^2.5.34
-	powerbroker2/ELMDuino@^3.1.0
-	https://github.com/lvgl/lvgl/archive/refs/tags/v8.3.11.zip
+	https://github.com/PowerBroker2/ELMduino#3.3.1
+	https://github.com/lvgl/lvgl/archive/refs/tags/v8.3.11.zip	
+	https://github.com/hammikb/ESP32-Buzzer
 	bodmer/TFT_eWidget@^0.0.6
 	jandelgado/log4arduino@^1.1.0
-;    https://github.com/WeekendWarrior1/XTronical_XT_DAC_Audio_Mirror/archive/master.zip
 
 [env:lv]
 build_unflags = -Os

src/main.cpp

@@ -9,8 +9,7 @@
 #include <log4arduino.h>
 
 #ifdef DPF_AUDIO_NOTIFICATION
-#include <MusicDefinitions.h>
-#include <XT_DAC_Audio.h>
+#include "ESP32S3Buzzer.h"
 #endif
 
 #include "Free_Fonts.h"
@@ -26,21 +25,19 @@
 #ifndef GT_DEMO
 #define GT_DEMO false // show demo random data
 #endif
-
-#ifdef DPF_AUDIO_NOTIFICATION
-int8_t PROGMEM NOTE[] = { NOTE_A4, SCORE_END};
-XT_DAC_Audio_Class DacAudio(26, 0);                                         
-XT_MusicScore_Class Beep(NOTE, TEMPO_PRESTO, INSTRUMENT_PIANO);
+#ifndef GT_BUZZER_PIN
+#define GT_BUZZER_PIN 25
 #endif
 
 #define BT_DISCOVER_TIME 3000
-#define LOOP_DELAY 5
-#define ELM_LOOP_DELAY 5
-#define RT_SENSORS_DELAY 250
+#define LOOP_DELAY 3
+#define ELM_LOOP_DELAY 3
+#define RT_SENSORS_DELAY 20
 #define SWITCHED_STATE_DELAY 1000
 #define ELM_QUERY_TIMEOUT 2000
 #define RECONNECTION_DELAY 5000
-#define NON_RT_SENSORS_DELAY 10000
+#define NON_RT_SENSORS_DELAY 1000
+#define VALUES_SENSORS_DELAY 1000
 #define QUERY_OFFSET 300 // to time-distribute data loading on main screen
 #define NO_DATA_TIMEOUT 60000
 #define DEEPSLEEP_DURATION_US 15000000L      // 15s
@@ -61,6 +58,11 @@ XT_MusicScore_Class Beep(NOTE, TEMPO_PRESTO, INSTRUMENT_PIANO);
 BluetoothSerial SerialBT;
 ELM327 btELM327;
 
+#ifdef DPF_AUDIO_NOTIFICATION
+ESP32S3Buzzer buzzer(GT_BUZZER_PIN, 0);
+#endif
+
+
 static lv_disp_draw_buf_t _draw_buf;
 static lv_color_t _screen_buffer[GT_SCREEN_WIDTH * GT_SCREEN_HEIGTH / 10];
 static uint16_t _touchX, _touchY;
@@ -92,7 +94,7 @@ static int _airTemp = -1;
 static int _dpfClogging = -1;
 static int _dpfTemperature = -1;
 static int _dpfRegeneration = -1;
-static bool _shouldPlayDPFSound = true;
+static bool _shouldInitDPFSound = true;
 static int _dpfDistance = -1;
 static int _dpfCount = -1;
 static float _batteryVoltage = -1;
@@ -123,7 +125,7 @@ void _onStateChange(int screenId, bool active)
       _dpfClogging = -1;
       _dpfTemperature = -1;
       _dpfRegeneration = -1;
-      _shouldPlayDPFSound = true;
+      _shouldInitDPFSound = true;
       _dpfDistance = -1;
 
       unsigned long now = millis();
@@ -193,8 +195,11 @@ static int _get_demo_v(int pid)
   case 0x40B2:
   case 0x40B3:
   case 0x30B4:
+    return -1;
   case 0x04FE:
     return 70 + (int)(((float)rand() / (float)(RAND_MAX)) * 10) - 10;
+  case 0x194D:
+    return 7;
   default:
     return -1;
   }
@@ -271,7 +276,7 @@ static bool _gt_elmConnect()
 
   if (SerialBT.connect(BTAddress(_mac)))
   {
-    if (!btELM327.begin(SerialBT, ELM_DEBUG, ELM_QUERY_TIMEOUT))
+    if (!btELM327.begin(SerialBT, ELM_DEBUG, ELM_QUERY_TIMEOUT, ISO_15765_29_BIT_500_KBAUD))
     {
       LOG("Can't init connection to ELM327 device %s", _mac);
     }
@@ -324,7 +329,7 @@ static int _gt_setHeader(int headerId, const char *header)
 /**
  * process PID in blocking mode
  */
-static float _gt_processPID(const uint8_t &service, const uint16_t &pid, const uint8_t &numResponses, const uint8_t &numExpectedBytes, const double &scaleFactor, const float &bias)
+static double _gt_processPID(const uint8_t &service, const uint16_t &pid, const uint8_t &numResponses, const uint8_t &numExpectedBytes, const double &scaleFactor, const float &bias)
 {
   unsigned long timeoutAt = millis() + (ELM_QUERY_TIMEOUT * 2);
   while (millis() < timeoutAt)
@@ -335,7 +340,7 @@ static float _gt_processPID(const uint8_t &service, const uint16_t &pid, const u
       delay(ELM_LOOP_DELAY);
       return _get_demo_v(pid);
     }
-    float value = btELM327.processPID(service, pid, numResponses, numExpectedBytes, scaleFactor, bias);
+    double value = btELM327.processPID(service, pid, numResponses, numExpectedBytes, scaleFactor, bias);
     if (btELM327.nb_rx_state == ELM_SUCCESS)
     {
       VLOG("Value for %x is %.2f", pid, value);
@@ -569,10 +574,22 @@ void _gt_elmLoop(void *pvParameters)
 
         if (_currentHeaderId == HEADER_DAC7F1_ID)
         {
-          _tireTempFL = _gt_processPID(0x22, 0x40B1, 1, 3, 0.0000305, 0.0f);
-          _tireTempFR = _gt_processPID(0x22, 0x40B2, 1, 3, 0.0000305, 0.0f);
-          _tireTempRL = _gt_processPID(0x22, 0x40B3, 1, 3, 0.0000305, 0.0f);
-          _tireTempRR = _gt_processPID(0x22, 0x40B4, 1, 3, 0.0000305, 0.0f);
+          int r = (int) _gt_processPID(0x22, 0x40B1, 2, 7, 1, 0);
+          if (r>0) {
+            _tireTempFL = btELM327.responseByte_5 - 50;
+          }
+          r = (int) _gt_processPID(0x22, 0x40B2, 2, 7, 1, 0);
+          if (r>0) {
+            _tireTempFR = btELM327.responseByte_5 - 50;
+          }
+          r = (int) _gt_processPID(0x22, 0x40B3, 2, 7, 1, 0);
+          if (r>0) {
+            _tireTempRL = btELM327.responseByte_5 - 50;
+          }
+          r = (int) _gt_processPID(0x22, 0x40B4, 2, 7, 1, 0);
+          if (r>0) {
+            _tireTempRR = btELM327.responseByte_5 - 50;
+          }
         }
 
         if (_currentHeaderId != HEADER_DA18F1_ID)
@@ -609,19 +626,12 @@ void _gt_elmLoop(void *pvParameters)
         if (_currentHeaderId == HEADER_DB33F1_ID)
         {
           _batteryVoltage = _gt_processPID(0x01, 0x42, 1, 2, 0.001, 0);
+          if (_batteryVoltage != -1)
+          {
+            _valuesNonRtLastQueringMs = millis() + NON_RT_SENSORS_DELAY;
+          }
         }
 
-        if (_batteryIBS != -1 &&
-            _engineOilDegradation != -1 &&
-            _tireTempFL != -1 &&
-            _tireTempFR != -1 &&
-            _tireTempRL != -1 &&
-            _tireTempRR != -1 &&
-            _gearboxOilTemp != -1 &&
-            _batteryVoltage != -1)
-        {
-          _valuesNonRtLastQueringMs = millis() + NON_RT_SENSORS_DELAY;
-        }
       }
     }
   }
@@ -940,13 +950,27 @@ void loop()
       gt_setDpfTemperature(_dpfTemperature);
 
 #ifdef DPF_AUDIO_NOTIFICATION
-      DacAudio.FillBuffer();
-      if (_dpfRegeneration > 0 && !DacAudio.AlreadyPlaying(&Beep) && _shouldPlayDPFSound) {
-        _shouldPlayDPFSound = false;
-        DacAudio.DacVolume = 100;
-        DacAudio.Play(&Beep, false);
-      } else if (_dpfRegeneration == 0) {
-        _shouldPlayDPFSound = true;
+      if (_dpfRegeneration > 0 && _shouldInitDPFSound)
+      {
+        buzzer.begin();
+    
+        // Add a tone to the queue
+        uint32_t freq = 1000;
+        uint32_t onDuration = 200;
+        uint32_t offDuration = 200;
+        uint16_t cycles = 5;
+        buzzer.tone(freq, onDuration, offDuration, cycles);
+        _shouldInitDPFSound = false;
+      }
+
+      if (_dpfRegeneration > 0 && !_shouldInitDPFSound) 
+      {
+        buzzer.update();
+      } 
+      else if (_dpfRegeneration == 0)
+      {
+        buzzer.end();
+        _shouldInitDPFSound = true;
       }
 #endif
 

src/screens/gt_values.c

@@ -89,7 +89,7 @@ void gt_setTireTemperatureFL(int celsius)
     _currentTireTempFL = celsius;
     if (_currentTireTempFL != -1 && lv_obj_is_valid(_tire_temp_fl_label))
     {
-      char str[8];
+      char str[32];
       sprintf(str, "%d °C", celsius % 1000); // module is for overflow protection
       lv_label_set_text(_tire_temp_fl_label, str);
     }
@@ -103,7 +103,7 @@ void gt_setTireTemperatureFR(int celsius)
     _currentTireTempFR = celsius;
     if (_currentTireTempFR != -1 && lv_obj_is_valid(_tire_temp_fr_label))
     {
-      char str[8];
+      char str[32];
       sprintf(str, "%d °C", celsius % 1000); // module is for overflow protection
       lv_label_set_text(_tire_temp_fr_label, str);
     }
@@ -117,7 +117,7 @@ void gt_setTireTemperatureRL(int celsius)
     _currentTireTempRL = celsius;
     if (_currentTireTempRL != -1 && lv_obj_is_valid(_tire_temp_rl_label))
     {
-      char str[8];
+      char str[32];
       sprintf(str, "%d °C", celsius % 1000); // module is for overflow protection
       lv_label_set_text(_tire_temp_rl_label, str);
     }
@@ -131,7 +131,7 @@ void gt_setTireTemperatureRR(int celsius)
     _currentTireTempRR = celsius;
     if (_currentTireTempRR != -1 && lv_obj_is_valid(_tire_temp_rr_label))
     {
-      char str[8];
+      char str[32];
       sprintf(str, "%d °C", celsius % 1000); // module is for overflow protection
       lv_label_set_text(_tire_temp_rr_label, str);
     }