Add files via upload

GabeHC · Jun 28, 2017 · f5479c9 · f5479c9
1 parent 0147364
commit f5479c9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 22 deletions.
diff --git a/about_html.h b/about_html.h
@@ -1,5 +1,6 @@
 // about.html file in raw data format for PROGMEM
 //
+#define about_html_version 170626
 const char about_html[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html>
@@ -21,7 +22,7 @@ const char about_html[] PROGMEM = R"=====(
   <center>
    <h1>** ESP32 Radio **</h1>
   </center>
-	<p>Esp Radio -- Webradio receiver for ESP32, 1.8" color display and VS1053 MP3 module.<br>
+	<p>ESP32 Radio -- Webradio receiver for ESP32, 1.8" color display and VS1053 MP3 module.<br>
 	This project is documented at <a target="blank" href="https://github.com/Edzelf/ESP32-radio">Github</a>.</p>
 	<p>Author: Ed Smallenburg<br>
 	Webinterface design: <a target="blank" href="http://www.sanderjochems.nl/">Sander Jochems</a><br>

diff --git a/config_html.h b/config_html.h
@@ -1,18 +1,21 @@
 // config.html file in raw data format for PROGMEM
 //
+#define config_html_version 170626
 const char config_html[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html>
  <head>
   <title>Configuration ESP32-radio</title>
   <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  <link rel="stylesheet" type="text/css" href="radio.css">
   <link rel="Shortcut Icon" type="image/ico" href="favicon.ico">
  </head>
  <body>
   <ul>
-   <li><a class="pull-left" href="#">ESP Radio</a></li>
+   <li><a class="pull-left" href="#">ESP32 Radio</a></li>
    <li><a class="pull-left" href="/index.html">Control</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>
   </ul>
   <br><br><br>
@@ -115,13 +118,6 @@ const char config_html[] PROGMEM = R"=====(
       // Now get the configuration parameters from preferences
       ldef ( "getprefs" ) ;
     </script>
-    <script type="text/javascript">
-      var stylesheet = document.createElement('link') ;
-      stylesheet.href = 'radio.css' ;
-      stylesheet.rel = 'stylesheet' ;
-      stylesheet.type = 'text/css' ;
-      document.getElementsByTagName('head')[0].appendChild(stylesheet) ;
-    </script>
   </body>
 </html>
 )=====" ;
diff --git a/defaultprefs.h b/defaultprefs.h
@@ -40,4 +40,8 @@ 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
+#
+# Some IR codes
+ir_40BF = upvolume = 2
+ir_C03F = downvolume = 2
 )=====" ;
diff --git a/index_html.h b/index_html.h
@@ -1,18 +1,21 @@
 // index.html file in raw data format for PROGMEM
 //
+#define index_html_version 170626
 const char index_html[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html>
  <head>
   <title>ESP32-radio</title>
   <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  <link rel="stylesheet" type="text/css" href="radio.css">
   <link rel="Shortcut Icon" type="image/ico" href="favicon.ico">
  </head>
  <body>
   <ul>
    <li><a class="pull-left" href="#">ESP32 Radio</a></li>
    <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="/mp3play.html">MP3 player</a></li>
    <li><a class="pull-left" href="/about.html">About</a></li>
   </ul>
   <br><br><br>
@@ -22,6 +25,7 @@ const char index_html[] PROGMEM = R"=====(
    <button class="button" onclick="httpGet('uppreset=1')">NEXT</button>
    <button class="button" onclick="httpGet('downvolume=2')">VOL-</button>
    <button class="button" onclick="httpGet('upvolume=2')">VOL+</button>
+   <button class="button" onclick="httpGet('mute')">MUTE</button>
    <button class="button" onclick="httpGet('stop')">STOP</button>
    <button class="button" onclick="httpGet('resume')">RESUME</button>
    <button class="button" onclick="httpGet('status')">STATUS</button>
@@ -134,7 +138,7 @@ const char index_html[] PROGMEM = R"=====(
    </table>
    <br>
    <input type="text" size="60" id="station" placeholder="Enter a station/file here....">
-   <button class="button button-play" onclick="setstat()">PLAY</button>
+   <button class="button" onclick="setstat()">PLAY</button>
    <br>
    <br>
    <input type="text" width="600px" size="72" id="resultstr" placeholder="Waiting for a command...."><br>
@@ -215,13 +219,6 @@ const char index_html[] PROGMEM = R"=====(
    xhr.open ( "GET", theUrl, false ) ;
    xhr.send() ;
   </script>
-  <script type="text/javascript">
-    var stylesheet = document.createElement('link') ;
-    stylesheet.href = 'radio.css' ;
-    stylesheet.rel = 'stylesheet' ;
-    stylesheet.type = 'text/css' ;
-    document.getElementsByTagName('head')[0].appendChild(stylesheet) ;
-  </script>
  </body>
 </html>
 <noscript>

diff --git a/mp3play_html.h b/mp3play_html.h
@@ -1,5 +1,6 @@
 // index.html file in raw data format for PROGMEM
 //
+#define mp3play_html_version 170626
 const char mp3play_html[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html>

diff --git a/radio_css.h b/radio_css.h
@@ -46,7 +46,7 @@ li a:hover, a.active {
 
 .button {
    width: 80px;
-   height: 40px;
+   height: 30px;
    background-color: #128F76;
    border: none;
    color: white;
@@ -61,10 +61,6 @@ li a:hover, a.active {
 
 .buttonr {background-color: #D62C1A;}
 
-.button-play {
-   height: 30px;
-}
-
 .select {
    width: 160px;
    height: 32px;