pre release 1.9 R3

VahitovBulat · Mar 16, 2019 · bd8a88f · bd8a88f
1 parent 90cac8b
commit bd8a88f
Show file tree

Hide file tree

Showing 23 changed files with 1,644 additions and 748 deletions.
diff --git a/binaries/KaRadio32.bin b/binaries/KaRadio32.bin
diff --git a/boards/build/lolin32oled.bin b/boards/build/lolin32oled.bin
diff --git a/boards/build/lolin32oled.zip b/boards/build/lolin32oled.zip
diff --git a/boards/build/lolin32oled_V02.bin b/boards/build/lolin32oled_V02.bin
diff --git a/boards/lolin32oled.csv b/boards/lolin32oled.csv
@@ -0,0 +1,69 @@
+key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,lolin32oled.csv
+L_COMMENT,data,string,This is the standard simple configuration for lolin32 with OLED (clone) .
+
+gpio_space,namespace,,
+K_SPI,data,u8,2
+P_MISO,data,u8,19
+P_MOSI,data,u8,23
+P_CLK,data,u8,18
+P_XCS,data,u8,32
+P_RST,data,u8,12
+P_XDCS,data,u8,33
+P_DREQ,data,u8,34
+P_ENC0_A,data,u8,14
+P_ENC0_B,data,u8,15
+P_ENC0_BTN,data,u8,13
+P_ENC1_A,data,u8,255
+P_ENC1_B,data,u8,17
+P_ENC1_BTN,data,u8,5
+P_BTN0_A,data,u8,255
+P_BTN0_B,data,u8,255
+P_BTN0_C,data,u8,255
+P_BTN1_A,data,u8,255
+P_BTN1_B,data,u8,255
+P_BTN1_C,data,u8,255
+P_I2C_SCL,data,u8,4
+P_I2C_SDA,data,u8,5
+P_I2C_RST,data,u8,255
+P_LCD_CS,data,u8,5
+P_LCD_A0,data,u8,4
+P_LCD_RST,data,u8,255
+P_IR_SIGNAL,data,u8,21
+P_I2S_LRCK,data,u8,25
+P_I2S_BCLK,data,u8,26
+P_I2S_DATA,data,u8,16
+P_TOUCH_CS,data,u8,255
+P_JOY_0,data,u8,255
+P_JOY_1,data,u8,255
+P_LED_GPIO,data,u8,2
+P_ADC_KBD,data,u8,39
+P_BACKLIGHT,data,u8,255
+
+option_space,namespace,,
+O_LCD_TYPE,data,u8,255
+O_LCD_ROTA,data,u8,255
+O_LCD_OUT,data,u32,0
+O_DDMM_FLAG,data,u8,255
+
+custom_ir_space,namespace,,
+K_UP,data,string,
+K_LEFT,data,string,
+K_OK,data,string,
+K_RIGHT,data,string,
+K_DOWN,data,string,
+K_0,data,string,
+K_1,data,string,
+K_2,data,string,
+K_3,data,string,
+K_4,data,string,
+K_5,data,string,
+K_6,data,string,
+K_7,data,string,
+K_8,data,string,
+K_9,data,string,
+K_STAR,data,string,
+K_DIESE,data,string,
+K_INFO,data,string,
diff --git a/boards/lolin32oled_V02.csv b/boards/lolin32oled_V02.csv
@@ -0,0 +1,69 @@
+key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,lolin32oled.csv
+L_COMMENT,data,string,This is the standard simple configuration for lolin32 with OLED (clone) .
+
+gpio_space,namespace,,
+K_SPI,data,u8,2
+P_MISO,data,u8,19
+P_MOSI,data,u8,23
+P_CLK,data,u8,18
+P_XCS,data,u8,32
+P_RST,data,u8,12
+P_XDCS,data,u8,33
+P_DREQ,data,u8,34
+P_ENC0_A,data,u8,255
+P_ENC0_B,data,u8,255
+P_ENC0_BTN,data,u8,255
+P_ENC1_A,data,u8,255
+P_ENC1_B,data,u8,255
+P_ENC1_BTN,data,u8,255
+P_BTN0_A,data,u8,15
+P_BTN0_B,data,u8,13
+P_BTN0_C,data,u8,12
+P_BTN1_A,data,u8,14
+P_BTN1_B,data,u8,2
+P_BTN1_C,data,u8,39
+P_I2C_SCL,data,u8,4
+P_I2C_SDA,data,u8,5
+P_I2C_RST,data,u8,255
+P_LCD_CS,data,u8,5
+P_LCD_A0,data,u8,4
+P_LCD_RST,data,u8,255
+P_IR_SIGNAL,data,u8,21
+P_I2S_LRCK,data,u8,25
+P_I2S_BCLK,data,u8,26
+P_I2S_DATA,data,u8,16
+P_TOUCH_CS,data,u8,255
+P_JOY_0,data,u8,255
+P_JOY_1,data,u8,255
+P_LED_GPIO,data,u8,255
+P_ADC_KBD,data,u8,36
+P_BACKLIGHT,data,u8,255
+
+option_space,namespace,,
+O_LCD_TYPE,data,u8,255
+O_LCD_ROTA,data,u8,255
+O_LCD_OUT,data,u32,0
+O_DDMM_FLAG,data,u8,255
+
+custom_ir_space,namespace,,
+K_UP,data,string,
+K_LEFT,data,string,
+K_OK,data,string,
+K_RIGHT,data,string,
+K_DOWN,data,string,
+K_0,data,string,
+K_1,data,string,
+K_2,data,string,
+K_3,data,string,
+K_4,data,string,
+K_5,data,string,
+K_6,data,string,
+K_7,data,string,
+K_8,data,string,
+K_9,data,string,
+K_STAR,data,string,
+K_DIESE,data,string,
+K_INFO,data,string,
diff --git a/components/u8g2/csrc/u8g2.h b/components/u8g2/csrc/u8g2.h
@@ -783,6 +783,8 @@ void u8g2_Setup_st7565_ea_dogm132_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x
 void u8g2_Setup_st7567_pi_132x64_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
 void u8g2_Setup_st7567_pi_132x64_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
 void u8g2_Setup_st7567_pi_132x64_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
+void u8g2_Setup_st7567_i2c_64x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
+void u8g2_Setup_st7567_64x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
 void u8g2_Setup_st7567_jlx12864_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
 void u8g2_Setup_st7567_jlx12864_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);
 void u8g2_Setup_st7567_jlx12864_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb);

diff --git a/components/u8g2/csrc/u8g2_d_setup.c b/components/u8g2/csrc/u8g2_d_setup.c
@@ -2334,6 +2334,22 @@ void u8g2_Setup_st7567_jlx12864_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_
   u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation);
 }
 /* st7567 2 */
+void u8g2_Setup_st7567_64x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb)
+{
+  uint8_t tile_buf_height;
+  uint8_t *buf;
+  u8g2_SetupDisplay(u8g2, u8x8_d_st7567_64x32, u8x8_cad_001, byte_cb, gpio_and_delay_cb);
+  buf = u8g2_m_8_4_2(&tile_buf_height);
+  u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation);
+}
+void u8g2_Setup_st7567_i2c_64x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb)
+{
+  uint8_t tile_buf_height;
+  uint8_t *buf;
+  u8g2_SetupDisplay(u8g2, u8x8_d_st7567_64x32, u8x8_cad_ssd13xx_i2c, byte_cb, gpio_and_delay_cb);
+  buf = u8g2_m_8_4_2(&tile_buf_height);
+  u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation);
+}
 void u8g2_Setup_st7567_jlx12864_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb)
 {
   uint8_t tile_buf_height;

diff --git a/components/u8g2/csrc/u8x8.h b/components/u8g2/csrc/u8x8.h
@@ -779,6 +779,7 @@ uint8_t u8x8_d_st7565_lm6059(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *a
 uint8_t u8x8_d_st7565_erc12864(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 uint8_t u8x8_d_st7567_pi_132x64(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 uint8_t u8x8_d_st7567_jlx12864(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
+uint8_t u8x8_d_st7567_64x32(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 uint8_t u8x8_d_st7588_jlx12864(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 uint8_t u8x8_d_st75256_jlx256128(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 uint8_t u8x8_d_st75256_jlx25664(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);