From 646b0ba7de538f72bd7221d0841fd3cdae63b09c Mon Sep 17 00:00:00 2001
From: aly-fly <aljaz@ogrin.me>
Date: Sun, 24 Mar 2024 22:41:01 +0100
Subject: [PATCH 1/7] Bigger buttons on web page

---
 data/about.html       |   3 +-
 data/config.html      |   5 +-
 data/defaultprefs.txt |  45 +++++++-------
 data/index.html       | 139 +++++++++++++++++++++++++-----------------
 data/mp3play.html     |   4 +-
 data/nomp3play.html   |   2 +-
 data/search.html      |  16 ++++-
 data/style.css        |  74 ++++++++++++++++++----
 8 files changed, 187 insertions(+), 101 deletions(-)

diff --git a/data/about.html b/data/about.html
index 4a05580..bb297ae 100644
--- a/data/about.html
+++ b/data/about.html
@@ -10,6 +10,7 @@
   <ul>
    <li><a class="pull-left" href="/index.html">Control</a></li>
    <li><a class="pull-left" href="/search.html">Search</a></li>
+   <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
    <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
    <li><a class="pull-left active" href="/about.html">About</a></li>
@@ -19,7 +20,7 @@
    <h1>** ESP32 Radio V2 **</h1>
   </center>
 	<p>ESP32 Radio V2 -- Web radio receiver for ESP32, Color display and VS1053 MP3 module.<br>
-  I2S and SPDIF output instead of VS1053 is also supported.<br>
+  I2S output instead of VS1053 is also supported.<br>
 	This project is documented at <a target="blank" href="https://github.com/Edzelf/ESP32Radio-V2">Github</a>.</p>
 	<p>Author: Ed Smallenburg (ed@smallenburg.nl)<br>
 	App (Android): <a target="blank" href="https://play.google.com/store/apps/details?id=com.thunkable.android.sander542jochems.ESP_Radio">Sander Jochems</a><br>
diff --git a/data/config.html b/data/config.html
index 46ed51b..69a7748 100644
--- a/data/config.html
+++ b/data/config.html
@@ -10,6 +10,7 @@
   <ul>
    <li><a class="pull-left" href="/index.html">Control</a></li>
    <li><a class="pull-left" href="/search.html">Search</a></li>
+   <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
    <li><a class="pull-left active" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
    <li><a class="pull-left" href="/about.html">About</a></li>
@@ -26,13 +27,13 @@ <h1>** ESP32 Radio **</h1>
    <button class="button buttonr" onclick="httpGet('reset')">Restart</button>
    &nbsp;&nbsp;
    <button class="button" onclick="ldef('getdefs')">Default</button>
-    <br><input type="text" size="80" id="resultstr" placeholder="Waiting for input....">
+    <br><input type="text" size="50" id="resultstr" placeholder="Waiting for input....">
     <br>
   </center>
     <script>
       function httpGet ( theReq )
       {
-        var theUrl = "/" + theReq + "?version=" + Math.random() ;
+        var theUrl = "/?" + theReq + "&version=" + Math.random() ;
         var xhr = new XMLHttpRequest() ;
         xhr.onreadystatechange = function() {
           if ( xhr.readyState == XMLHttpRequest.DONE )
diff --git a/data/defaultprefs.txt b/data/defaultprefs.txt
index 078a863..ebdc2aa 100644
--- a/data/defaultprefs.txt
+++ b/data/defaultprefs.txt
@@ -1,15 +1,12 @@
 # Example configuration
 # Programmable input pins:
 gpio_00 = uppreset = 1
-gpio_25 = upvolume = 2
-gpio_33 = downvolume = 2
-gpio_16 = stop
+gpio_12 = upvolume = 2
+gpio_13 = downvolume = 2
+gpio_14 = stop
 gpio_17 = resume
-gpio_21 = station = icecast.omroep.nl:80/radio1-bb-mp3
+gpio_34 = station = icecast.omroep.nl:80/radio1-bb-mp3
 #
-# Battery monitor
-batt100 = 2950
-batt0 = 2600 
 # MQTT settings
 mqttbroker = none
 mqttport = 1883
@@ -30,38 +27,38 @@ preset = 6
 # Some preset examples
 preset_00 = 109.206.96.34:8100                       #  0 - NAXI LOVE RADIO, Belgrade, Serbia
 preset_01 = airspectrum.cdnstream1.com:8114/1648_128 #  1 - Easy Hits Florida 128k
-preset_02 = stream.hitfm.de:9050/live                #  2 - 89 HIT FM - Munichs Power Station, 128k
+preset_02 = us2.internet-radio.com:8050              #  2 - CLASSIC ROCK MIAMI 256k
 preset_03 = airspectrum.cdnstream1.com:8000/1261_192 #  3 - Magic Oldies Florida
 preset_04 = airspectrum.cdnstream1.com:8008/1604_128 #  4 - Magic 60s Florida 60s Classic Rock
 preset_05 = us1.internet-radio.com:8105              #  5 - Classic Rock Florida - SHE Radio
-preset_06 = icecast.omroep.nl:80/radio1-bb-mp3       #  6 - Radio 1, NL, 192k
+preset_06 = icecast.omroep.nl:80/radio1-bb-mp3       #  6 - Radio 1, NL
 preset_07 = 205.164.62.15:10032                      #  7 - 1.FM - GAIA, 64k
-preset_08 = www.doowopradio.com:8000                 #  8 - Doo-Wop Radio, 96k
-preset_09 = server-27.stream-server.nl:8192/stream   #  9 - 192 Radio Nederland, 320k
+preset_08 = skonto.ls.lv:8002/mp3                    #  8 - Skonto 128k
+preset_09 = 94.23.66.155:8106                        #  9 - *ILR CHILL and GROOVE
+preset_10 = ihr/IHR_IEDM                             # 10 - iHeartRadio IHR_IEDM
+preset_11 = ihr/IHR_TRAN                             # 11 - iHeartRadio IHR_TRAN
 #
 # Clock offset and daylight saving time
 clk_server = pool.ntp.org                            # Time server to be used
 clk_offset = 1                                       # Offset with respect to UTC in hours
 clk_dst = 1                                          # Offset during daylight saving time (hours)
-# Some example IR codes
+# Some IR codes
 ir_40BF = upvolume = 2
 ir_C03F = downvolume = 2
 # GPIO pinnings
 pin_ir = 35                                          # GPIO Pin number for IR receiver VS1838B
-pin_enc_clk = 12                                     # GPIO Pin number for rotary encoder "CLK"
-pin_enc_dt = 14                                      # GPIO Pin number for rotary encoder "DT"
-pin_enc_sw = 13                                      # GPIO Pin number for rotary encoder "SW"
+pin_enc_clk = 25                                     # GPIO Pin number for rotary encoder "CLK"
+pin_enc_dt = 26                                      # GPIO Pin number for rotary encoder "DT"
+pin_enc_sw = 27                                      # GPIO Pin number for rotary encoder "SW"
 #
-pin_tft_cs = 2                                       # GPIO Pin number for TFT "CS"
-pin_tft_dc = 4                                       # GPIO Pin number for TFT "DC"
+pin_tft_cs = 15                                      # GPIO Pin number for TFT "CS"
+pin_tft_dc = 2                                       # GPIO Pin number for TFT "DC"
 #
-# define pins for decoder.  Examples for VS1053, I2S and Toslink
+# define pins for decoder.  Examples for VS1053 and I2S:respect
 pin_vs_cs = 5                                        # GPIO Pin number for VS1053 "CS"
 pin_vs_dcs = 32                                      # GPIO Pin number for VS1053 "DCS"
-pin_vs_dreq = 15                                     # GPIO Pin number for VS1053 "DREQ"
+pin_vs_dreq = 34                                     # GPIO Pin number for VS1053 "DREQ"
 #
-#pin_i2s_bck = 15                                    # GPIO Pin number for I2S "BCK"
-#pin_i2s_lck = 27                                    # GPIO Pin number for I2S "L(R)CK"
-#pin_i2s_din = 26                                    # GPIO Pin number for I2S "DIN"
-#
-#pin_i2s_spdif = 15                                  # GPIO Pin number for I2S/SPDIF (Toslink)
+#pin_i2s_bck = 5                                      # GPIO Pin number for I2S "BCK"
+#pin_i2s_lck = 32                                     # GPIO Pin number for I2S "L(R)CK"
+#pin_i2s_din = 34                                     # GPIO Pin number for I2S "DIN"
diff --git a/data/index.html b/data/index.html
index b31e13f..220a888 100644
--- a/data/index.html
+++ b/data/index.html
@@ -9,24 +9,39 @@
  <body>
   <ul>
    <li><a class="pull-left active" href="/index.html">Control</a></li>
-   <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/search.html">Search</a></li>
    <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
+   <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/about.html">About</a></li>
   </ul>
   <br><br><br>
   <center>
    <h1>** ESP32 Radio **</h1>
-   <button class="button" onclick="httpGet('downpreset=1')">PREV</button>
-   <button class="button" onclick="httpGet('uppreset=1')">NEXT</button>
-   <button class="button" id="volmin" onclick="httpGet('downvolume=2')">VOL-</button>
-   <button class="button" id="volplus" onclick="httpGet('upvolume=2')">VOL+</button>
-   <button class="button" onclick="httpGet('status')">STATUS</button>
-   <button class="button" onclick="httpGet('test')">TEST</button>
+   <button class="bigbutton" onclick="httpGet('downpreset=1')">PREV</button>
+   <button class="bigbutton" onclick="httpGet('uppreset=1')">NEXT</button>
+   <button class="bigbutton" id="volmin" onclick="httpGet('downvolume=2')">VOL-</button>
+   <button class="bigbutton" id="volplus" onclick="httpGet('upvolume=2')">VOL+</button>
+   <br>
+   <br>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=30')">30</button>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=50')">50</button>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=60')">60</button>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=70')">70</button>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=80')">80</button>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=90')">90</button>
+   <button class="volumebutton" id="vol" onclick="httpGet('volume=100')">100</button>
+   <br>
+   <br>
+   <button class="bigbutton" onclick="httpGet('mute')">MUTE</button>
+   <button class="bigbutton" onclick="httpGet('status')">STATUS</button>
+   <button class="bigbutton" onclick="httpGet('test')">TEST</button>
+   
+   <br>
+   <br>
+   <br>
+   <input type="bigtext" size="35" id="resultstr" placeholder="Waiting for a command....">
    <br>
-   <button class="button" onclick="httpGet('mute')">MUTE</button>
-   <button class="button" onclick="httpGet('unmute')">UNMUTE</button>
-   <button class="button" onclick="httpGet('sleep')">SLEEP</button>
+   
    <table id="t1" style="width:500px">
     <tr>
      <td colspan="2"><center>
@@ -66,21 +81,21 @@ <h1>** ESP32 Radio **</h1>
       <label for="HF"><big>Treble Freq:</big></label>
       <br>
       <select class="select" onChange="handletone(this)" id="tonehf">
-       <option value="1">1 kHz</option>
-       <option value="2">2 kHz</option>
-       <option value="3">3 kHz</option>
-       <option value="4">4 kHz</option>
-       <option value="5">5 kHz</option>
-       <option value="6">6 kHz</option>
-       <option value="7">7 kHz</option>
-       <option value="8">8 kHz</option>
-       <option value="9">9 kHz</option>
-       <option value="10">10 kHz</option>
-       <option value="11">11 kHz</option>
-       <option value="12">12 kHz</option>
-       <option value="13">13 kHz</option>
-       <option value="14">14 kHz</option>
-       <option value="15">15 kHz</option>
+        <option value="1">1 kHz</option>
+        <option value="2">2 kHz</option>
+        <option value="3">3 kHz</option>
+        <option value="4">4 kHz</option>
+        <option value="5">5 kHz</option>
+        <option value="6">6 kHz</option>
+        <option value="7">7 kHz</option>
+        <option value="8">8 kHz</option>
+        <option value="9">9 kHz</option>
+        <option value="10">10 kHz</option>
+        <option value="11">11 kHz</option>
+        <option value="12">12 kHz</option>
+        <option value="13">13 kHz</option>
+        <option value="14">14 kHz</option>
+        <option value="15">15 kHz</option>
       </select>
       <br><br> 
      </center></td>
@@ -130,30 +145,38 @@ <h1>** ESP32 Radio **</h1>
        <option value="15">140 Hz</option>
       </select> 
      </center></td>
-     <br><br>
     </tr>
    </table>
    <br>
-   <input type="text" size="60" id="station" placeholder="Enter a station/file here....">
+   <br>
+   Find new radio stations at <a target="blank" href="http://www.internet-radio.com">http://www.internet-radio.com</a><br>
+      or use the Search function from the menu.
+   <br>
+   <input type="text" size="40" id="station" placeholder="Enter a station/file here....">
    <button class="button" onclick="setstat()">PLAY</button>
    <br>
+   
    <br>
-   <input type="text" width="600px" size="72" id="resultstr" placeholder="Waiting for a command...."><br>
-   <br><br>
-   <p>Find new radio stations at <a target="blank" href="http://www.internet-radio.com">http://www.internet-radio.com</a><br>
-      or use the Search function from the menu.</p>
-   <br><br>
+   <input type="text" size="50" id="statustext" placeholder="Status...">
+   
   </center>
   <script>
-    function httpGet ( theReq )
+   function httpGet ( theReq )
    {
     var theUrl = "/?" + theReq + "&version=" + Math.random() ;
     var xhr = new XMLHttpRequest() ;
     xhr.onreadystatechange = function() {
       if ( xhr.readyState == XMLHttpRequest.DONE )
       {
-        resultstr.value = xhr.responseText ;
-        preset.selectedIndex = 0 ;
+        if ( theReq == "test" ) 
+        {
+          statustext.value = xhr.responseText ;
+        }
+        else 
+        {        
+          resultstr.value = xhr.responseText ;
+          preset.selectedIndex = 0 ;
+        }
       }
     }
     xhr.open ( "GET", theUrl ) ;
@@ -211,10 +234,12 @@ <h1>** ESP32 Radio **</h1>
    function myRefresh()
    {
     httpGet ('status') ;
+    httpGet ('test') ;
     setTimeout(myRefresh,5000) ;
    }
 
    // Fill preset list initially
+   //
    function onloadfunc()
    {
      var i, sel, opt, lines, parts ;
@@ -226,30 +251,30 @@ <h1>** ESP32 Radio **</h1>
          lines = xhr.responseText.split ( "\n" ) ;
          for ( i = 0 ; i < ( lines.length-1 ) ; i++ )
          {
-          sel = document.getElementById ( "preset" ) ;
-          parts = lines[i].split ( "=" ) ;
-          if ( parts[0].indexOf ( "preset_" ) == 0 )
-          {
-           opt = document.createElement ( "OPTION" ) ;
-           opt.value = parts[0].substring ( 7 ) ;
-           opt.text = parts[1] ;
-           sel.add( opt ) ;
-          }
-          if ( ( parts[0].indexOf ( "tone" ) == 0 ) ||
-               ( parts[0] == "preset" ) )
-          {
-           selectItemByValue ( parts[0], parts[1] ) ;
-          }
-          // No tone settings if no VS1053 decoder 
-          if ( parts[0].indexOf ( "decoder" ) == 0 )
-          {
-           if ( parts[1].indexOf ( "helix" ) == 0 )
+           sel = document.getElementById ( "preset" ) ;
+           parts = lines[i].split ( "=" ) ;
+           if ( parts[0].indexOf ( "preset_" ) == 0 )
+           {
+             opt = document.createElement ( "OPTION" ) ;
+             opt.value = parts[0].substring ( 7 ) ;
+             opt.text = parts[1] ;
+             sel.add( opt ) ;
+           }
+           if ( ( parts[0].indexOf ( "tone" ) == 0 ) ||
+                ( parts[0] == "preset" ) )
+           {
+             selectItemByValue ( parts[0], parts[1] ) ;
+           }
+           // No tone settings if no VS1053 decoder 
+           if ( parts[0].indexOf ( "decoder" ) == 0 )
            {
-           var toneobj = document.getElementById("t1") ;
-            toneobj.deleteRow(2);
-            toneobj.deleteRow(1);
+             if ( parts[1].indexOf ( "helix" ) == 0 )
+             {
+              var toneobj = document.getElementById("t1") ;
+              toneobj.deleteRow(2);
+              toneobj.deleteRow(1);
+             }
            }
-          }
          }
          setTimeout(myRefresh,5000) ;
        }
diff --git a/data/mp3play.html b/data/mp3play.html
index 8d6bc7e..6043abd 100644
--- a/data/mp3play.html
+++ b/data/mp3play.html
@@ -10,8 +10,8 @@
   <ul>
    <li><a class="pull-left" href="/index.html">Control</a></li>
    <li><a class="pull-left" href="/search.html">Search</a></li>
-   <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left active" href="/mp3play.html">MP3-player</a></li>
+   <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/about.html">About</a></li>
   </ul>
   <br><br><br>
@@ -32,7 +32,7 @@ <h1>** ESP32 Radio **</h1>
    <button class="button" onclick="httpGet('status', false)">STATUS</button>
    <br><br>
    <br>
-   <input type="text" width="600px" size="80" id="resultstr" placeholder="Waiting for a command...."><br>
+   <input type="text" width="450px" size="40" id="resultstr" placeholder="Waiting for a command...."><br>
    <br><br>
   </center>
   <script>
diff --git a/data/nomp3play.html b/data/nomp3play.html
index 07d608b..b5806c4 100644
--- a/data/nomp3play.html
+++ b/data/nomp3play.html
@@ -10,8 +10,8 @@
   <ul>
    <li><a class="pull-left" href="/index.html">Control</a></li>
    <li><a class="pull-left" href="/search.html">Search</a></li>
-   <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left active" href="/mp3play.html">MP3-player</a></li>
+   <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/about.html">About</a></li>
   </ul>
   <br><br><br>
diff --git a/data/search.html b/data/search.html
index 60a1958..41d757c 100644
--- a/data/search.html
+++ b/data/search.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
  <head>
   <title>ESP32-radio</title>
@@ -9,6 +10,7 @@
   <ul>
    <li><a class="pull-left" href="/index.html">Control</a></li>
    <li><a class="pull-left active" href="/search.html">Search</a></li>
+   <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
    <li><a class="pull-left" href="/config.html">Config</a></li>
    <li><a class="pull-left" href="/mp3play.html">MP3-player</a></li>
    <li><a class="pull-left" href="/about.html">About</a></li>
@@ -33,6 +35,8 @@ <h1>** ESP32 Radio search stations **</h1>
    <td><button class="button" onclick="listStats('reggae')">Reggae</button></td>
    <td><button class="button" onclick="listStats('funk')">Funk</button></td>
    <td><button class="button" onclick="listStats('top')">Top</button></td>
+   <td><button class="button" onclick="listStats('mix')">Mix</button></td>
+   <td><button class="button" onclick="listStats('hits')">Hits</button></td>
    <td><button class="button" onclick="listStats('synth')">Synth</button></td><tr>
    <td><button class="button" onclick="listStats('fantasy')">Fantasy</button></td>
    <td><button class="button" onclick="listStats('rain')">Rain</button></td>
@@ -40,9 +44,13 @@ <h1>** ESP32 Radio search stations **</h1>
    <td><button class="button" onclick="listStats('meditation')">Meditation</button></td>
    <td><button class="button" onclick="listStats('lounge')">Lounge</button></td>
    <td><button class="button" onclick="listStats('chill')">Chill</button></td><tr>
+   <td><button class="button" onclick="listStats('xmas')">Xmas</button></td>
+   <td><button class="button" onclick="listStats('x-mas')">X-mas</button></td>
+   <td><button class="button" onclick="listStats('christmas')">Christmas</button></td><tr>
    </table>
-   <br><input type="text" size="80" id="resultstr" placeholder=""><br>
-   <table class="table2" id="stationsTable" width="450">
+   <br><input type="text" size="50" id="resultstr" placeholder=""><br>
+   <br>
+   <table class="table2" id="stationsTable" width="750">
    </table>
   </center>
  </body>
@@ -56,7 +64,7 @@ <h1>** ESP32 Radio search stations **</h1>
  // https://de1.api.radio-browser.info, https://fr1.api.radio-browser.info, https://nl1.api.radio-browser.info
  function listStats ( genre )
  {
-  var theUrl = "https://nl1.api.radio-browser.info/json/stations/bytag/" +
+  var theUrl = "https://at1.api.radio-browser.info/json/stations/bytag/" +
                genre +
                "?hidebroken=true" ;
   var xhr = new XMLHttpRequest() ;
@@ -80,9 +88,11 @@ <h1>** ESP32 Radio search stations **</h1>
         var cell1 = row.insertCell(0) ;
         var cell2 = row.insertCell(1) ;
         var cell3 = row.insertCell(2) ;
+        var cell4 = row.insertCell(3) ;
         cell1.innerHTML = snam ;
         cell2.innerHTML = stationArr[i].codec ;
         cell3.innerHTML = stationArr[i].bitrate + "k" ;
+        cell4.innerHTML = stationArr[i].countrycode ;
         cell1.setAttribute ( 'onclick', 'setStation(' + i + ');' ) ;
         oldsnam = snam ;
       }
diff --git a/data/style.css b/data/style.css
index 11b8b57..7cf288b 100644
--- a/data/style.css
+++ b/data/style.css
@@ -1,6 +1,7 @@
 body {
     background-color: lightblue;
     font-family: Arial, Helvetica, sans-serif;
+    font-size: 170%; /* 100% = 16 px */
  }
  
  h1 {
@@ -41,17 +42,49 @@ body {
     background-color: #111;
  }
  
+ .bigbutton {
+    min-width: 180px;
+    height: 100px;
+    background-color: #128F76;
+    border: none;
+    color: white;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 40px;
+    margin: 12px 16px;
+    cursor: pointer;
+    border-radius: 10px;
+    white-space: nowrap;
+ }
+ 
+ .volumebutton {
+    min-width: 95px;
+    height: 70px;
+    background-color: #128F76;
+    border: none;
+    color: white;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 30px;
+    margin: 12px 10px;
+    cursor: pointer;
+    border-radius: 10px;
+    white-space: nowrap;
+ }
+ 
  .button {
-    min-width: 80px;
-    height: 30px;
+    min-width: 125px;
+    height: 46px;
     background-color: #128F76;
     border: none;
     color: white;
     text-align: center;
     text-decoration: none;
     display: inline-block;
-    font-size: 16px;
-    margin: 4px 2px;
+    font-size: 24px;
+    margin: 8px 6px;
     cursor: pointer;
     border-radius: 10px;
     white-space: nowrap;
@@ -61,10 +94,10 @@ body {
  
  .select {
     width: 160px;
-    height: 32px;
+    height: 150%;
     padding: 5px;
     background: white;
-    font-size: 16px;
+    font-size: 110%;
     line-height: 1;
     border: 1;
     border-radius: 5px;
@@ -74,13 +107,32 @@ body {
     border-radius: 10px;
  }
  
- .selectw {width: 410px;}
+ .selectw {width: 410px; height: 150%; font-size: 150%;}
+ 
+ input[type="bigtext"] {
+    margin: 0px;
+    height: 180%;
+    background: white;
+    font-size: 150%;
+    appearance: none;
+    box-shadow: none;
+    border-radius: 5px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-appearance: none;
+    border: 1px solid black;
+    border-radius: 10px;
+ }
+ 
+ input[type="bigtext"]:focus {
+   outline: none;
+ }
  
  input[type="text"] {
     margin: 0;
-    height: 28px;
+/*    height: 150%; */
     background: white;
-    font-size: 16px;
+    font-size: 110%;
     appearance: none;
     box-shadow: none;
     border-radius: 5px;
@@ -104,7 +156,7 @@ body {
    text-align: center;
    text-decoration: none;
    display: inline-block;
-   font-size: 16px;
+   font-size: 24px;
    margin: 4px 2px;
    cursor: pointer;
    border-radius: 5px;
@@ -120,7 +172,7 @@ body {
  }
  
  table.table2 td {
-  background-color: #128F76;
+  background-color: #ffff99;
   border: 1px solid black;
  }
  
\ No newline at end of file

From aac16917778b29ce4d96080e22e5fbf15cf8727c Mon Sep 17 00:00:00 2001
From: aly-fly <aljaz@ogrin.me>
Date: Sun, 24 Mar 2024 22:45:12 +0100
Subject: [PATCH 2/7] Bigger fonts on the display

---
 .gitignore                        |   5 +
 .vscode/extensions.json           |  10 ++
 lib/bluetft/src/FreeSans9pt7b_a.h | 204 ++++++++++++++++++++++++++++++
 lib/bluetft/src/bluetft.cpp       |  46 ++++++-
 lib/bluetft/src/bluetft.h         |  15 ++-
 platformio.ini                    |  22 ++--
 src/main.cpp                      |  79 ++++++++----
 7 files changed, 338 insertions(+), 43 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .vscode/extensions.json
 create mode 100644 lib/bluetft/src/FreeSans9pt7b_a.h

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..89cc49c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..080e70d
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}
diff --git a/lib/bluetft/src/FreeSans9pt7b_a.h b/lib/bluetft/src/FreeSans9pt7b_a.h
new file mode 100644
index 0000000..40fcfd7
--- /dev/null
+++ b/lib/bluetft/src/FreeSans9pt7b_a.h
@@ -0,0 +1,204 @@
+const uint8_t FreeSans9pt7bBitmaps[] PROGMEM = {
+    0xFF, 0xFF, 0xF8, 0xC0, 0xDE, 0xF7, 0x20, 0x09, 0x86, 0x41, 0x91, 0xFF,
+    0x13, 0x04, 0xC3, 0x20, 0xC8, 0xFF, 0x89, 0x82, 0x61, 0x90, 0x10, 0x1F,
+    0x14, 0xDA, 0x3D, 0x1E, 0x83, 0x40, 0x78, 0x17, 0x08, 0xF4, 0x7A, 0x35,
+    0x33, 0xF0, 0x40, 0x20, 0x38, 0x10, 0xEC, 0x20, 0xC6, 0x20, 0xC6, 0x40,
+    0xC6, 0x40, 0x6C, 0x80, 0x39, 0x00, 0x01, 0x3C, 0x02, 0x77, 0x02, 0x63,
+    0x04, 0x63, 0x04, 0x77, 0x08, 0x3C, 0x0E, 0x06, 0x60, 0xCC, 0x19, 0x81,
+    0xE0, 0x18, 0x0F, 0x03, 0x36, 0xC2, 0xD8, 0x73, 0x06, 0x31, 0xE3, 0xC4,
+    0xFE, 0x13, 0x26, 0x6C, 0xCC, 0xCC, 0xC4, 0x66, 0x23, 0x10, 0x8C, 0x46,
+    0x63, 0x33, 0x33, 0x32, 0x66, 0x4C, 0x80, 0x25, 0x7E, 0xA5, 0x00, 0x30,
+    0xC3, 0x3F, 0x30, 0xC3, 0x0C, 0xD6, 0xF0, 0xC0, 0x08, 0x44, 0x21, 0x10,
+    0x84, 0x42, 0x11, 0x08, 0x00, 0x3C, 0x66, 0x42, 0xC3, 0xC3, 0xC3, 0xC3,
+    0xC3, 0xC3, 0xC3, 0x42, 0x66, 0x3C, 0x11, 0x3F, 0x33, 0x33, 0x33, 0x33,
+    0x30, 0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x1C, 0x1C, 0x1C, 0x18, 0x18,
+    0x10, 0x08, 0x07, 0xF8, 0x3C, 0x66, 0xC3, 0xC3, 0x03, 0x06, 0x1C, 0x07,
+    0x03, 0xC3, 0xC3, 0x66, 0x3C, 0x0C, 0x18, 0x71, 0x62, 0xC9, 0xA3, 0x46,
+    0xFE, 0x18, 0x30, 0x60, 0xC0, 0x7F, 0x20, 0x10, 0x08, 0x08, 0x07, 0xF3,
+    0x8C, 0x03, 0x01, 0x80, 0xF0, 0x6C, 0x63, 0xE0, 0x1E, 0x31, 0x98, 0x78,
+    0x0C, 0x06, 0xF3, 0x8D, 0x83, 0xC1, 0xE0, 0xD0, 0x6C, 0x63, 0xE0, 0xFF,
+    0x03, 0x02, 0x06, 0x04, 0x0C, 0x08, 0x18, 0x18, 0x18, 0x10, 0x30, 0x30,
+    0x3E, 0x31, 0xB0, 0x78, 0x3C, 0x1B, 0x18, 0xF8, 0xC6, 0xC1, 0xE0, 0xF0,
+    0x6C, 0x63, 0xE0, 0x3C, 0x66, 0xC2, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03,
+    0x03, 0xC2, 0x66, 0x3C, 0xC0, 0x00, 0x30, 0xC0, 0x00, 0x00, 0x64, 0xA0,
+    0x00, 0x81, 0xC7, 0x8E, 0x0C, 0x07, 0x80, 0x70, 0x0E, 0x01, 0x80, 0xFF,
+    0x80, 0x00, 0x1F, 0xF0, 0x00, 0x70, 0x0E, 0x01, 0xC0, 0x18, 0x38, 0x71,
+    0xC0, 0x80, 0x00, 0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x18, 0x38, 0x18,
+    0x18, 0x0C, 0x00, 0x00, 0x01, 0x80, 0x03, 0xF0, 0x06, 0x0E, 0x06, 0x01,
+    0x86, 0x00, 0x66, 0x1D, 0xBB, 0x31, 0xCF, 0x18, 0xC7, 0x98, 0x63, 0xCC,
+    0x31, 0xE6, 0x11, 0xB3, 0x99, 0xCC, 0xF7, 0x86, 0x00, 0x01, 0x80, 0x00,
+    0x70, 0x40, 0x0F, 0xE0, 0x06, 0x00, 0xF0, 0x0F, 0x00, 0x90, 0x19, 0x81,
+    0x98, 0x10, 0x83, 0x0C, 0x3F, 0xC2, 0x04, 0x60, 0x66, 0x06, 0xC0, 0x30,
+    0xFF, 0x18, 0x33, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x3F, 0xC6, 0x06, 0xC0,
+    0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, 0x1F, 0x86, 0x19, 0x81, 0xA0, 0x3C,
+    0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0x61, 0xF0,
+    0xFF, 0x18, 0x33, 0x03, 0x60, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0,
+    0x78, 0x0F, 0x03, 0x60, 0xCF, 0xF0, 0xFF, 0xE0, 0x30, 0x18, 0x0C, 0x06,
+    0x03, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0F, 0xF8, 0xFF, 0xC0, 0xC0,
+    0xC0, 0xC0, 0xC0, 0xFE, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x0F, 0x83,
+    0x0E, 0x60, 0x66, 0x03, 0xC0, 0x0C, 0x00, 0xC1, 0xFC, 0x03, 0xC0, 0x36,
+    0x03, 0x60, 0x73, 0x0F, 0x0F, 0x10, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C,
+    0x07, 0x80, 0xFF, 0xFE, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x06,
+    0xFF, 0xFF, 0xFF, 0xC0, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x07,
+    0x8F, 0x1E, 0x27, 0x80, 0xC0, 0xD8, 0x33, 0x0C, 0x63, 0x0C, 0xC1, 0xB8,
+    0x3F, 0x07, 0x30, 0xC3, 0x18, 0x63, 0x06, 0x60, 0x6C, 0x0C, 0xC0, 0xC0,
+    0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFF, 0xE0,
+    0x3F, 0x01, 0xFC, 0x1F, 0xE0, 0xFD, 0x05, 0xEC, 0x6F, 0x63, 0x79, 0x13,
+    0xCD, 0x9E, 0x6C, 0xF1, 0x47, 0x8E, 0x3C, 0x71, 0x80, 0xE0, 0x7C, 0x0F,
+    0xC1, 0xE8, 0x3D, 0x87, 0x98, 0xF1, 0x1E, 0x33, 0xC3, 0x78, 0x6F, 0x07,
+    0xE0, 0x7C, 0x0E, 0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0,
+    0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x0C, 0x60, 0xC0, 0xF8,
+    0x00, 0xFF, 0x30, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x6F, 0xF3, 0x00, 0xC0,
+    0x30, 0x0C, 0x03, 0x00, 0xC0, 0x00, 0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0,
+    0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x6C,
+    0x60, 0xC0, 0xFB, 0x00, 0x08, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0,
+    0x6C, 0x0C, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x06, 0xC0,
+    0x70, 0x3F, 0x18, 0x6C, 0x0F, 0x03, 0xC0, 0x1E, 0x01, 0xF0, 0x0E, 0x00,
+    0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x00, 0xFF, 0x86, 0x03, 0x01, 0x80, 0xC0,
+    0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0, 0xC0, 0x78, 0x0F,
+    0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01,
+    0xB0, 0x61, 0xF0, 0xC0, 0x6C, 0x0D, 0x81, 0x10, 0x63, 0x0C, 0x61, 0x04,
+    0x60, 0xCC, 0x19, 0x01, 0x60, 0x3C, 0x07, 0x00, 0x60, 0xC1, 0x81, 0x30,
+    0xE1, 0x98, 0x70, 0xCC, 0x28, 0x66, 0x26, 0x21, 0x13, 0x30, 0xC8, 0x98,
+    0x6C, 0x4C, 0x14, 0x34, 0x0A, 0x1A, 0x07, 0x07, 0x03, 0x03, 0x80, 0x81,
+    0x80, 0x60, 0x63, 0x0C, 0x30, 0xC1, 0x98, 0x0F, 0x00, 0xE0, 0x06, 0x00,
+    0xF0, 0x19, 0x01, 0x98, 0x30, 0xC6, 0x0E, 0x60, 0x60, 0xC0, 0x36, 0x06,
+    0x30, 0xC3, 0x0C, 0x19, 0x81, 0xD8, 0x0F, 0x00, 0x60, 0x06, 0x00, 0x60,
+    0x06, 0x00, 0x60, 0x06, 0x00, 0xFF, 0xC0, 0x60, 0x30, 0x0C, 0x06, 0x03,
+    0x01, 0xC0, 0x60, 0x30, 0x18, 0x06, 0x03, 0x00, 0xFF, 0xC0, 0xFB, 0x6D,
+    0xB6, 0xDB, 0x6D, 0xB6, 0xE0, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84,
+    0x10, 0x80, 0xED, 0xB6, 0xDB, 0x6D, 0xB6, 0xDB, 0xE0, 0x30, 0x60, 0xA2,
+    0x44, 0xD8, 0xA1, 0x80, 0xFF, 0xC0, 0xC6, 0x30, 0x7E, 0x71, 0xB0, 0xC0,
+    0x60, 0xF3, 0xDB, 0x0D, 0x86, 0xC7, 0x3D, 0xC0, 0xC0, 0x60, 0x30, 0x1B,
+    0xCE, 0x36, 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x7C, 0x6D, 0xE0, 0x3C,
+    0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C, 0x03, 0x03, 0x03,
+    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x3C, 0x66,
+    0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C, 0x36, 0x6F, 0x66, 0x66,
+    0x66, 0x66, 0x60, 0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67,
+    0x3B, 0x03, 0x03, 0xC6, 0x7C, 0xC0, 0xC0, 0xC0, 0xDE, 0xE3, 0xC3, 0xC3,
+    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xFF, 0xFF, 0xC0, 0x30, 0x03,
+    0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0xE0, 0xC0, 0x60, 0x30, 0x18, 0x4C,
+    0x46, 0x63, 0x61, 0xF0, 0xEC, 0x62, 0x31, 0x98, 0x6C, 0x30, 0xFF, 0xFF,
+    0xFF, 0xC0, 0xDE, 0xF7, 0x1C, 0xF0, 0xC7, 0x86, 0x3C, 0x31, 0xE1, 0x8F,
+    0x0C, 0x78, 0x63, 0xC3, 0x1E, 0x18, 0xC0, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3,
+    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,
+    0xC3, 0x66, 0x3C, 0xDE, 0x71, 0xB0, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x83,
+    0xE3, 0x6F, 0x30, 0x18, 0x0C, 0x00, 0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3,
+    0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0x03, 0xDF, 0x31, 0x8C, 0x63, 0x18,
+    0xC6, 0x00, 0x3E, 0xE3, 0xC0, 0xC0, 0xE0, 0x3C, 0x07, 0xC3, 0xE3, 0x7E,
+    0x66, 0xF6, 0x66, 0x66, 0x66, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,
+    0xC3, 0xC3, 0xC7, 0x7B, 0xC1, 0xA0, 0x98, 0xCC, 0x42, 0x21, 0xB0, 0xD0,
+    0x28, 0x1C, 0x0C, 0x00, 0xC6, 0x1E, 0x38, 0x91, 0xC4, 0xCA, 0x66, 0xD3,
+    0x16, 0xD0, 0xA6, 0x87, 0x1C, 0x38, 0xC0, 0xC6, 0x00, 0x43, 0x62, 0x36,
+    0x1C, 0x18, 0x1C, 0x3C, 0x26, 0x62, 0x43, 0xC1, 0x21, 0x98, 0xCC, 0x42,
+    0x61, 0xB0, 0xD0, 0x38, 0x1C, 0x0C, 0x06, 0x03, 0x01, 0x03, 0x00, 0xFE,
+    0x0C, 0x30, 0xC1, 0x86, 0x18, 0x20, 0xC1, 0xFC, 0x36, 0x66, 0x66, 0x6E,
+    0xCE, 0x66, 0x66, 0x66, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0xC6, 0x66,
+    0x66, 0x67, 0x37, 0x66, 0x66, 0x66, 0xC0, 0x61, 0x24, 0x38};
+
+const GFXglyph FreeSans9pt7bGlyphs[] PROGMEM = {
+    {0, 0, 0, 5, 0, 1},        // 0x20 ' '
+    {0, 2, 13, 6, 2, -12},     // 0x21 '!'
+    {4, 5, 4, 6, 1, -12},      // 0x22 '"'
+    {7, 10, 12, 10, 0, -11},   // 0x23 '#'
+    {22, 9, 16, 10, 1, -13},   // 0x24 '$'
+    {40, 16, 13, 16, 1, -12},  // 0x25 '%'
+    {66, 11, 13, 12, 1, -12},  // 0x26 '&'
+    {84, 2, 4, 4, 1, -12},     // 0x27 '''
+    {85, 4, 17, 6, 1, -12},    // 0x28 '('
+    {94, 4, 17, 6, 1, -12},    // 0x29 ')'
+    {103, 5, 5, 7, 1, -12},    // 0x2A '*'
+    {107, 6, 8, 11, 3, -7},    // 0x2B '+'
+    {113, 2, 4, 5, 2, 0},      // 0x2C ','
+    {114, 4, 1, 6, 1, -4},     // 0x2D '-'
+    {115, 2, 1, 5, 1, 0},      // 0x2E '.'
+    {116, 5, 13, 5, 0, -12},   // 0x2F '/'
+    {125, 8, 13, 10, 1, -12},  // 0x30 '0'
+    {138, 4, 13, 10, 3, -12},  // 0x31 '1'
+    {145, 9, 13, 10, 1, -12},  // 0x32 '2'
+    {160, 8, 13, 10, 1, -12},  // 0x33 '3'
+    {173, 7, 13, 10, 2, -12},  // 0x34 '4'
+    {185, 9, 13, 10, 1, -12},  // 0x35 '5'
+    {200, 9, 13, 10, 1, -12},  // 0x36 '6'
+    {215, 8, 13, 10, 0, -12},  // 0x37 '7'
+    {228, 9, 13, 10, 1, -12},  // 0x38 '8'
+    {243, 8, 13, 10, 1, -12},  // 0x39 '9'
+    {256, 2, 10, 5, 1, -9},    // 0x3A ':'
+    {259, 3, 12, 5, 1, -8},    // 0x3B ';'
+    {264, 9, 9, 11, 1, -8},    // 0x3C '<'
+    {275, 9, 4, 11, 1, -5},    // 0x3D '='
+    {280, 9, 9, 11, 1, -8},    // 0x3E '>'
+    {291, 9, 13, 10, 1, -12},  // 0x3F '?'
+    {306, 17, 16, 18, 1, -12}, // 0x40 '@'
+    {340, 12, 13, 12, 0, -12}, // 0x41 'A'
+    {360, 11, 13, 12, 1, -12}, // 0x42 'B'
+    {378, 11, 13, 13, 1, -12}, // 0x43 'C'
+    {396, 11, 13, 13, 1, -12}, // 0x44 'D'
+    {414, 9, 13, 11, 1, -12},  // 0x45 'E'
+    {429, 8, 13, 11, 1, -12},  // 0x46 'F'
+    {442, 12, 13, 14, 1, -12}, // 0x47 'G'
+    {462, 11, 13, 13, 1, -12}, // 0x48 'H'
+    {480, 2, 13, 5, 2, -12},   // 0x49 'I'
+    {484, 7, 13, 10, 1, -12},  // 0x4A 'J'
+    {496, 11, 13, 12, 1, -12}, // 0x4B 'K'
+    {514, 8, 13, 10, 1, -12},  // 0x4C 'L'
+    {527, 13, 13, 15, 1, -12}, // 0x4D 'M'
+    {549, 11, 13, 13, 1, -12}, // 0x4E 'N'
+    {567, 13, 13, 14, 1, -12}, // 0x4F 'O'
+    {589, 10, 13, 12, 1, -12}, // 0x50 'P'
+    {606, 13, 14, 14, 1, -12}, // 0x51 'Q'
+    {629, 12, 13, 13, 1, -12}, // 0x52 'R'
+    {649, 10, 13, 12, 1, -12}, // 0x53 'S'
+    {666, 9, 13, 11, 1, -12},  // 0x54 'T'
+    {681, 11, 13, 13, 1, -12}, // 0x55 'U'
+    {699, 11, 13, 12, 0, -12}, // 0x56 'V'
+    {717, 17, 13, 17, 0, -12}, // 0x57 'W'
+    {745, 12, 13, 12, 0, -12}, // 0x58 'X'
+    {765, 12, 13, 12, 0, -12}, // 0x59 'Y'
+    {785, 10, 13, 11, 1, -12}, // 0x5A 'Z'
+    {802, 3, 17, 5, 1, -12},   // 0x5B '['
+    {809, 5, 13, 5, 0, -12},   // 0x5C '\'
+    {818, 3, 17, 5, 0, -12},   // 0x5D ']'
+    {825, 7, 7, 8, 1, -12},    // 0x5E '^'
+    {832, 10, 1, 10, 0, 3},    // 0x5F '_'
+    {834, 4, 3, 5, 0, -12},    // 0x60 '`'
+    {836, 9, 10, 10, 1, -9},   // 0x61 'a'
+    {848, 9, 13, 10, 1, -12},  // 0x62 'b'
+    {863, 8, 10, 9, 1, -9},    // 0x63 'c'
+    {873, 8, 13, 10, 1, -12},  // 0x64 'd'
+    {886, 8, 10, 10, 1, -9},   // 0x65 'e'
+    {896, 4, 13, 5, 1, -12},   // 0x66 'f'
+    {903, 8, 14, 10, 1, -9},   // 0x67 'g'
+    {917, 8, 13, 10, 1, -12},  // 0x68 'h'
+    {930, 2, 13, 4, 1, -12},   // 0x69 'i'
+    {934, 4, 17, 4, 0, -12},   // 0x6A 'j'
+    {943, 9, 13, 9, 1, -12},   // 0x6B 'k'
+    {958, 2, 13, 4, 1, -12},   // 0x6C 'l'
+    {962, 13, 10, 15, 1, -9},  // 0x6D 'm'
+    {979, 8, 10, 10, 1, -9},   // 0x6E 'n'
+    {989, 8, 10, 10, 1, -9},   // 0x6F 'o'
+    {999, 9, 13, 10, 1, -9},   // 0x70 'p'
+    {1014, 8, 13, 10, 1, -9},  // 0x71 'q'
+    {1027, 5, 10, 6, 1, -9},   // 0x72 'r'
+    {1034, 8, 10, 9, 1, -9},   // 0x73 's'
+    {1044, 4, 12, 5, 1, -11},  // 0x74 't'
+    {1050, 8, 10, 10, 1, -9},  // 0x75 'u'
+    {1060, 9, 10, 9, 0, -9},   // 0x76 'v'
+    {1072, 13, 10, 13, 0, -9}, // 0x77 'w'
+    {1089, 8, 10, 9, 0, -9},   // 0x78 'x'
+    {1099, 9, 14, 9, 0, -9},   // 0x79 'y'
+    {1115, 7, 10, 9, 1, -9},   // 0x7A 'z'
+    {1124, 4, 17, 6, 1, -12},  // 0x7B '{'
+    {1133, 2, 17, 4, 2, -12},  // 0x7C '|'
+    {1138, 4, 17, 6, 1, -12},  // 0x7D '}'
+    {1147, 7, 3, 9, 1, -7}};   // 0x7E '~'
+
+const GFXfont FreeSans9pt7b_a PROGMEM = {(uint8_t *)FreeSans9pt7bBitmaps,
+                                         (GFXglyph *)FreeSans9pt7bGlyphs, 
+                                         0x20,     ///< ASCII extents (first char)
+                                         0x7E,     ///< ASCII extents (last char)
+//                                       22        ///< Newline distance (y axis)
+                                         17        ///< Newline distance (y axis)
+                                         };
+
+// Approx. 1822 bytes
diff --git a/lib/bluetft/src/bluetft.cpp b/lib/bluetft/src/bluetft.cpp
index b00be4e..6819cd5 100644
--- a/lib/bluetft/src/bluetft.cpp
+++ b/lib/bluetft/src/bluetft.cpp
@@ -12,12 +12,14 @@
 Adafruit_ST7735*     bluetft_tft ;                          // For instance of display driver
 scrseg_struct        bluetft_tftdata[TFTSECS] =             // Screen divided in 3 segments + 1 overlay
                       {                                     // One text line is 8 pixels
-                        { false, WHITE,   0,  8, "" },      // 1 top line
-                        { false, CYAN,   20, 64, "" },      // 8 lines in the middle
-                        { false, YELLOW, 90, 32, "" },      // 4 lines at the bottom
-                        { false, GREEN,  90, 32, "" }       // 4 lines at the bottom for rotary encoder
+                        { false, GREY,   1,   0, 12, 1*24, "" },                            // 1 top line - name & clock
+                        { false, CYAN,   2,  16, 38, 2*14, "" },                            // 2 big lines in the middle - artist
+                        { false, YELLOW, 2,  58, 38, 2*14, "" },                            // 2 big lines in the middle - song title
+                        { false, RED,    1, 100, 26, 3*24, "" },                            // 4 lines at the bottom minus volume bar - station name
+                        { false, GREEN,  1, 100, 26, 3*24, "" }                             // 4 lines at the bottom for rotary encoder
                       } ;
 
+uint8_t SelectedFont = 1;
 
 bool bluetft_dsp_begin ( int8_t cs, int8_t dc )
 {
@@ -132,6 +134,8 @@ void bluetft_displaytime ( const char* str, uint16_t color )
       if ( str[i] != oldstr[i] )                   // Difference?
       {
         dsp_fillRect ( pos, 0, 6, 8, BLACK ) ;     // Clear the space for new character
+        dsp_setTextSize ( tftdata[0].size ) ;                        // Selected text size
+        dsp_setTextColor ( tftdata[0].color ) ;                      // Set the requested color
         dsp_setCursor ( pos, 0 ) ;                 // Prepare to show the info
         dsp_print ( str[i] ) ;                     // Show the character
         oldstr[i] = str[i] ;                       // Remember for next compare
@@ -140,3 +144,37 @@ void bluetft_displaytime ( const char* str, uint16_t color )
     }
   }
 }
+
+
+
+
+//**************************************************************************************************
+
+void SetFont(uint8_t Size)
+{
+  if (Size == 1)
+  {
+    bluetft_tft->setFont(NULL);                                            // standard small font
+  }
+  else if (Size == 2)
+  {
+    bluetft_tft->setFont(&Font2Name);                                     // font for size 1
+  }
+  SelectedFont = Size;  // use in SetCursor function to adapt to difefrent font heights  
+}
+
+
+void SetCursor(int16_t x, int16_t y) 
+{
+  int16_t Yshift;
+  
+  if (SelectedFont == 1) // default built-in font
+    Yshift = 0;
+
+  else if (SelectedFont == 2) // bigger font, off center
+    Yshift = Font2YcursorShift;
+    
+  bluetft_tft->setCursor ( x, y + Yshift );
+}
+
+ 
diff --git a/lib/bluetft/src/bluetft.h b/lib/bluetft/src/bluetft.h
index 60bb25c..fdb6c2c 100644
--- a/lib/bluetft/src/bluetft.h
+++ b/lib/bluetft/src/bluetft.h
@@ -11,6 +11,10 @@
 #define BLUETFT_H
 #include <Adafruit_ST7735.h>
 
+#include "FreeSans9pt7b_a.h"
+#define Font2Name FreeSans9pt7b_a
+#define Font2YcursorShift 12  // for details see: https://learn.adafruit.com/adafruit-gfx-graphics-library/using-fonts   search "baseline"
+
 #define TIMEPOS     -52                         // Position (column) of time in topline relative to end
 #define INIPARS     ini_block.tft_cs_pin, ini_block.tft_dc_pin  // Prameters for dsp_begin
 #define DISPLAYTYPE "BLUETFT"
@@ -34,14 +38,16 @@ struct scrseg_struct                                  // For screen segments
 {
   bool     update_req ;                               // Request update of screen
   uint16_t color ;                                    // Textcolor
+  uint16_t size ;                                     // Text size
   uint16_t y ;                                        // Begin of segment row
   uint16_t height ;                                   // Height of segment
+  uint16_t str_max_len ;                              // Max chars in a segment
   String   str ;                                      // String to be displayed
 } ;
 
 
 // Data to display.  There are TFTSECS sections
-#define TFTSECS 4
+#define TFTSECS 5
 
 #define tftdata             bluetft_tftdata
 #define displaybattery      bluetft_displaybattery
@@ -50,14 +56,17 @@ struct scrseg_struct                                  // For screen segments
 
 extern Adafruit_ST7735*     bluetft_tft ;                                 // For instance of display driver
 
+void SetFont(uint8_t Size);
+void SetCursor(int16_t x, int16_t y);
+
 // Various macro's to mimic the ST7735 version of display functions
 #define dsp_setRotation()       bluetft_tft->setRotation ( 1 )            // Use landscape format (3 for upside down)
 #define dsp_print(a)            bluetft_tft->print ( a )                  // Print a string 
 #define dsp_println(b)          bluetft_tft->println ( b )                // Print a string followed by newline 
 #define dsp_fillRect(a,b,c,d,e) bluetft_tft->fillRect ( a, b, c, d, e ) ; // Fill a rectange
-#define dsp_setTextSize(a)      bluetft_tft->setTextSize(a)               // Set the text size
+#define dsp_setTextSize(a)      SetFont(a)               // Set the text size
 #define dsp_setTextColor(a)     bluetft_tft->setTextColor(a)              // Set the text color
-#define dsp_setCursor(a,b)      bluetft_tft->setCursor ( a, b )           // Position the cursor
+#define dsp_setCursor(a,b)      SetCursor( a, b )           // Position the cursor
 #define dsp_erase()             bluetft_tft->fillScreen ( BLACK ) ;       // Clear the screen
 #define dsp_getwidth()          160                                       // Adjust to your display
 #define dsp_getheight()         128                                       // Get height of screen
diff --git a/platformio.ini b/platformio.ini
index bd1e9b6..ddc4776 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -5,10 +5,10 @@ platform = espressif32
 board = esp32doit-devkit-v1
 framework = arduino
 board_build.partitions = radiopart.csv
-upload_port = COM8
+;upload_port = COM8
 ;upload_protocol = espota       ; OTA must be enabled in the running version, see config.h
 ;upload_port = 192.168.2.18     ; Adjust to the IP of the radio
-monitor_port = COM8
+;monitor_port = COM8
 monitor_speed = 115200
 monitor_dtr = 0
 monitor_rts = 0
@@ -22,12 +22,12 @@ build_flags =
 lib_ldf_mode = chain+		; Obey #include lines
 lib_deps = 
   Wire
-  knolleary/PubSubClient@^2.8
-  adafruit/Adafruit BusIO@^1.9.3
-  adafruit/Adafruit GFX Library@^1.10.4
-  adafruit/Adafruit ILI9341@^1.5.9
-  adafruit/Adafruit ST7735 and ST7789 Library@^1.7.5
-  me-no-dev/AsyncTCP@1.1.1
-  me-no-dev/ESP Async WebServer@^1.2.3
-  yveaux/AC101@^0.0.1
-  djuseeq/Ch376msc @ ^1.4.4
\ No newline at end of file
+  knolleary/PubSubClient
+  adafruit/Adafruit BusIO
+  adafruit/Adafruit GFX Library
+;  adafruit/Adafruit ILI9341
+  adafruit/Adafruit ST7735 and ST7789 Library
+  me-no-dev/AsyncTCP
+  me-no-dev/ESP Async WebServer
+;  yveaux/AC101@^0.0.1
+;  djuseeq/Ch376msc @ ^1.4.4
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index bae765a..995bbd2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -108,7 +108,7 @@
 
 //
 // Define the version number, the format used is the HTTP standard.
-#define VERSION     "Wed, 06 Mar 2024 16:00:00 GMT"
+#define VERSION     "Sun, 24 Mar 2024 16:00:00 GMT"
 //
 #include <Arduino.h>                                      // Standard include for Platformio Arduino projects
 #include "soc/soc.h"                                      // For brown-out detector setting
@@ -160,7 +160,7 @@
 #endif
 #define MAXKEYS           200                             // Max. number of NVS keys in table
 #define FSIF              true                            // Format SPIFFS if not existing
-#define QSIZ              400                             // Number of entries in the MP3 stream queue
+#define STREAM_QUEUE_SIZE 1600                            // Number of entries in the queue (default 400) https://github.com/Edzelf/ESP32Radio-V2/issues/75
 #define NVSBUFSIZE        150                             // Max size of a string in NVS
 // Access point name if connection to WiFi network fails.  Also the hostname for WiFi and OTA.
 // Note that the password of an AP must be at least as long as 8 characters.
@@ -171,7 +171,7 @@
 #define MAXPRESETS        200                             // Max number of presets in preferences
 #define MAXMQTTCONNECTS   5                               // Maximum number of MQTT reconnects before give-up
 #define METASIZ           1024                            // Size of metaline buffer
-#define BL_TIME           45                              // Time-out [sec] for blanking TFT display (BL pin)
+#define BL_TIME           45000                           // Time-out [sec] for blanking TFT display (BL pin)
 //
 // Subscription topics for MQTT.  The topic will be pefixed by "PREFIX/", where PREFIX is replaced
 // by the the mqttprefix in the preferences.  The next definition will yield the topic
@@ -1257,18 +1257,20 @@ bool showstreamtitle ( const char *ml, bool full )
       *p1++ = '\\' ;                            // Found: replace 3 characters by "\r"
       *p1++ = 'r' ;                             // Found: replace 3 characters by "\r"
     #else
-      *p1++ = '\n' ;                            // Found: replace 3 characters by newline
+//    *p1++ = '\n' ;                            // Found: replace 3 characters by newline
+      *p1++ = '\0' ;                            // Found: replace 3 characters by Terminator; string is now split into two
     #endif
     if ( *p2 == ' ' )                           // Leading space in title?
     {
       p2++ ;
     }
-    strcpy ( p1, p2 ) ;                         // Shift 2nd part of title 2 or 3 places
+//  strcpy ( p1, p2 ) ;                         // Shift 2nd part of title 2 or 3 places
   }
   if ( strcmp ( oldstreamtitle,                 // Change in tiltlke?
                 streamtitle ) != 0 )
   {
-    tftset ( 1, streamtitle ) ;                 // Yes, set screen segment text middle part
+    tftset ( 1, streamtitle ) ;                 // Yes, set screen segment text middle part A
+    tftset ( 2, p2 ) ;                          // Set screen segment text middle part B (Title)
     return true ;                               // Return true if tiitle has changed
   }
   return false ;
@@ -1329,7 +1331,8 @@ bool connecttohost()
   ESP_LOGI ( TAG, "Connect to host %s",
              presetinfo.host.c_str() ) ;
   tftset ( 0, NAME ) ;                               // Set screen segment text top line
-  tftset ( 1, "" ) ;                                 // Clear song and artist
+  tftset ( 1, "" ) ;                                 // Clear artist
+  tftset ( 2, "" ) ;                                 // Clear song 
   displaytime ( "" ) ;                               // Clear time on TFT screen
   setdatamode ( INIT ) ;                             // Start default in INIT mode
   chunked = false ;                                  // Assume not chunked
@@ -1355,8 +1358,7 @@ bool connecttohost()
     port = hostwoext.substring ( inx + 1 ).toInt() ; // Get portnumber as integer
     hostwoext = hostwoext.substring ( 0, inx ) ;     // Host without portnumber
   }
-  //ESP_LOGI ( TAG, "Connect to %s on port %d, extension %s",
-  //           hostwoext.c_str(), port, extension.c_str() ) ;
+  ESP_LOGI ( TAG, "Connect to %s on port %d, extension %s", hostwoext.c_str(), port, extension.c_str() ) ;
   if ( mp3client->connect ( hostwoext.c_str(), port ) )
   {
     if ( nvssearch ( "basicauth" ) )                 // Does "basicauth" exists?
@@ -1553,6 +1555,9 @@ bool connectwifi()
     ESP_LOGI ( TAG, "WiFi Failed!  Trying to setup AP with"
                " name %s and password %s.",
                NAME, NAME ) ;
+    dsp_setTextColor ( RED ) ;                         // Startup info color
+    tftlog ( "Local AP Active!", true ) ;   
+    dsp_setTextColor ( WHITE ) ;                        // Startup info color
     WiFi.disconnect ( true ) ;                          // After restart the router could
     WiFi.softAPdisconnect ( true ) ;                    // still keep the old connection
     if ( ! WiFi.softAP ( NAME, NAME ) )                 // This ESP will be an AP
@@ -1563,16 +1568,20 @@ bool connectwifi()
   }
   else
   {
+    dsp_setTextColor ( GREEN ) ;                         // Startup info color
     tftlog ( "SSID = " ) ;                              // Show SSID on display
     tftlog ( WiFi.SSID().c_str(), true ) ;
+    dsp_setTextColor ( WHITE ) ;                         // Startup info color
     ESP_LOGI ( TAG, "SSID = %s",                        // Format string with SSID connected to
                WiFi.SSID().c_str() ) ;
     ipaddress = WiFi.localIP().toString() ;             // Form IP address
   }
   pIP = ipaddress.c_str() ;                             // As c-string
   ESP_LOGI ( TAG, "IP = %s", pIP ) ;
+  dsp_setTextColor ( GREEN ) ;                          // Startup info color
   tftlog ( "IP = " ) ;                                  // Show IP
   tftlog ( pIP, true ) ;
+  dsp_setTextColor ( WHITE ) ;                         // Startup info color
   #ifdef NEXTION
     vTaskDelay ( 2000 / portTICK_PERIOD_MS ) ;          // Show for some time
     dsp_println ( "\f" ) ;                              // Select new page if NEXTION 
@@ -1592,7 +1601,7 @@ void otastart()
   const char* p = "OTA update Started" ;
 
   ESP_LOGI ( TAG, "%s", p ) ;                      // Show event for debug
-  tftset ( 2, p ) ;                                // Set screen segment bottom part
+  tftset ( 4, p ) ;                                // Set screen segment bottom part
   mp3client->abort() ;                             // Stop client
   timerAlarmDisable ( timer ) ;                    // Disable the timer
   disableCore0WDT() ;                              // Disable watchdog core 0
@@ -1609,7 +1618,7 @@ void otastart()
 void otaerror ( ota_error_t error)
 {
   ESP_LOGE ( TAG, "OTA error %d", error ) ;
-  tftset ( 2, "OTA error!" ) ;                        // Set screen segment bottom part
+  tftset ( 4, "OTA error!" ) ;                        // Set screen segment bottom part
 }
 #endif                                                // ENABLEOTA
 
@@ -1739,8 +1748,7 @@ void reservepin ( int8_t rpinnr )
       {
         ESP_LOGE ( TAG, "Pin %d is already reserved!", rpinnr ) ;
       }
-      //ESP_LOGE ( TAG, "GPIO%02d unavailabe for 'gpio_'-command",
-      //           pin ) ;
+      ESP_LOGE ( TAG, "GPIO%02d unavailabe for 'gpio_'-command", pin ) ;
       progpin[i].reserved = true ;                          // Yes, pin is reserved now
       break ;                                               // No need to continue
     }
@@ -1752,8 +1760,7 @@ void reservepin ( int8_t rpinnr )
   {
     if ( pin == rpinnr )                                    // Entry found?
     {
-      //ESP_LOGI ( TAG, "GPIO%02d unavailabe for touch command",
-      //           pin ) ;
+      ESP_LOGI ( TAG, "GPIO%02d unavailabe for touch command", pin ) ;
       touchpin[i].reserved = true ;                         // Yes, pin is reserved now
       break ;                                               // No need to continue
     }
@@ -2519,8 +2526,10 @@ void setup()
     ESP_LOGI ( TAG, "GPIO%d is %s", pinnr, p ) ;
   }
   readprogbuttons() ;                                    // Program the free input pins
+  ESP_LOGI ( TAG, "Config prog buttons..." ) ;
   if ( ini_block.spi_sck_pin >= 0 )
   {
+    ESP_LOGI ( TAG, "Init VSPI bus..." ) ;
     SPI.begin ( ini_block.spi_sck_pin,                   // Init VSPI bus with default or modified pins
                 ini_block.spi_miso_pin,
                 ini_block.spi_mosi_pin ) ;
@@ -2540,7 +2549,7 @@ void setup()
     dsp_erase() ;                                        // Clear screen
     dsp_setRotation() ;                                  // Usse landscape format
     dsp_setTextSize ( DEFTXTSIZ ) ;                      // Small character font
-    dsp_setTextColor ( GREY ) ;                          // Info in grey
+    dsp_setTextColor ( WHITE ) ;                         // Info in white
     dsp_setCursor ( 0, 0 ) ;                             // Top of screen
     dsp_println ( "Starting......" ) ;
     strncpy ( tmpstr, VERSION, 16 ) ;                    // Limit version length
@@ -2562,6 +2571,9 @@ void setup()
   }
   blset ( true ) ;                                       // Enable backlight (if configured)
   #ifndef ETHERNET
+    ESP_LOGI ( TAG, "Start WiFi..." ) ;
+    dsp_println ( "List of WiFi networks.." ) ;
+    dsp_update() ;                                         // To physical screen
     mk_lsan() ;                                          // Make a list of acceptable networks
                                                          // in preferences.
     WiFi.disconnect() ;                                  // After restart router could still
@@ -2571,10 +2583,13 @@ void setup()
     vTaskDelay ( 500 / portTICK_PERIOD_MS ) ;            // ??
     WiFi.persistent ( false ) ;                          // Do not save SSID and password
   #endif
+  ESP_LOGI ( TAG, "Init hardware..." ) ;
+  dsp_println ( "Init hardware.." ) ;
+  dsp_update() ;                                         // To physical screen
   readprefs ( false ) ;                                  // Read preferences
   radioqueue = xQueueCreate ( 10,                        // Create small queue for communication to radiofuncs
                              sizeof ( qdata_type ) ) ;
-  dataqueue = xQueueCreate  ( QSIZ,                      // Create queue for data communication
+  dataqueue = xQueueCreate  ( STREAM_QUEUE_SIZE,                      // Create queue for data communication
                              sizeof ( qdata_struct ) ) ;
   p = "Connect to network" ;                             // Show progress
   ESP_LOGI ( TAG, "%s", p ) ;
@@ -2587,7 +2602,9 @@ void setup()
   #endif
   tcpip_adapter_set_hostname ( TCPIP_ADAPTER_IF_STA,
                                NAME ) ;
-  ESP_LOGI ( TAG, "Start web server" ) ;
+  p = "Starting web server" ;                            // Show progress
+  ESP_LOGI ( TAG, "%s", p ) ;
+  tftlog ( p, true ) ;                                   // On TFT too
   cmdserver.on ( "/getprefs",  handle_getprefs ) ;       // Handle get preferences
   cmdserver.on ( "/saveprefs", handle_saveprefs ) ;      // Handle save preferences
   cmdserver.on ( "/getdefs",   handle_getdefs ) ;        // Handle get default config
@@ -3057,7 +3074,7 @@ void chk_enc()
       {
         enc_menu_mode = TRACK ;                               // Swich to TRACK mode
         ESP_LOGI ( TAG, "Encoder mode set to TRACK" ) ;
-        tftset ( 3, "Turn to select track\n"                  // Show current option
+        tftset ( 4, "Turn to select track\n"                  // Show current option
                     "Press to confirm" ) ;
         getSDFileName ( +1 ) ;                                // Start with next file on SD
       }
@@ -3073,7 +3090,7 @@ void chk_enc()
     doubleclick = false ;
     enc_menu_mode = PRESET ;                                  // Swich to PRESET mode
     ESP_LOGI ( TAG, "Encoder mode set to PRESET" ) ;
-    tftset ( 3, "Turn to select station\n"                    // Show current option
+    tftset ( 4, "Turn to select station\n"                    // Show current option
                 "Press to confirm" ) ;
     enc_preset = presetinfo.preset ;                          // Start with current preset
     updateNr ( &enc_preset, presetinfo.highest_preset,        // plus 1
@@ -3088,7 +3105,7 @@ void chk_enc()
       case VOLUME :
         if ( muteflag )
         {
-          tftset ( 2, icyname ) ;                             // Restore screen segment bottom part
+          tftset ( 3, icyname ) ;                             // Restore screen segment bottom part
         }
         else
         {
@@ -3101,13 +3118,13 @@ void chk_enc()
         nextPreset ( enc_preset ) ;                           // Make a definite choice
         enc_menu_mode = VOLUME ;                              // Back to default mode
         myQueueSend ( radioqueue, &startcmd ) ;               // Signal radiofuncs()
-        tftset ( 2, icyname ) ;                               // Restore screen segment bottom part
+        tftset ( 3, icyname ) ;                               // Restore screen segment bottom part
         break ;
     #ifdef SDCARD
       case TRACK :
         myQueueSend ( sdqueue, &startcmd ) ;                  // Signal SDfuncs()
         enc_menu_mode = VOLUME ;                              // Back to default mode
-        tftset ( 2, icyname ) ;                               // Restore screen segment bottom part
+        tftset ( 3, icyname ) ;                               // Restore screen segment bottom part
         break ;
     #endif
       default :
@@ -3596,7 +3613,7 @@ void handlebyte_ch ( uint8_t b )
           {
             icyname = presetinfo.hsym ;                 // Yes, use symbolic name
           }
-          tftset ( 2, icyname ) ;                       // Set screen segment bottom part
+          tftset ( 3, icyname ) ;                       // Set screen segment bottom part
           mqttpub.trigger ( MQTT_ICYNAME ) ;            // Request publishing to MQTT
         }
         else if ( lcml.startsWith ( "transfer-encoding:" ) )
@@ -4068,6 +4085,12 @@ const char* analyzeCmd ( const char* par, const char* val )
               value.c_str() ) ;
     utf8ascii_ip ( reply ) ;                          // Remove possible strange characters
   }
+  else if ( argument == "stop" )                       // Stop request?
+  {
+    myQueueSend ( sdqueue, &stopcmd ) ;                // Stop player
+    myQueueSend ( radioqueue, &stopcmd ) ;             // Stop player
+    //stop_mp3client()
+  }
   else if ( argument == "sleep" )                     // Sleep request?
   {
     sleepreq = true ;                                 // Yes, set request flag
@@ -4196,7 +4219,7 @@ const char* analyzeCmd ( const char* par, const char* val )
 //**************************************************************************************************
 //                                      D I S P L A Y I N F O                                      *
 //**************************************************************************************************
-// Show a string on the LCD at a specified y-position (0..2) in a specified color.                 *
+// Show a string on the LCD at a specified y-position (0..4) in a specified color.                 *
 // The parameter is the index in tftdata[].                                                        *
 //**************************************************************************************************
 void displayinfo ( uint16_t inx )
@@ -4214,14 +4237,20 @@ void displayinfo ( uint16_t inx )
     dsp_fillRect ( 0, p->y, width, p->height, BLACK ) ;    // Clear the space for new info
     if ( ( dsp_getheight() > 64 ) && ( p->y > 1 ) )        // Need and space for divider?
     {
+      dsp_fillRect ( 0, p->y - 4, width, 4, BLACK ) ;      // Clear the space for divider
       dsp_fillRect ( 0, p->y - 4, width, 1, GREEN ) ;      // Yes, show divider above text
     }
     len = p->str.length() ;                                // Required length of buffer
+    if ( len > p->str_max_len )
+      {
+      len = p->str_max_len;                                // limit number of chars to be displayed in a section to not overflow into another sections
+      }
     if ( len++ )                                           // Check string length, set buffer length
     {
       char buf [ len ] ;                                   // Need some buffer space
       p->str.toCharArray ( buf, len ) ;                    // Make a local copy of the string
       utf8ascii_ip ( buf ) ;                               // Convert possible UTF8
+      dsp_setTextSize ( p->size ) ;                        // Selected text size
       dsp_setTextColor ( p->color ) ;                      // Set the requested color
       dsp_setCursor ( 0, p->y ) ;                          // Prepare to show the info
       dsp_println ( buf ) ;                                // Show the string

From 8933e71b0ae59c8753b2d1a23aec0e3e5e271e84 Mon Sep 17 00:00:00 2001
From: aly-fly <aljaz@ogrin.me>
Date: Mon, 25 Mar 2024 22:03:19 +0100
Subject: [PATCH 3/7] Fixed reboot on Stop

---
 .gitignore                  |  1 +
 data/index.html             |  8 +++++---
 data/style.css              |  1 +
 lib/bluetft/src/bluetft.cpp |  4 ++--
 lib/bluetft/src/bluetft.h   | 10 +++++-----
 src/main.cpp                | 22 +++++++++++++++-------
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 89cc49c..619cbd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
+*aljaz*
diff --git a/data/index.html b/data/index.html
index 220a888..ee1a838 100644
--- a/data/index.html
+++ b/data/index.html
@@ -32,9 +32,11 @@ <h1>** ESP32 Radio **</h1>
    <button class="volumebutton" id="vol" onclick="httpGet('volume=100')">100</button>
    <br>
    <br>
-   <button class="bigbutton" onclick="httpGet('mute')">MUTE</button>
-   <button class="bigbutton" onclick="httpGet('status')">STATUS</button>
-   <button class="bigbutton" onclick="httpGet('test')">TEST</button>
+   <button class="button" onclick="httpGet('stop')">STOP</button>
+   <button class="button" onclick="httpGet('start')">START</button>
+   <button class="button" onclick="httpGet('mute')">MUTE</button>
+   <button class="button" onclick="httpGet('status')">STATUS</button>
+   <button class="button" onclick="httpGet('test')">TEST</button>
    
    <br>
    <br>
diff --git a/data/style.css b/data/style.css
index 7cf288b..319e30b 100644
--- a/data/style.css
+++ b/data/style.css
@@ -103,6 +103,7 @@ body {
     border-radius: 5px;
     -webkit-border-radius: 5px;
     -webkit-appearance: none;
+    appearance: none;
     border: 1px solid black;
     border-radius: 10px;
  }
diff --git a/lib/bluetft/src/bluetft.cpp b/lib/bluetft/src/bluetft.cpp
index 6819cd5..912358a 100644
--- a/lib/bluetft/src/bluetft.cpp
+++ b/lib/bluetft/src/bluetft.cpp
@@ -30,8 +30,8 @@ bool bluetft_dsp_begin ( int8_t cs, int8_t dc )
   if ( ( bluetft_tft = new Adafruit_ST7735 ( cs, dc , -1 ) ) )      // Create an instant for TFT
   {
     // Uncomment one of the following initR lines for ST7735R displays
-    //tft->initR ( INITR_GREENTAB ) ;                               // Init TFT interface
-    //tft->initR ( INITR_REDTAB ) ;                                 // Init TFT interface
+    //bluetft_tft->initR ( INITR_GREENTAB ) ;                               // Init TFT interface
+    //bluetft_tft->initR ( INITR_REDTAB ) ;                                 // Init TFT interface
     bluetft_tft->initR ( INITR_BLACKTAB ) ;                         // Init TFT interface
     //tft->initR ( INITR_144GREENTAB ) ;                            // Init TFT interface
     //tft->initR ( INITR_MINI160x80 ) ;                             // Init TFT interface
diff --git a/lib/bluetft/src/bluetft.h b/lib/bluetft/src/bluetft.h
index fdb6c2c..370adb6 100644
--- a/lib/bluetft/src/bluetft.h
+++ b/lib/bluetft/src/bluetft.h
@@ -60,16 +60,16 @@ void SetFont(uint8_t Size);
 void SetCursor(int16_t x, int16_t y);
 
 // Various macro's to mimic the ST7735 version of display functions
-#define dsp_setRotation()       bluetft_tft->setRotation ( 1 )            // Use landscape format (3 for upside down)
+#define dsp_setRotation()       bluetft_tft->setRotation ( 3 )            // Use landscape format (3 for upside down)
 #define dsp_print(a)            bluetft_tft->print ( a )                  // Print a string 
 #define dsp_println(b)          bluetft_tft->println ( b )                // Print a string followed by newline 
-#define dsp_fillRect(a,b,c,d,e) bluetft_tft->fillRect ( a, b, c, d, e ) ; // Fill a rectange
+#define dsp_fillRect(a,b,c,d,e) bluetft_tft->fillRect ( a, b, c, d, e )   // Fill a rectange
 #define dsp_setTextSize(a)      SetFont(a)               // Set the text size
 #define dsp_setTextColor(a)     bluetft_tft->setTextColor(a)              // Set the text color
 #define dsp_setCursor(a,b)      SetCursor( a, b )           // Position the cursor
-#define dsp_erase()             bluetft_tft->fillScreen ( BLACK ) ;       // Clear the screen
-#define dsp_getwidth()          160                                       // Adjust to your display
-#define dsp_getheight()         128                                       // Get height of screen
+#define dsp_erase()             bluetft_tft->fillScreen ( BLACK )         // Clear the screen
+#define dsp_getwidth()          bluetft_tft->width()                      // Adjust to your display
+#define dsp_getheight()         bluetft_tft->height()                     // Get height of screen
 #define dsp_update(a)                                                     // Updates to the physical screen
 #define dsp_begin               bluetft_dsp_begin                         // Init driver
 
diff --git a/src/main.cpp b/src/main.cpp
index 995bbd2..06c0253 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1301,7 +1301,7 @@ void stop_mp3client ()
   while ( mp3client && mp3client->connected() )    // Client active and connected?
   {
     ESP_LOGI ( TAG, "Stopping client" ) ;          // Yes, stop connection to host
-    //mp3client->close() ;                         // Causes memory leak!
+    mp3client->close() ;                           // Causes memory leak!
     mp3client->abort() ;                           // This works better
     vTaskDelay ( 500 / portTICK_PERIOD_MS ) ;
   }
@@ -1333,6 +1333,7 @@ bool connecttohost()
   tftset ( 0, NAME ) ;                               // Set screen segment text top line
   tftset ( 1, "" ) ;                                 // Clear artist
   tftset ( 2, "" ) ;                                 // Clear song 
+  tftset ( 3, "" ) ;                                 // Clear station
   displaytime ( "" ) ;                               // Clear time on TFT screen
   setdatamode ( INIT ) ;                             // Start default in INIT mode
   chunked = false ;                                  // Assume not chunked
@@ -4087,9 +4088,16 @@ const char* analyzeCmd ( const char* par, const char* val )
   }
   else if ( argument == "stop" )                       // Stop request?
   {
-    myQueueSend ( sdqueue, &stopcmd ) ;                // Stop player
-    myQueueSend ( radioqueue, &stopcmd ) ;             // Stop player
-    //stop_mp3client()
+    myQueueSend ( sdqueue, &stopcmd ) ;                // Stop player SD card
+    myQueueSend ( radioqueue, &stopcmd ) ;             // Stop player web radio
+    //also clear display
+    tftset ( 1, "" ) ;                                 // Clear artist
+    tftset ( 2, "  STOP" ) ;                           // Clear song 
+    tftset ( 3, "" ) ;                                 // Clear station
+  }
+  else if ( argument == "start" )                     // Start request?
+  {
+    myQueueSend ( radioqueue, &startcmd  ) ;          // Restart radio player
   }
   else if ( argument == "sleep" )                     // Sleep request?
   {
@@ -4113,8 +4121,8 @@ const char* analyzeCmd ( const char* par, const char* val )
   }
   else if ( argument == "test" )                      // Test command
   {
-    sprintf ( reply, "Free memory is %d/%d, "         // Get some info to display
-              "chunks in queue %d, bitrate %d kbps\n",
+    sprintf ( reply, "Free memory %d/%d, "           // Get some info to display
+              "queue %d, bitrate %d kbps\n",
               heapspace,
               ESP.getFreeHeap(),
               uxQueueMessagesWaiting ( dataqueue ),
@@ -4238,7 +4246,7 @@ void displayinfo ( uint16_t inx )
     if ( ( dsp_getheight() > 64 ) && ( p->y > 1 ) )        // Need and space for divider?
     {
       dsp_fillRect ( 0, p->y - 4, width, 4, BLACK ) ;      // Clear the space for divider
-      dsp_fillRect ( 0, p->y - 4, width, 1, GREEN ) ;      // Yes, show divider above text
+      dsp_fillRect ( 0, p->y - 4, width, 1, BLUE ) ;      // Yes, show divider above text
     }
     len = p->str.length() ;                                // Required length of buffer
     if ( len > p->str_max_len )

From c3f948ea9c197fdd7ff6c0afeb42e40b2d59c348 Mon Sep 17 00:00:00 2001
From: Aljaz Ogrin <aljaz@ogrin.me>
Date: Thu, 26 Dec 2024 08:52:13 +0100
Subject: [PATCH 4/7] Small OLED, display off (#155), audio DAC

---
 ESP32-Radio.code-workspace |  23 ----
 data/defaultprefs.txt      |  82 +++++--------
 data/style.css             |   2 +-
 include/config.h           |  12 +-
 src/main.cpp               | 242 +++++++++++++++++++++++++------------
 5 files changed, 204 insertions(+), 157 deletions(-)
 delete mode 100644 ESP32-Radio.code-workspace

diff --git a/ESP32-Radio.code-workspace b/ESP32-Radio.code-workspace
deleted file mode 100644
index 43e365a..0000000
--- a/ESP32-Radio.code-workspace
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"files.associations": {
-			"random": "cpp",
-			"new": "cpp",
-			"*.tcc": "cpp",
-			"fstream": "cpp",
-			"array": "cpp",
-			"deque": "cpp",
-			"string": "cpp",
-			"unordered_map": "cpp",
-			"unordered_set": "cpp",
-			"vector": "cpp",
-			"initializer_list": "cpp",
-			"regex": "cpp"
-		}
-	}
-}
\ No newline at end of file
diff --git a/data/defaultprefs.txt b/data/defaultprefs.txt
index ebdc2aa..e4c2db4 100644
--- a/data/defaultprefs.txt
+++ b/data/defaultprefs.txt
@@ -1,64 +1,40 @@
-# Example configuration
-# Programmable input pins:
+clk_dst = 1
+clk_offset = 0
+clk_server = pool.ntp.org
+#
 gpio_00 = uppreset = 1
-gpio_12 = upvolume = 2
-gpio_13 = downvolume = 2
-gpio_14 = stop
-gpio_17 = resume
-gpio_34 = station = icecast.omroep.nl:80/radio1-bb-mp3
 #
-# MQTT settings
+lstmods = Fri, 12 Nov 2021 10:46:40 GMT
+#
 mqttbroker = none
+mqttpasswd = *******
 mqttport = 1883
-mqttuser = none
-mqttpasswd = none
 mqttprefix = none
-# Enter your WiFi network specs here:
-wifi_00 = SSID1/PASSWD1
-wifi_01 = SSID2/PASSWD2
+mqttuser = none
 #
-volume = 72
-toneha = 0
-tonehf = 0
-tonela = 0
-tonelf = 0
+pin_enc_clk = -1                                   # GPIO Pin number for rotary encoder CLK
+pin_enc_dt = -1                                    # GPIO Pin number for rotary encoder DT
+pin_enc_sw = -1                                    # GPIO Pin number for rotary encoder SW
+pin_ir = -1                                        # GPIO Pin number for IR receiver VS1838B
+pin_tft_scl = 15      # GPIO Pin number for OLED SCL
+pin_tft_sda = 4       # GPIO Pin number for OLED SDA
 #
-preset = 6
-# Some preset examples
-preset_00 = 109.206.96.34:8100                       #  0 - NAXI LOVE RADIO, Belgrade, Serbia
-preset_01 = airspectrum.cdnstream1.com:8114/1648_128 #  1 - Easy Hits Florida 128k
-preset_02 = us2.internet-radio.com:8050              #  2 - CLASSIC ROCK MIAMI 256k
-preset_03 = airspectrum.cdnstream1.com:8000/1261_192 #  3 - Magic Oldies Florida
-preset_04 = airspectrum.cdnstream1.com:8008/1604_128 #  4 - Magic 60s Florida 60s Classic Rock
-preset_05 = us1.internet-radio.com:8105              #  5 - Classic Rock Florida - SHE Radio
-preset_06 = icecast.omroep.nl:80/radio1-bb-mp3       #  6 - Radio 1, NL
-preset_07 = 205.164.62.15:10032                      #  7 - 1.FM - GAIA, 64k
-preset_08 = skonto.ls.lv:8002/mp3                    #  8 - Skonto 128k
-preset_09 = 94.23.66.155:8106                        #  9 - *ILR CHILL and GROOVE
-preset_10 = ihr/IHR_IEDM                             # 10 - iHeartRadio IHR_IEDM
-preset_11 = ihr/IHR_TRAN                             # 11 - iHeartRadio IHR_TRAN
+preset = 3
+preset_00 = stream02.exit.si:8000/radiohit           # 0 Radio HIT slo
+preset_01 = 22613.live.streamtheworld.com:80/SRGSTR08.mp3  # 14 Sky Radio Christmas
+preset_02 = www.radio-xmas.at:443/xmas?1512905036085       # 15 Radio Xmas AT
+preset_03 = live1.jupinfo.fr:8000/radiodenoel              # 16 La radio de Noel FR
 #
-# Clock offset and daylight saving time
-clk_server = pool.ntp.org                            # Time server to be used
-clk_offset = 1                                       # Offset with respect to UTC in hours
-clk_dst = 1                                          # Offset during daylight saving time (hours)
-# Some IR codes
-ir_40BF = upvolume = 2
-ir_C03F = downvolume = 2
-# GPIO pinnings
-pin_ir = 35                                          # GPIO Pin number for IR receiver VS1838B
-pin_enc_clk = 25                                     # GPIO Pin number for rotary encoder "CLK"
-pin_enc_dt = 26                                      # GPIO Pin number for rotary encoder "DT"
-pin_enc_sw = 27                                      # GPIO Pin number for rotary encoder "SW"
+toneha = 0
+tonehf = 2
+tonela = 4
+tonelf = 5
 #
-pin_tft_cs = 15                                      # GPIO Pin number for TFT "CS"
-pin_tft_dc = 2                                       # GPIO Pin number for TFT "DC"
+volume = 90
 #
-# define pins for decoder.  Examples for VS1053 and I2S:respect
-pin_vs_cs = 5                                        # GPIO Pin number for VS1053 "CS"
-pin_vs_dcs = 32                                      # GPIO Pin number for VS1053 "DCS"
-pin_vs_dreq = 34                                     # GPIO Pin number for VS1053 "DREQ"
+wifi_00 = USER/PASS
+wifi_01 = USER/PASS
 #
-#pin_i2s_bck = 5                                      # GPIO Pin number for I2S "BCK"
-#pin_i2s_lck = 32                                     # GPIO Pin number for I2S "L(R)CK"
-#pin_i2s_din = 34                                     # GPIO Pin number for I2S "DIN"
+# Screensaving Options
+disp_time = 45                                       # Turn off backlight / blank display (seconds)
+disp_blank = true                                    # Enables blanking the display
diff --git a/data/style.css b/data/style.css
index 319e30b..0b7f3e9 100644
--- a/data/style.css
+++ b/data/style.css
@@ -1,5 +1,5 @@
 body {
-    background-color: lightblue;
+    background-color: rgb(255, 223, 158);
     font-family: Arial, Helvetica, sans-serif;
     font-size: 170%; /* 100% = 16 px */
  }
diff --git a/include/config.h b/include/config.h
index d74a643..0b4c4d8 100644
--- a/include/config.h
+++ b/include/config.h
@@ -5,7 +5,7 @@
 //***************************************************************************************************
 //
 #ifndef CONFIG_H
-  //#define NAME "ESP32-Radio"                              // Define name of the radio, also AP SSID,
+  #define NAME "XmasRadio"                              // Define name of the radio, also AP SSID,
                                                             // also namespace in NVS.
                                                             // Default is "ESP32-Radio"
 
@@ -15,21 +15,21 @@
 
   //#define FIXEDWIFI "SSID-11/PW12345"                     // Add a fixed SSID to the list (WiFi only)
   
-  //#define ENABLEOTA                                       // OTA feature
+  #define ENABLEOTA                                       // OTA feature
 
   // Define (just one) type of MP3/AAC decoder
-  #define DEC_VS1053                                        // Hardware decoder for MP3, AAC, OGG
+  //#define DEC_VS1053                                        // Hardware decoder for MP3, AAC, OGG
   //#define DEC_VS1003                                      // Hardware decoder for MP3 only
   //#define DEC_HELIX                                       // Software decoder for MP3, AAC. I2S output
   //#define DEC_HELIX_SPDIF                                 // Toslink/Spdif output for MP3, AAC (experimental)
   //#define DEC_HELIX_AI                                    // Software decoder for AI Audio kit (AC101)
-  //#define DEC_HELIX_INT                                   // Software decoder for MP3, AAC. DAC output
+  #define DEC_HELIX_INT                                   // Software decoder for MP3, AAC. DAC output
                                                             // Needs platform = espressif32@3.1.0 !!!!
 
   // Define (just one) type of display.  See documentation.
-  #define BLUETFT                                         // Works also for RED TFT 128x160
+  //#define BLUETFT                                         // Works also for RED TFT 128x160
   //#define ST7789                                          // 240x240 TFT (SPI)
-  //#define OLED1306                                        // 64x128 I2C OLED SSD1306
+  #define OLED1306                                        // 64x128 I2C OLED SSD1306 - OLED_moder_PCB_bel_Heltec
   //#define OLED1309                                        // 64x128 I2C OLED SSD1309
   //#define OLED1106                                        // 64x128 I2C OLED SH1106
   //#define DUMMYTFT                                          // Dummy display
diff --git a/src/main.cpp b/src/main.cpp
index 06c0253..3f99132 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -108,7 +108,7 @@
 
 //
 // Define the version number, the format used is the HTTP standard.
-#define VERSION     "Sun, 24 Mar 2024 16:00:00 GMT"
+#define VERSION     "Wed, 06 Mar 2024 16:00:00 GMT"
 //
 #include <Arduino.h>                                      // Standard include for Platformio Arduino projects
 #include "soc/soc.h"                                      // For brown-out detector setting
@@ -160,7 +160,7 @@
 #endif
 #define MAXKEYS           200                             // Max. number of NVS keys in table
 #define FSIF              true                            // Format SPIFFS if not existing
-#define STREAM_QUEUE_SIZE 1600                            // Number of entries in the queue (default 400) https://github.com/Edzelf/ESP32Radio-V2/issues/75
+#define QSIZ              1800                             // Number of entries in the MP3 stream queue
 #define NVSBUFSIZE        150                             // Max size of a string in NVS
 // Access point name if connection to WiFi network fails.  Also the hostname for WiFi and OTA.
 // Note that the password of an AP must be at least as long as 8 characters.
@@ -171,7 +171,7 @@
 #define MAXPRESETS        200                             // Max number of presets in preferences
 #define MAXMQTTCONNECTS   5                               // Maximum number of MQTT reconnects before give-up
 #define METASIZ           1024                            // Size of metaline buffer
-#define BL_TIME           45000                           // Time-out [sec] for blanking TFT display (BL pin)
+#define BL_TIME           45                              // Time-out [sec] for blanking TFT display (BL pin) (this used if not in prefs)
 //
 // Subscription topics for MQTT.  The topic will be pefixed by "PREFIX/", where PREFIX is replaced
 // by the the mqttprefix in the preferences.  The next definition will yield the topic
@@ -271,6 +271,8 @@ struct ini_struct
   int8_t         eth_power_pin ;                      // GPIO Pin number for Ethernet controller POWER
   uint16_t       bat0 ;                               // ADC value for 0 percent battery charge
   uint16_t       bat100 ;                             // ADC value for 100 percent battery charge
+  uint16_t       disp_time ;                          // Turns off backlight or blanks display
+  bool           disp_blank ;                         // Enable blanking of the display
 } ;
 
 struct WifiInfo_t                                     // For list with WiFi info
@@ -368,6 +370,7 @@ uint16_t             adcvalraw ;                         // ADC value (raw)
 uint16_t             adcval ;                            // ADC value (battery voltage, averaged)
 uint32_t             clength ;                           // Content length found in http header
 uint16_t             bltimer = 0 ;                       // Backlight time-out counter
+bool                 disp_data = true ;                  // Sending data to display is OK?
 bool                 dsp_ok = false ;                    // Display okay or not
 int                  ir_intcount = 0 ;                   // For test IR interrupts
 bool                 spftrigger = false ;                // To trigger execution of special functions
@@ -983,10 +986,14 @@ void IRAM_ATTR timer100()
       }
     }
     time_req = true ;                             // Yes, show current time request
-    if ( ++bltimer == BL_TIME )                   // Time to blank the TFT screen?
+    if ( ++bltimer == ini_block.disp_time )       // Time to blank/turn of backlight?
     {
       bltimer = 0 ;                               // Yes, reset counter
       blset ( false ) ;                           // Disable TFT (backlight)
+      if ( ini_block.disp_blank == true )         // Is the Display blanking option on?
+      {
+        disp_data = false ;                       // Turn off sending data to display
+      }      
     }
   }
   // Handle rotary encoder. Inactivity counter will be reset by encoder interrupt
@@ -1257,20 +1264,18 @@ bool showstreamtitle ( const char *ml, bool full )
       *p1++ = '\\' ;                            // Found: replace 3 characters by "\r"
       *p1++ = 'r' ;                             // Found: replace 3 characters by "\r"
     #else
-//    *p1++ = '\n' ;                            // Found: replace 3 characters by newline
-      *p1++ = '\0' ;                            // Found: replace 3 characters by Terminator; string is now split into two
+      *p1++ = '\n' ;                            // Found: replace 3 characters by newline
     #endif
     if ( *p2 == ' ' )                           // Leading space in title?
     {
       p2++ ;
     }
-//  strcpy ( p1, p2 ) ;                         // Shift 2nd part of title 2 or 3 places
+    strcpy ( p1, p2 ) ;                         // Shift 2nd part of title 2 or 3 places
   }
   if ( strcmp ( oldstreamtitle,                 // Change in tiltlke?
                 streamtitle ) != 0 )
   {
-    tftset ( 1, streamtitle ) ;                 // Yes, set screen segment text middle part A
-    tftset ( 2, p2 ) ;                          // Set screen segment text middle part B (Title)
+    tftset ( 1, streamtitle ) ;                 // Yes, set screen segment text middle part
     return true ;                               // Return true if tiitle has changed
   }
   return false ;
@@ -1301,7 +1306,7 @@ void stop_mp3client ()
   while ( mp3client && mp3client->connected() )    // Client active and connected?
   {
     ESP_LOGI ( TAG, "Stopping client" ) ;          // Yes, stop connection to host
-    mp3client->close() ;                           // Causes memory leak!
+    //mp3client->close() ;                         // Causes memory leak!
     mp3client->abort() ;                           // This works better
     vTaskDelay ( 500 / portTICK_PERIOD_MS ) ;
   }
@@ -1331,9 +1336,7 @@ bool connecttohost()
   ESP_LOGI ( TAG, "Connect to host %s",
              presetinfo.host.c_str() ) ;
   tftset ( 0, NAME ) ;                               // Set screen segment text top line
-  tftset ( 1, "" ) ;                                 // Clear artist
-  tftset ( 2, "" ) ;                                 // Clear song 
-  tftset ( 3, "" ) ;                                 // Clear station
+  tftset ( 1, "" ) ;                                 // Clear song and artist
   displaytime ( "" ) ;                               // Clear time on TFT screen
   setdatamode ( INIT ) ;                             // Start default in INIT mode
   chunked = false ;                                  // Assume not chunked
@@ -1359,7 +1362,8 @@ bool connecttohost()
     port = hostwoext.substring ( inx + 1 ).toInt() ; // Get portnumber as integer
     hostwoext = hostwoext.substring ( 0, inx ) ;     // Host without portnumber
   }
-  ESP_LOGI ( TAG, "Connect to %s on port %d, extension %s", hostwoext.c_str(), port, extension.c_str() ) ;
+  //ESP_LOGI ( TAG, "Connect to %s on port %d, extension %s",
+  //           hostwoext.c_str(), port, extension.c_str() ) ;
   if ( mp3client->connect ( hostwoext.c_str(), port ) )
   {
     if ( nvssearch ( "basicauth" ) )                 // Does "basicauth" exists?
@@ -1556,9 +1560,6 @@ bool connectwifi()
     ESP_LOGI ( TAG, "WiFi Failed!  Trying to setup AP with"
                " name %s and password %s.",
                NAME, NAME ) ;
-    dsp_setTextColor ( RED ) ;                         // Startup info color
-    tftlog ( "Local AP Active!", true ) ;   
-    dsp_setTextColor ( WHITE ) ;                        // Startup info color
     WiFi.disconnect ( true ) ;                          // After restart the router could
     WiFi.softAPdisconnect ( true ) ;                    // still keep the old connection
     if ( ! WiFi.softAP ( NAME, NAME ) )                 // This ESP will be an AP
@@ -1569,20 +1570,16 @@ bool connectwifi()
   }
   else
   {
-    dsp_setTextColor ( GREEN ) ;                         // Startup info color
     tftlog ( "SSID = " ) ;                              // Show SSID on display
     tftlog ( WiFi.SSID().c_str(), true ) ;
-    dsp_setTextColor ( WHITE ) ;                         // Startup info color
     ESP_LOGI ( TAG, "SSID = %s",                        // Format string with SSID connected to
                WiFi.SSID().c_str() ) ;
     ipaddress = WiFi.localIP().toString() ;             // Form IP address
   }
   pIP = ipaddress.c_str() ;                             // As c-string
   ESP_LOGI ( TAG, "IP = %s", pIP ) ;
-  dsp_setTextColor ( GREEN ) ;                          // Startup info color
   tftlog ( "IP = " ) ;                                  // Show IP
   tftlog ( pIP, true ) ;
-  dsp_setTextColor ( WHITE ) ;                         // Startup info color
   #ifdef NEXTION
     vTaskDelay ( 2000 / portTICK_PERIOD_MS ) ;          // Show for some time
     dsp_println ( "\f" ) ;                              // Select new page if NEXTION 
@@ -1602,7 +1599,7 @@ void otastart()
   const char* p = "OTA update Started" ;
 
   ESP_LOGI ( TAG, "%s", p ) ;                      // Show event for debug
-  tftset ( 4, p ) ;                                // Set screen segment bottom part
+  tftset ( 2, p ) ;                                // Set screen segment bottom part
   mp3client->abort() ;                             // Stop client
   timerAlarmDisable ( timer ) ;                    // Disable the timer
   disableCore0WDT() ;                              // Disable watchdog core 0
@@ -1619,7 +1616,7 @@ void otastart()
 void otaerror ( ota_error_t error)
 {
   ESP_LOGE ( TAG, "OTA error %d", error ) ;
-  tftset ( 4, "OTA error!" ) ;                        // Set screen segment bottom part
+  tftset ( 2, "OTA error!" ) ;                        // Set screen segment bottom part
 }
 #endif                                                // ENABLEOTA
 
@@ -1749,7 +1746,8 @@ void reservepin ( int8_t rpinnr )
       {
         ESP_LOGE ( TAG, "Pin %d is already reserved!", rpinnr ) ;
       }
-      ESP_LOGE ( TAG, "GPIO%02d unavailabe for 'gpio_'-command", pin ) ;
+      //ESP_LOGE ( TAG, "GPIO%02d unavailabe for 'gpio_'-command",
+      //           pin ) ;
       progpin[i].reserved = true ;                          // Yes, pin is reserved now
       break ;                                               // No need to continue
     }
@@ -1761,7 +1759,8 @@ void reservepin ( int8_t rpinnr )
   {
     if ( pin == rpinnr )                                    // Entry found?
     {
-      ESP_LOGI ( TAG, "GPIO%02d unavailabe for touch command", pin ) ;
+      //ESP_LOGI ( TAG, "GPIO%02d unavailabe for touch command",
+      //           pin ) ;
       touchpin[i].reserved = true ;                         // Yes, pin is reserved now
       break ;                                               // No need to continue
     }
@@ -2509,6 +2508,8 @@ void setup()
   ini_block.clk_dst = 1 ;                                // DST is +1 hour
   ini_block.bat0 = 2600 ;                                // Battery ADC level for 0 percent
   ini_block.bat100 = 2950 ;                              // Battery ADC level for 100 percent
+  ini_block.disp_time = BL_TIME ;                        // Use defined BL_TIME as default
+  ini_block.disp_blank = false ;                         // Screen blanking off by default
   readIOprefs() ;                                        // Read pins used for SPI, TFT, VS1053, IR,
                                                          // Rotary encoder
   for ( i = 0 ; (pinnr = progpin[i].gpio) >= 0 ; i++ )   // Check programmable input pins
@@ -2527,10 +2528,8 @@ void setup()
     ESP_LOGI ( TAG, "GPIO%d is %s", pinnr, p ) ;
   }
   readprogbuttons() ;                                    // Program the free input pins
-  ESP_LOGI ( TAG, "Config prog buttons..." ) ;
   if ( ini_block.spi_sck_pin >= 0 )
   {
-    ESP_LOGI ( TAG, "Init VSPI bus..." ) ;
     SPI.begin ( ini_block.spi_sck_pin,                   // Init VSPI bus with default or modified pins
                 ini_block.spi_miso_pin,
                 ini_block.spi_mosi_pin ) ;
@@ -2550,7 +2549,7 @@ void setup()
     dsp_erase() ;                                        // Clear screen
     dsp_setRotation() ;                                  // Usse landscape format
     dsp_setTextSize ( DEFTXTSIZ ) ;                      // Small character font
-    dsp_setTextColor ( WHITE ) ;                         // Info in white
+    dsp_setTextColor ( GREY ) ;                          // Info in grey
     dsp_setCursor ( 0, 0 ) ;                             // Top of screen
     dsp_println ( "Starting......" ) ;
     strncpy ( tmpstr, VERSION, 16 ) ;                    // Limit version length
@@ -2571,10 +2570,8 @@ void setup()
     pinMode ( ini_block.tft_blx_pin, OUTPUT ) ;          // Yes, enable output
   }
   blset ( true ) ;                                       // Enable backlight (if configured)
+  disp_data = true ;                                     // Turn on sending data to display
   #ifndef ETHERNET
-    ESP_LOGI ( TAG, "Start WiFi..." ) ;
-    dsp_println ( "List of WiFi networks.." ) ;
-    dsp_update() ;                                         // To physical screen
     mk_lsan() ;                                          // Make a list of acceptable networks
                                                          // in preferences.
     WiFi.disconnect() ;                                  // After restart router could still
@@ -2584,13 +2581,10 @@ void setup()
     vTaskDelay ( 500 / portTICK_PERIOD_MS ) ;            // ??
     WiFi.persistent ( false ) ;                          // Do not save SSID and password
   #endif
-  ESP_LOGI ( TAG, "Init hardware..." ) ;
-  dsp_println ( "Init hardware.." ) ;
-  dsp_update() ;                                         // To physical screen
   readprefs ( false ) ;                                  // Read preferences
   radioqueue = xQueueCreate ( 10,                        // Create small queue for communication to radiofuncs
                              sizeof ( qdata_type ) ) ;
-  dataqueue = xQueueCreate  ( STREAM_QUEUE_SIZE,                      // Create queue for data communication
+  dataqueue = xQueueCreate  ( QSIZ,                      // Create queue for data communication
                              sizeof ( qdata_struct ) ) ;
   p = "Connect to network" ;                             // Show progress
   ESP_LOGI ( TAG, "%s", p ) ;
@@ -2603,9 +2597,7 @@ void setup()
   #endif
   tcpip_adapter_set_hostname ( TCPIP_ADAPTER_IF_STA,
                                NAME ) ;
-  p = "Starting web server" ;                            // Show progress
-  ESP_LOGI ( TAG, "%s", p ) ;
-  tftlog ( p, true ) ;                                   // On TFT too
+  ESP_LOGI ( TAG, "Start web server" ) ;
   cmdserver.on ( "/getprefs",  handle_getprefs ) ;       // Handle get preferences
   cmdserver.on ( "/saveprefs", handle_saveprefs ) ;      // Handle save preferences
   cmdserver.on ( "/getdefs",   handle_getdefs ) ;        // Handle get default config
@@ -2703,7 +2695,7 @@ void setup()
     gettime() ;                                           // Sync time
   }
   adc1_config_width ( ADC_WIDTH_12Bit ) ;
-  adc1_config_channel_atten ( ADC1_CHANNEL_0, ADC_ATTEN_DB_11 ) ;  // VP/GPIO36
+  adc1_config_channel_atten ( ADC1_CHANNEL_0, ADC_ATTEN_DB_12 ) ;  // VP/GPIO36
   xTaskCreatePinnedToCore (
     playtask,                                             // Task to play data in dataqueue.
     "Playtask",                                           // Name of task.
@@ -3036,6 +3028,34 @@ void handleVolPub()
   }
 }
 
+//**************************************************************************************************
+//                                    R E D R A W D I S P L A Y                                    *
+//**************************************************************************************************
+// Fully redraws entire display (0) or some part: top (1) middle (2) bottom (3)                    *
+//**************************************************************************************************
+void redrawdisplay ( int8_t i )
+{
+  disp_data = true ;
+  if (i == 0 || i == 1)
+  {
+      tftset ( 0, NAME ) ;                                    // Set screen segment text top line
+      displaytime ( "" ) ;                                    // Clear time on TFT screen
+      displaytime ( timetxt ) ;                               // Write to TFT screen
+      displaybattery ( 0, 100, 0 ) ;                          // Actually this draws an
+      displaybattery ( ini_block.bat0, ini_block.bat100,      // Show battery charge on display
+                       adcval ) ;
+  }
+  if (i == 0 || i == 2)
+  {
+      if ( showstreamtitle ( ( "StreamTitle=" + icystreamtitle ).c_str() ) ) { } // Stream Title
+  }
+  if (i == 0 || i == 3)
+  {
+      displayvolume ( 0 ) ;                                   // Forget previous value
+      displayvolume ( player_getVolume() ) ;                  // Show volume on display
+      tftset ( 2, icyname ) ;                                 // Restore screen segment bottom part
+  }
+}
 
 //**************************************************************************************************
 //                                           C H K _ E N C                                         *
@@ -3046,7 +3066,6 @@ void chk_enc()
 {
   static int16_t enc_preset ;                                 // Selected preset
   String         tmp, tmp2 ;                                  // Temporary strings
-
   if ( enc_menu_mode != VOLUME )                              // In default mode?
   {
     if ( enc_inactivity > 50 )                                // No, more than 5 seconds inactive
@@ -3054,13 +3073,22 @@ void chk_enc()
       enc_inactivity = 0 ;
       enc_menu_mode = VOLUME ;                                // Return to VOLUME mode
       ESP_LOGI ( TAG, "Encoder mode back to VOLUME" ) ;
+      redrawdisplay ( 3 ) ;
     }
   }
   if ( singleclick || doubleclick ||                          // Any activity?
        tripleclick || longclick ||
        ( rotationcount != 0 ) )
   {
-    blset ( true ) ;                                          // Yes, activate display if needed
+    blset ( true ) ;                                          // Yes, activate display backlight if needed
+    if ( !disp_data )                                         // Turn on sending data to display (and do full redraw)
+    {
+      if ( !muteflag && singleclick )                         // If it was muted, single-click allows unmute...
+      {
+        singleclick = false ;                                 // otherwise only wakes up the screen instead of muting
+      }
+      redrawdisplay ( 0 ) ;
+    }
   }
   else
   {
@@ -3075,7 +3103,7 @@ void chk_enc()
       {
         enc_menu_mode = TRACK ;                               // Swich to TRACK mode
         ESP_LOGI ( TAG, "Encoder mode set to TRACK" ) ;
-        tftset ( 4, "Turn to select track\n"                  // Show current option
+        tftset ( 3, "Turn to select track\n"                  // Show current option
                     "Press to confirm" ) ;
         getSDFileName ( +1 ) ;                                // Start with next file on SD
       }
@@ -3091,8 +3119,13 @@ void chk_enc()
     doubleclick = false ;
     enc_menu_mode = PRESET ;                                  // Swich to PRESET mode
     ESP_LOGI ( TAG, "Encoder mode set to PRESET" ) ;
-    tftset ( 4, "Turn to select station\n"                    // Show current option
+    #if defined(OLED1306) || defined(OLED1309) || defined(OLED1106) // Fix fit for small displays
+      tftset ( 3, "Turn & choose station"                     // Show current option
+                "Press to confirm" ) ;
+    #else
+      tftset ( 3, "Turn to select station\n"                  // Show current option
                 "Press to confirm" ) ;
+    #endif
     enc_preset = presetinfo.preset ;                          // Start with current preset
     updateNr ( &enc_preset, presetinfo.highest_preset,        // plus 1
                1, true ) ;
@@ -3106,7 +3139,7 @@ void chk_enc()
       case VOLUME :
         if ( muteflag )
         {
-          tftset ( 3, icyname ) ;                             // Restore screen segment bottom part
+          tftset ( 2, icyname ) ;                             // Restore screen segment bottom part
         }
         else
         {
@@ -3119,13 +3152,13 @@ void chk_enc()
         nextPreset ( enc_preset ) ;                           // Make a definite choice
         enc_menu_mode = VOLUME ;                              // Back to default mode
         myQueueSend ( radioqueue, &startcmd ) ;               // Signal radiofuncs()
-        tftset ( 3, icyname ) ;                               // Restore screen segment bottom part
+        tftset ( 2, icyname ) ;                               // Restore screen segment bottom part
         break ;
     #ifdef SDCARD
       case TRACK :
         myQueueSend ( sdqueue, &startcmd ) ;                  // Signal SDfuncs()
         enc_menu_mode = VOLUME ;                              // Back to default mode
-        tftset ( 3, icyname ) ;                               // Restore screen segment bottom part
+        tftset ( 2, icyname ) ;                               // Restore screen segment bottom part
         break ;
     #endif
       default :
@@ -3229,7 +3262,7 @@ void spfuncs()
   if ( spftrigger )                                             // Will be set every 100 msec
   {
     spftrigger = false ;                                        // Reset trigger
-    if ( dsp_ok )                                               // Posible to update TFT?
+    if ( dsp_ok && disp_data )                                  // Posible to update Display?
     {
       for ( uint16_t i = 0 ; i < TFTSECS ; i++ )                // Yes, handle all sections
       {
@@ -3243,6 +3276,11 @@ void spfuncs()
       }
       dsp_update ( enc_menu_mode == VOLUME ) ;                  // Be sure to paint physical screen
     }
+    if ( dsp_ok && !disp_data )                                 // Clear the screen if not being used...
+    {
+      dsp_erase() ;                                             // Clear screen
+      dsp_update ( enc_menu_mode == VOLUME ) ;                  // Show on physical screen if needed
+    }
     if ( muteflag )                                             // Mute or not?
     {
       player_setVolume ( 0 ) ;                                  // Mute
@@ -3263,10 +3301,14 @@ void spfuncs()
         gettime() ;                                             // Yes, get the current time
       }
       time_req = false ;                                        // Yes, clear request
-      displaytime ( timetxt ) ;                                 // Write to TFT screen
-      displayvolume ( player_getVolume() ) ;                    // Show volume on display
-      displaybattery ( ini_block.bat0, ini_block.bat100,        // Show battery charge on display
+
+      if ( disp_data )                                          // Sending data to display is OK?
+      {
+        displaytime ( timetxt ) ;                               // Write to TFT screen
+        displayvolume ( player_getVolume() ) ;                  // Show volume on display
+        displaybattery ( ini_block.bat0, ini_block.bat100,      // Show battery charge on display
                        adcval ) ;
+      }
     }
     if ( mqtt_on )
     {
@@ -3285,7 +3327,6 @@ void spfuncs()
   }
 }
 
-
 //**************************************************************************************************
 //                                     R A D I O F U N C S                                         *
 //**************************************************************************************************
@@ -3614,7 +3655,7 @@ void handlebyte_ch ( uint8_t b )
           {
             icyname = presetinfo.hsym ;                 // Yes, use symbolic name
           }
-          tftset ( 3, icyname ) ;                       // Set screen segment bottom part
+          tftset ( 2, icyname ) ;                       // Set screen segment bottom part
           mqttpub.trigger ( MQTT_ICYNAME ) ;            // Request publishing to MQTT
         }
         else if ( lcml.startsWith ( "transfer-encoding:" ) )
@@ -3973,6 +4014,8 @@ const char* analyzeCmd ( const char* str )
 //   reset                                  // Restart the ESP32                                   *
 //   bat0       = 2318                      // ADC value for an empty battery                      *
 //   bat100     = 2916                      // ADC value for a fully charged battery               *
+//   disp_time = 45                         // Turns off backlight / blanks display in x seconds   *
+//   disp_blank = false                     // Allows blanking of display *)                       *
 //  Commands marked with "*)" are sensible during initialization only                              *
 //**************************************************************************************************
 const char* analyzeCmd ( const char* par, const char* val )
@@ -3985,6 +4028,7 @@ const char* analyzeCmd ( const char* par, const char* val )
   bool               relative = false ;               // Relative argument (+ or -)
 
   blset ( true ) ;                                    // Enable backlight of TFT
+  disp_data = true ;                                  // Turn on sending data to display
   strcpy ( reply, "Command accepted" ) ;              // Default reply
   argument = String ( par ) ;                         // Get the argument
   chomp ( argument ) ;                                // Remove comment and useless spaces
@@ -4086,19 +4130,6 @@ const char* analyzeCmd ( const char* par, const char* val )
               value.c_str() ) ;
     utf8ascii_ip ( reply ) ;                          // Remove possible strange characters
   }
-  else if ( argument == "stop" )                       // Stop request?
-  {
-    myQueueSend ( sdqueue, &stopcmd ) ;                // Stop player SD card
-    myQueueSend ( radioqueue, &stopcmd ) ;             // Stop player web radio
-    //also clear display
-    tftset ( 1, "" ) ;                                 // Clear artist
-    tftset ( 2, "  STOP" ) ;                           // Clear song 
-    tftset ( 3, "" ) ;                                 // Clear station
-  }
-  else if ( argument == "start" )                     // Start request?
-  {
-    myQueueSend ( radioqueue, &startcmd  ) ;          // Restart radio player
-  }
   else if ( argument == "sleep" )                     // Sleep request?
   {
     sleepreq = true ;                                 // Yes, set request flag
@@ -4121,8 +4152,8 @@ const char* analyzeCmd ( const char* par, const char* val )
   }
   else if ( argument == "test" )                      // Test command
   {
-    sprintf ( reply, "Free memory %d/%d, "           // Get some info to display
-              "queue %d, bitrate %d kbps\n",
+    sprintf ( reply, "Free memory is %d/%d, "         // Get some info to display
+              "chunks in queue %d, bitrate %d kbps\n",
               heapspace,
               ESP.getFreeHeap(),
               uxQueueMessagesWaiting ( dataqueue ),
@@ -4210,6 +4241,24 @@ const char* analyzeCmd ( const char* par, const char* val )
       ini_block.bat0 = ivalue ;                       // Yes, set it
     }
   }
+  else if ( argument.startsWith ( "disp_" ) )         // Disp_ value?
+  {
+    if ( argument.indexOf ( "time" ) > 0 )            // Time to turn off backlight or blank?
+    {
+      ini_block.disp_time = ivalue ;                  // Yes, set time
+      if ( ini_block.disp_time <= 5 )                 // 5 seconds or less is silly
+      {
+        ini_block.disp_time = BL_TIME ;
+      }
+    }
+    else if ( argument.indexOf ( "blank" ) )          // Blank the screen?
+    {
+      if ( value.startsWith ("true" ) )               // True? (default False)
+      {
+        ini_block.disp_blank = true ;
+      }
+    }
+  }
   else
   {
     sprintf ( reply, "%s called with illegal parameter: %s",
@@ -4218,6 +4267,41 @@ const char* analyzeCmd ( const char* par, const char* val )
   return reply ;                                      // Return reply to the caller
 }
 
+#if defined(OLED1306) || defined(OLED1309) || defined(OLED1106) // Only needed by certain displays
+//**************************************************************************************************
+//                                 N E W L I N E S T O S P A C E S                                 *
+//**************************************************************************************************
+// Used by character-limiting routine in displayinfo() - transforms newlines to spaces.            *
+//**************************************************************************************************
+String newlinestospaces(const String& str, uint16_t line_len, uint16_t max_lines) {
+    uint16_t spacedi = 0;                                  // Calculating how many characters are in resulting string 
+    uint16_t spaces = 0;                                   // How many spaces to add when encountering a newline
+    String   spaced = "";                                  // Resulting string with spaces instead of newlines
+
+    if ( str.length() == 0 )
+    {
+        return str;                                        // Return the original string for empty strings (otherwise weird)
+    }
+    for ( size_t i = 0; i < str.length(); ++i ) {
+        if (str[i] == '\n')
+        {                                                  // Calculate how many spaces needed to reach the end of line
+            spaces = ( line_len - ( spaced.length() % line_len ) );
+            for ( size_t sp = 0; sp < spaces; ++sp )
+            {
+                spaced += ' ';                             // Adding spaces to add to reach the next line_len boundary
+            }
+        } else {
+            spaced += str[i];                              // Copy over the current character
+        }
+        spacedi = spaced.length();                         // Update length
+        if ( spacedi >= ( line_len * max_lines ) ) {       // Stop if we've reached the maximum allowed number of characters
+            break;
+        }
+    }
+
+    return spaced;  // Return the newly formatted string by value
+}
+#endif
 
 //**************************************************************************************************
 //* Function that are called from spfunc().                                                        *
@@ -4227,7 +4311,7 @@ const char* analyzeCmd ( const char* par, const char* val )
 //**************************************************************************************************
 //                                      D I S P L A Y I N F O                                      *
 //**************************************************************************************************
-// Show a string on the LCD at a specified y-position (0..4) in a specified color.                 *
+// Show a string on the LCD at a specified y-position (0..2) in a specified color.                 *
 // The parameter is the index in tftdata[].                                                        *
 //**************************************************************************************************
 void displayinfo ( uint16_t inx )
@@ -4245,20 +4329,30 @@ void displayinfo ( uint16_t inx )
     dsp_fillRect ( 0, p->y, width, p->height, BLACK ) ;    // Clear the space for new info
     if ( ( dsp_getheight() > 64 ) && ( p->y > 1 ) )        // Need and space for divider?
     {
-      dsp_fillRect ( 0, p->y - 4, width, 4, BLACK ) ;      // Clear the space for divider
-      dsp_fillRect ( 0, p->y - 4, width, 1, BLUE ) ;      // Yes, show divider above text
+      dsp_fillRect ( 0, p->y - 4, width, 1, GREEN ) ;      // Yes, show divider above text
     }
-    len = p->str.length() ;                                // Required length of buffer
-    if ( len > p->str_max_len )
+
+    #if defined(OLED1306) || defined(OLED1309) || defined(OLED1106) // Need to limit characters on certain small displays
+      if ( inx == 3 || inx == 2 )                          // 3 streamtitle, menu, mute, messages & 2 icyname = 21 characters x 2 lines
+      {
+        p->str = newlinestospaces( p->str, 21, 2 );
+      }
+      else if (inx == 1 )                                  // 1 song and artist = 21 chars x 4 lines
+      {
+        p->str = newlinestospaces( p->str, 21, 4 );
+      }
+      else if (inx == 0 )                                  // 0 NAME = 21 chars - (8 for time + 1 space))
       {
-      len = p->str_max_len;                                // limit number of chars to be displayed in a section to not overflow into another sections
+        p->str = newlinestospaces( p->str, 12, 1 );
       }
+    #endif
+
+    len = p->str.length() ;                                // Required length of buffer
     if ( len++ )                                           // Check string length, set buffer length
     {
       char buf [ len ] ;                                   // Need some buffer space
       p->str.toCharArray ( buf, len ) ;                    // Make a local copy of the string
       utf8ascii_ip ( buf ) ;                               // Convert possible UTF8
-      dsp_setTextSize ( p->size ) ;                        // Selected text size
       dsp_setTextColor ( p->color ) ;                      // Set the requested color
       dsp_setCursor ( 0, p->y ) ;                          // Prepare to show the info
       dsp_println ( buf ) ;                                // Show the string

From 22b5e9c3f7494778ecfaf226c05e1c0ccdf93401 Mon Sep 17 00:00:00 2001
From: Aljaz Ogrin <aljaz@ogrin.me>
Date: Thu, 26 Dec 2024 12:21:07 +0100
Subject: [PATCH 5/7] added docs

---
 doc/PINOUT_WiFi_Kit_32_Heltec.txt | 15 +++++++++++++++
 platformio.ini                    | 13 +++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 doc/PINOUT_WiFi_Kit_32_Heltec.txt

diff --git a/doc/PINOUT_WiFi_Kit_32_Heltec.txt b/doc/PINOUT_WiFi_Kit_32_Heltec.txt
new file mode 100644
index 0000000..802a6cb
--- /dev/null
+++ b/doc/PINOUT_WiFi_Kit_32_Heltec.txt
@@ -0,0 +1,15 @@
+
+OLED
+    ssd1306_128x64_i2c 
+    SDA  GPIO4
+    SCL  GPIO15
+    RST  GPIO16 - not used in FW
+
+LED
+    positive GPIO25
+
+
+
+
+DAC output 1 : GPIO25
+DAC output 2 : GPIO26
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index ddc4776..b9da0ff 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,13 +1,18 @@
-[env:esp32]
+[platformio]
+; Set a path to a cache folder
+build_dir = C:\PIO_BUILD
+libdeps_dir = C:\PIO_LIBDEPS
+
+[env:radio_oled]
 platform = espressif32
 ;platform = espressif32@3.1.0
 ;board = esp-wrover-kit
 board = esp32doit-devkit-v1
 framework = arduino
 board_build.partitions = radiopart.csv
-;upload_port = COM8
+; upload_port = COM8
 ;upload_protocol = espota       ; OTA must be enabled in the running version, see config.h
-;upload_port = 192.168.2.18     ; Adjust to the IP of the radio
+;upload_port = 10.38.11.102     ; Adjust to the IP of the radio
 ;monitor_port = COM8
 monitor_speed = 115200
 monitor_dtr = 0
@@ -26,7 +31,7 @@ lib_deps =
   adafruit/Adafruit BusIO
   adafruit/Adafruit GFX Library
 ;  adafruit/Adafruit ILI9341
-  adafruit/Adafruit ST7735 and ST7789 Library
+;  adafruit/Adafruit ST7735 and ST7789 Library
   me-no-dev/AsyncTCP
   me-no-dev/ESP Async WebServer
 ;  yveaux/AC101@^0.0.1

From 4d56b32b34128f98d97beb1728e7bd6986a06bc9 Mon Sep 17 00:00:00 2001
From: Aljaz Ogrin <aljaz@ogrin.me>
Date: Thu, 26 Dec 2024 16:02:32 +0100
Subject: [PATCH 6/7] HA-MQTT instructions

---
 doc/config HA - MQTT.txt | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 doc/config HA - MQTT.txt

diff --git a/doc/config HA - MQTT.txt b/doc/config HA - MQTT.txt
new file mode 100644
index 0000000..43a8da0
--- /dev/null
+++ b/doc/config HA - MQTT.txt	
@@ -0,0 +1,55 @@
+https://github.com/Edzelf/ESP32Radio-V2/discussions/165
+
+Set up MQTT broker (if not already), like Mosquitto.
+Link broker to HA - set up generic MQTT integration.
+Configure Radio's MQTT config with IP / address, port, username and password of the Broker.
+Set mqttprefix to a useful unique ID, like "RadioLivingRoom" or similar.
+Restart radio.
+Use MQTT analyzer like MQTT-Explorer, connect to your Broker and look for the messages from the radio.
+Open the main HA config file configuration.yaml in your favorite text editor.
+Add following code at the end, similar to this and modify to suit your parameters and config.
+Open HA developer Tools, check config, restart HA. On further modifications you can use Reload manually configured MQTT command.
+Open Entities of the MQTT integration and set Location for each one as per your needs.
+
+mqtt:
+# MQTT Radio
+# https://www.home-assistant.io/integrations/number.mqtt/
+  - number:
+      name: "Radio Xmas Volume"
+      unique_id: "RadioXmasVolume"
+      state_topic : "radioxmas/volume"
+      command_topic: "radioxmas/command"
+      command_template: "volume={{ value }}"
+      min: 0
+      max: 100
+      step: 5
+      icon: mdi:volume-high
+      mode: slider
+
+  - number:
+      name: "Radio Xmas Preset"
+      unique_id: "RadioXmasPreset"
+      state_topic : "radioxmas/preset"
+      command_topic: "radioxmas/command"
+      command_template: "preset={{ value }}"
+      min: 0
+      max: 4
+      step: 1
+      icon: mdi:knob
+      mode: box
+
+# https://www.home-assistant.io/integrations/text.mqtt/
+  - text:
+      name: "Radio Xmas Station"
+      unique_id: "RadioXmasStationName"
+      icon: mdi:antenna
+      state_topic: "radioxmas/icy/name"
+      command_topic: "radioxmas/none"
+
+  - text:
+      name: "Radio Xmas Title"
+      unique_id: "RadioXmasSongTitle"
+      icon: mdi:script-text-outline
+      state_topic: "radioxmas/icy/streamtitle"
+      command_topic: "radioxmas/none"
+

From f13cfae9ca103e4ce60ab3ce9d102512362131f6 Mon Sep 17 00:00:00 2001
From: Aljaz Ogrin <aljaz@ogrin.me>
Date: Thu, 2 Jan 2025 12:46:47 +0100
Subject: [PATCH 7/7] added MQTT LWT

---
 doc/config HA - MQTT.txt | 49 +++++++++++++++++++++++++++++++++++++++-
 platformio.ini           |  4 ++--
 src/main.cpp             | 25 ++++++++++++++++++--
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/doc/config HA - MQTT.txt b/doc/config HA - MQTT.txt
index 43a8da0..9be2f72 100644
--- a/doc/config HA - MQTT.txt	
+++ b/doc/config HA - MQTT.txt	
@@ -11,8 +11,9 @@ Add following code at the end, similar to this and modify to suit your parameter
 Open HA developer Tools, check config, restart HA. On further modifications you can use Reload manually configured MQTT command.
 Open Entities of the MQTT integration and set Location for each one as per your needs.
 
+
 mqtt:
-# MQTT Radio
+# MQTT Radio zunaj
 # https://www.home-assistant.io/integrations/number.mqtt/
   - number:
       name: "Radio Xmas Volume"
@@ -25,6 +26,7 @@ mqtt:
       step: 5
       icon: mdi:volume-high
       mode: slider
+      availability_topic: "radioxmas/connection"
 
   - number:
       name: "Radio Xmas Preset"
@@ -37,6 +39,7 @@ mqtt:
       step: 1
       icon: mdi:knob
       mode: box
+      availability_topic: "radioxmas/connection"
 
 # https://www.home-assistant.io/integrations/text.mqtt/
   - text:
@@ -45,6 +48,7 @@ mqtt:
       icon: mdi:antenna
       state_topic: "radioxmas/icy/name"
       command_topic: "radioxmas/none"
+      availability_topic: "radioxmas/connection"
 
   - text:
       name: "Radio Xmas Title"
@@ -52,4 +56,47 @@ mqtt:
       icon: mdi:script-text-outline
       state_topic: "radioxmas/icy/streamtitle"
       command_topic: "radioxmas/none"
+      availability_topic: "radioxmas/connection"
+
+############################################################
+# MQTT Radio dnevna
+# https://www.home-assistant.io/integrations/number.mqtt/
+  - number:
+      name: "Radio Volume"
+      unique_id: "RadioDnevnaVolume"
+      state_topic : "radioDnevna/volume"
+      command_topic: "radioDnevna/command"
+      command_template: "volume={{ value }}"
+      min: 0
+      max: 100
+      step: 5
+      icon: mdi:volume-high
+      mode: slider
+
+  - number:
+      name: "Radio Preset"
+      unique_id: "RadioDnevnaPreset"
+      state_topic : "radioDnevna/preset"
+      command_topic: "radioDnevna/command"
+      command_template: "preset={{ value }}"
+      min: 0
+      max: 20
+      step: 1
+      icon: mdi:knob
+      mode: box
+
+# https://www.home-assistant.io/integrations/text.mqtt/
+  - text:
+      name: "Radio Station"
+      unique_id: "RadioDnevnaStationName"
+      icon: mdi:antenna
+      state_topic: "radioDnevna/icy/name"
+      command_topic: "radioDnevna/none"
+
+  - text:
+      name: "Radio Title"
+      unique_id: "RadioDnevnaSongTitle"
+      icon: mdi:script-text-outline
+      state_topic: "radioDnevna/icy/streamtitle"
+      command_topic: "radioDnevna/none"
 
diff --git a/platformio.ini b/platformio.ini
index b9da0ff..bb715a1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,8 +11,8 @@ board = esp32doit-devkit-v1
 framework = arduino
 board_build.partitions = radiopart.csv
 ; upload_port = COM8
-;upload_protocol = espota       ; OTA must be enabled in the running version, see config.h
-;upload_port = 10.38.11.102     ; Adjust to the IP of the radio
+upload_protocol = espota       ; OTA must be enabled in the running version, see config.h
+upload_port = 10.38.11.202     ; Adjust to the IP of the radio
 ;monitor_port = COM8
 monitor_speed = 115200
 monitor_dtr = 0
diff --git a/src/main.cpp b/src/main.cpp
index 3f99132..a6d3283 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -177,6 +177,7 @@
 // by the the mqttprefix in the preferences.  The next definition will yield the topic
 // "ESP32Radio/command" if mqttprefix is "ESP32Radio".
 #define MQTT_SUBTOPIC     "command"                      // Command to receive from MQTT
+#define MQTT_CONN_SUBTOPIC "connection"                  // Subtopic where "online", "offline" and Last Will messages are published
 //
 #define heapspace heap_caps_get_largest_free_block ( MALLOC_CAP_8BIT )
 
@@ -345,6 +346,8 @@ String               icystreamtitle ;                    // Streamtitle from met
 String               icyname ;                           // Icecast station name
 String               audio_ct ;                          // Content-type, like "audio/aacp"
 String               ipaddress ;                         // Own IP-address
+String               mqttalivemsg;                       // MQTT mesasage for online status or LWT
+String               mqttlwtmsg;                         // MQTT mesasage for LWT
 int                  bitrate ;                           // Bitrate in kb/sec
 int                  mbitrate ;                          // Measured bitrate
 int                  metaint = 0 ;                       // Number of databytes between metadata
@@ -489,7 +492,7 @@ touchpin_struct   touchpin[] =                           // Touch pins and progr
 //**************************************************************************************************
 // ID's for the items to publish to MQTT.  Is index in amqttpub[]
 enum { MQTT_IP,     MQTT_ICYNAME, MQTT_STREAMTITLE, MQTT_NOWPLAYING,
-       MQTT_PRESET, MQTT_VOLUME, MQTT_PLAYING, MQTT_PLAYLISTPOS
+       MQTT_PRESET, MQTT_VOLUME, MQTT_PLAYING, MQTT_PLAYLISTPOS, MQTT_ALIVE
      } ;
 enum { MQSTRING, MQINT8, MQINT16 } ;                     // Type of variable to publish
 
@@ -505,7 +508,7 @@ class mqttpubc                                           // For MQTT publishing
     // Publication topics for MQTT.  The topic will be pefixed by "PREFIX/", where PREFIX is replaced
     // by the the mqttprefix in the preferences.
   protected:
-    mqttpub_struct amqttpub[9] =                         // Definitions of various MQTT topic to publish
+    mqttpub_struct amqttpub[10] =                         // Definitions of various MQTT topic to publish
     { // Index is equal to enum above
       { "ip",              MQSTRING, &ipaddress,             false }, // Definition for MQTT_IP
       { "icy/name",        MQSTRING, &icyname,               false }, // Definition for MQTT_ICYNAME
@@ -515,6 +518,7 @@ class mqttpubc                                           // For MQTT publishing
       { "volume" ,         MQINT8,   &ini_block.reqvol,      false }, // Definition for MQTT_VOLUME
       { "playing",         MQINT8,   &playingstat,           false }, // Definition for MQTT_PLAYING
       { "playlist/pos",    MQINT16,  &presetinfo.playlistnr, false }, // Definition for MQTT_PLAYLISTPOS
+      { MQTT_CONN_SUBTOPIC,MQSTRING, &mqttalivemsg,          false }, // Definition for MQTT_ALIVE
       { NULL,              0,        NULL,                   false }  // End of definitions
     } ;
   public:
@@ -1951,10 +1955,25 @@ bool mqttreconnect()
              ini_block.mqttbroker.c_str() ) ;
   sprintf ( clientid, "%s-%04d",                          // Generate client ID
             NAME, (int) random ( 10000 ) % 10000 ) ;
+/*
   res = mqttclient.connect ( clientid,                    // Connect to broker
                              ini_block.mqttuser.c_str(),
                              ini_block.mqttpasswd.c_str()
                            ) ;
+*/
+//  *id,   *user,   *pass,  willTopic, willQos, willRetain,  willMessage)
+  mqttlwtmsg = "offline"; 
+  sprintf ( subtopic, "%s/%s",
+            ini_block.mqttprefix.c_str(),
+            MQTT_CONN_SUBTOPIC ) ;
+
+  res = mqttclient.connect ( clientid,                    // Connect to broker and set LWT message at the broker
+                             ini_block.mqttuser.c_str(),
+                             ini_block.mqttpasswd.c_str(),
+                             subtopic,
+                             0,
+                             false,
+                             mqttlwtmsg.c_str() ) ;
   if ( res )
   {
     sprintf ( subtopic, "%s/%s",                          // Add prefix to subtopic
@@ -1966,6 +1985,8 @@ bool mqttreconnect()
       ESP_LOGE ( TAG, "MQTT subscribe failed!" ) ;        // Failure
     }
     mqttpub.trigger ( MQTT_IP ) ;                         // Publish own IP
+    mqttalivemsg = "online";
+    mqttpub.trigger ( MQTT_ALIVE ) ;                      // Publish Alive / Online message
   }
   else
   {