1.5 beta. In test.

karawin · Nov 17, 2018 · f8cca27 · f8cca27
1 parent afe2deb
commit f8cca27
Show file tree

Hide file tree

Showing 10 changed files with 471 additions and 422 deletions.
diff --git a/HardwareConfig.txt b/HardwareConfig.txt
@@ -1,4 +1,4 @@
-Version 1.5 allows you to configure gpio's and two custom IR keys per action.
+Version 1.5 and up allows you to configure gpio's and two custom IR keys per action.
 This allows you to take advantage of the standard software even if your port configuration and/or your remote control are not the same.
 The configuration must be specified in a csv file. A template is given by the pattern.csv file
 The default configuration of the current software is in the standard_adb.csv file.
@@ -53,6 +53,55 @@ Do this for all P_ lines.
 Never change the string "P_XXXX, data,u8,"
 A value base 10 is mandatory for each P_.
 
+SPI Bus:
+P_MISO			Master Input, Slave Output
+P_MOSI			Master Output, Slave Input   Named Data or SDA or D1 for oled
+P_CLK			Master clock  Named SCL or SCK or D0 for oled
+
+VS1053B:
+P_XCS			XCS
+P_RST			RST
+P_XDCS			XDCS
+P_DREQ			P_DREQ
+
+ENCODERS 0 & 1:
+P_ENC0_A		pin A clk
+P_ENC0_B		pin B Data
+P_ENC0_BTN		pin SW
+P_ENC1_A		pin A clk
+P_ENC1_B		pin B Data
+P_ENC1_BTN		pin SW
+
+BUTTONS PANEL 0 & 1 of three buttons (switch to gnd):
+P_BTN0_A		click:start/stop, double click:toggle, help: station
+P_BTN0_B		click: +
+P_BTN0_C		click: -
+P_BTN1_A		start/stop, toggle, volume
+P_BTN1_B		+
+P_BTN1_C		-
+
+Bus I2C (Oled & Lcd):
+P_I2C_SCL		SCL or SCK
+P_I2C_SDA		SDA
+P_I2C_RST		RST if any
+
+LCD on SPI bus:
+P_LCD_CS		CS
+P_LCD_A0		A0 or D/C or DC
+P_LCD_RST		RST or RES
+
+Infrared remote:
+P_IR_SIGNAL		ir Y Signal
+
+I2S bus:
+P_I2S_LRCK		LRCK
+P_I2S_BCLK		BCLK
+P_I2S_DATA		DATA
+
+ADC keyboard:
+P_ADC			gpio32 to 39  or 255 if not used.
+
+
 #Special cases:
 ---------------
 1- SPI bus

diff --git a/main/gpio.c b/main/gpio.c
@@ -17,7 +17,7 @@
 void gpio_output_conf(gpio_num_t gpio)
 {
 	gpio_config_t gpio_conf;
-	gpio_conf.pin_bit_mask =(BIT(gpio)) ;
+	gpio_conf.pin_bit_mask = ((uint64_t)(((uint64_t)1)<<gpio)) ;
 	gpio_conf.mode = GPIO_MODE_OUTPUT;
 	gpio_conf.pull_up_en =  GPIO_PULLUP_DISABLE;
 	gpio_conf.pull_down_en =  GPIO_PULLDOWN_DISABLE;

diff --git a/main/include/interface.h b/main/include/interface.h
@@ -16,8 +16,8 @@
 #define MAXDATAT	 256
 
 
-#define RELEASE "1.4"
-#define REVISION "1"
+#define RELEASE "1.5"
+#define REVISION "0"
 
 uint32_t checkUart(uint32_t speed);
 extern unsigned short adcdiv;	

diff --git a/webpage/favicon b/webpage/favicon
@@ -1,5 +1,5 @@
 const char favicon_png[] = {
-  0x1f, 0x8b, 0x08, 0x08, 0x57, 0xff, 0xdd, 0x5b, 0x00, 0x03, 0x66, 0x61,
+  0x1f, 0x8b, 0x08, 0x08, 0xc2, 0x5b, 0xe3, 0x5b, 0x00, 0x03, 0x66, 0x61,
   0x76, 0x69, 0x63, 0x6f, 0x6e, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x01, 0xd0,
   0x02, 0x2f, 0xfd, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00,
   0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x10, 0x00,

diff --git a/webpage/index b/webpage/index
diff --git a/webpage/index.html b/webpage/index.html
@@ -45,7 +45,7 @@ <h1>Edit station</h1>
 			<div class="LEFT"><img title="Click on the logo to change the theme" onClick= "theme()" src="logo.png"></div>
 			<div class="RIGHT">
 			<a href="https://github.com/karawin/Ka-Radio32" target="_blank">KaraDio32</a><br/>
-			<a href="https://github.com/karawin/Ka-Radio32" target="_blank">V1.4 R1</a><br/>
+			<a href="https://github.com/karawin/Ka-Radio32" target="_blank">V1.5 R0</a><br/>
 			<div id="rssi" >0 dBm</div><br/>
 <!--			<a href="https://github.com/PiotrSperka/ESP8266-WebRadio" style="font-size:8px" target="_blank">From PiotrSperka</a> -->
 			</div>

diff --git a/webpage/logo b/webpage/logo
@@ -1,5 +1,5 @@
 const char logo_png[] = {
-  0x1f, 0x8b, 0x08, 0x08, 0x56, 0xff, 0xdd, 0x5b, 0x00, 0x03, 0x6c, 0x6f,
+  0x1f, 0x8b, 0x08, 0x08, 0xc1, 0x5b, 0xe3, 0x5b, 0x00, 0x03, 0x6c, 0x6f,
   0x67, 0x6f, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x01, 0x61, 0x0c, 0x9e, 0xf3,
   0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
   0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x33,

diff --git a/webpage/script b/webpage/script
@@ -1,5 +1,5 @@
 const char script_js[] = {
-  0x1f, 0x8b, 0x08, 0x08, 0x51, 0xff, 0xdd, 0x5b, 0x00, 0x03, 0x73, 0x63,
+  0x1f, 0x8b, 0x08, 0x08, 0xbc, 0x5b, 0xe3, 0x5b, 0x00, 0x03, 0x73, 0x63,
   0x72, 0x69, 0x70, 0x74, 0x2e, 0x6a, 0x73, 0x00, 0xec, 0x3d, 0x6b, 0x73,
   0xdb, 0x46, 0x92, 0x9f, 0x99, 0xaa, 0xfc, 0x87, 0x31, 0xca, 0x67, 0x02,
   0x26, 0xc4, 0x97, 0xed, 0xdc, 0x9e, 0x69, 0x65, 0x2b, 0x76, 0x9c, 0xb3,

diff --git a/webpage/style b/webpage/style
@@ -1,5 +1,5 @@
 const char style_css[] = {
-  0x1f, 0x8b, 0x08, 0x08, 0x4f, 0xff, 0xdd, 0x5b, 0x00, 0x03, 0x73, 0x74,
+  0x1f, 0x8b, 0x08, 0x08, 0xba, 0x5b, 0xe3, 0x5b, 0x00, 0x03, 0x73, 0x74,
   0x79, 0x6c, 0x65, 0x2e, 0x63, 0x73, 0x73, 0x00, 0xed, 0x5a, 0x5b, 0x6f,
   0xdb, 0x36, 0x14, 0x7e, 0x6e, 0x80, 0xfc, 0x07, 0x2e, 0xc1, 0x80, 0xa6,
   0xb3, 0x12, 0x4a, 0xb6, 0x13, 0x59, 0x41, 0x81, 0xdd, 0xdc, 0xb5, 0x40,

diff --git a/webpage/style1 b/webpage/style1
@@ -1,5 +1,5 @@
 const char style1_css[] = {
-  0x1f, 0x8b, 0x08, 0x08, 0x50, 0xff, 0xdd, 0x5b, 0x00, 0x03, 0x73, 0x74,
+  0x1f, 0x8b, 0x08, 0x08, 0xbb, 0x5b, 0xe3, 0x5b, 0x00, 0x03, 0x73, 0x74,
   0x79, 0x6c, 0x65, 0x31, 0x2e, 0x63, 0x73, 0x73, 0x00, 0xed, 0x5a, 0x6f,
   0x6f, 0xdb, 0x36, 0x13, 0x7f, 0xdd, 0x02, 0xfd, 0x0e, 0x7c, 0x62, 0x0c,
   0x68, 0x3a, 0xcb, 0x91, 0x64, 0xc9, 0x91, 0x15, 0x14, 0x58, 0xd2, 0xb9,