Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_lcd_testcase' into 'master'
Browse files Browse the repository at this point in the history
bugfix(lcd): fix spi mode for iot_lcd

See merge request rd/esp-iot-solution!336
  • Loading branch information
costaud committed Dec 9, 2018
2 parents 8bf51a4 + b150960 commit cf554ee
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion components/spi_devices/lcd/spi_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ uint32_t lcd_init(lcd_conf_t* lcd_conf, spi_device_handle_t *spi_wr_dev, lcd_dc_

// Use high speed to write LCD
devcfg.clock_speed_hz = lcd_conf->clk_freq;
// devcfg.flags = SPI_DEVICE_HALFDUPLEX;
devcfg.flags = SPI_DEVICE_HALFDUPLEX;
spi_bus_add_device(lcd_conf->spi_host, &devcfg, spi_wr_dev);

int cmd = 0;
Expand Down
8 changes: 7 additions & 1 deletion components/spi_devices/lcd/test/lcd_example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,13 @@ extern "C" esp_err_t event_handler(void *ctx, system_event_t *event)
extern "C" void esp_draw()
{
/*Initilize ESP32 to scan for Access points*/
nvs_flash_init();
esp_err_t err = nvs_flash_init();
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
ESP_ERROR_CHECK( nvs_flash_erase() );
err = nvs_flash_init();
}
ESP_ERROR_CHECK(err);

tcpip_adapter_init();
wifi_event_group = xEventGroupCreate();
ESP_ERROR_CHECK( esp_event_loop_init(event_handler, NULL) );
Expand Down
2 changes: 1 addition & 1 deletion components/spi_devices/lcd/test/lcd_refresh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern "C" void app_lcd_init(uint8_t m_clk_freq)
{
static bool first = true; //use this flag, avoid spi init repeat.
lcd_conf_t lcd_pins = {
.lcd_model = LCD_MOD_ST7789,
.lcd_model = LCD_MOD_AUTO_DET,
.pin_num_miso = CONFIG_LCD_MISO_GPIO,
.pin_num_mosi = CONFIG_LCD_MOSI_GPIO,
.pin_num_clk = CONFIG_LCD_CLK_GPIO,
Expand Down
2 changes: 1 addition & 1 deletion submodule/esp-idf
Submodule esp-idf updated 74 files
+34 −7 .gitlab-ci.yml
+17 −0 components/bt/bluedroid/api/esp_gap_ble_api.c
+14 −6 components/bt/bluedroid/api/include/api/esp_gap_ble_api.h
+9 −9 components/bt/bluedroid/api/include/api/esp_hf_client_api.h
+1 −2 components/bt/bluedroid/api/include/api/esp_spp_api.h
+8 −4 components/bt/bluedroid/bta/dm/bta_dm_act.c
+15 −0 components/bt/bluedroid/bta/dm/bta_dm_api.c
+35 −3 components/bt/bluedroid/bta/dm/bta_dm_co.c
+5 −4 components/bt/bluedroid/bta/dm/bta_dm_main.c
+9 −0 components/bt/bluedroid/bta/dm/include/bta_dm_int.h
+17 −0 components/bt/bluedroid/bta/include/bta/bta_api.h
+6 −0 components/bt/bluedroid/bta/include/bta/bta_dm_co.h
+8 −0 components/bt/bluedroid/bta/jv/bta_jv_act.c
+2 −0 components/bt/bluedroid/bta/jv/include/bta_jv_int.h
+1 −0 components/bt/bluedroid/btc/core/btc_dm.c
+1 −1 components/bt/bluedroid/btc/core/btc_main.c
+57 −8 components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c
+77 −51 components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c
+24 −1 components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
+1 −1 components/bt/bluedroid/btc/profile/std/spp/btc_spp.c
+1 −0 components/bt/bluedroid/common/include/common/bte_appl.h
+1 −1 components/bt/bluedroid/hci/hci_hal_h4.c
+28 −8 components/bt/bluedroid/stack/btm/btm_ble.c
+2 −2 components/bt/bluedroid/stack/btm/btm_ble_privacy.c
+1 −0 components/bt/bluedroid/stack/include/stack/btm_api.h
+15 −0 components/bt/bluedroid/stack/include/stack/btm_ble_api.h
+2 −0 components/bt/bluedroid/stack/include/stack/dyn_mem.h
+4 −1 components/bt/bluedroid/stack/include/stack/hcimsgs.h
+16 −0 components/bt/bluedroid/stack/include/stack/smp_api.h
+4 −4 components/bt/bluedroid/stack/l2cap/l2c_ble.c
+7 −0 components/bt/bluedroid/stack/smp/include/smp_int.h
+81 −1 components/bt/bluedroid/stack/smp/smp_act.c
+26 −0 components/bt/bluedroid/stack/smp/smp_api.c
+29 −3 components/bt/bluedroid/stack/smp/smp_keys.c
+9 −3 components/bt/bluedroid/stack/smp/smp_utils.c
+1 −1 components/bt/lib
+28 −0 components/bt/test/test_smp.c
+25 −0 components/driver/i2c.c
+29 −0 components/driver/include/driver/i2c.h
+46 −8 components/driver/periph_ctrl.c
+7 −13 components/esp32/hwcrypto/aes.c
+4 −11 components/esp32/hwcrypto/sha.c
+4 −2 components/esp32/ld/esp32.rom.ld
+1 −1 components/esp32/lib
+1 −0 components/esp32/phy_init.c
+287 −0 components/esp32/test/test_aes_sha_rsa.c
+12 −42 components/freertos/tasks.c
+8 −8 components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml
+45 −14 components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml
+24 −0 components/lwip/api/api_msg.c
+9 −0 components/lwip/include/lwip/lwip/api.h
+11 −0 components/lwip/include/lwip/lwip/sys.h
+1 −2 components/lwip/include/lwip/port/arch/sys_arch.h
+59 −77 components/lwip/port/freertos/sys_arch.c
+0 −1 components/lwip/port/netif/ethernetif.c
+5 −9 components/mbedtls/port/esp_bignum.c
+2 −1 components/mdns/mdns.c
+3 −0 components/soc/esp32/include/soc/periph_defs.h
+1 −1 docs/en/api-guides/wifi.rst
+43 −2 examples/bluetooth/gatt_security_client/main/example_ble_sec_gattc_demo.c
+47 −4 examples/bluetooth/gatt_security_server/main/example_ble_sec_gatts_demo.c
+1 −1 examples/bluetooth/gatt_server/main/gatts_demo.c
+1 −1 examples/bluetooth/gatt_server_service_table/main/gatts_table_creat_demo.c
+18 −33 examples/wifi/iperf/iperf_test.py
+1 −1 tools/ci/test_build_system_cmake.sh
+4 −1 tools/cmake/idf_functions.cmake
+50 −3 tools/tiny-test-fw/DUT.py
+5 −1 tools/tiny-test-fw/IDF/__init__.py
+62 −47 tools/tiny-test-fw/TinyFW.py
+1 −0 tools/tiny-test-fw/Utility/CIAssignTest.py
+1 −1 tools/tiny-test-fw/docs/index.rst
+5 −0 tools/tiny-test-fw/requirements.txt
+1 −1 tools/unit-test-app/tools/UnitTestParser.py
+244 −177 tools/unit-test-app/unit_test.py

0 comments on commit cf554ee

Please sign in to comment.