Merge pull request 'fixes for my green-tab adafruit ST7735R' (#57) from NanoCodeBug/tangara-fw:adafruit-display-fix into main

Reviewed-on: https://codeberg.org/cool-tech-zone/tangara-fw/pulls/57
custom
cooljqln 1 year ago
commit edd5eecc14
  1. 4
      .env.ps1
  2. 4
      src/drivers/display.cpp
  3. 3
      src/ui/screen.cpp

@ -0,0 +1,4 @@
$repo_dir="$(pwd)".replace("`\", "/")
$env:PROJ_PATH="$repo_dir"
$env:IDF_PATH="$repo_dir/lib/esp-idf"
. "$($env:IDF_PATH)/export.ps1"

@ -40,8 +40,8 @@
[[maybe_unused]] static const char* kTag = "DISPLAY"; [[maybe_unused]] static const char* kTag = "DISPLAY";
// TODO(jacqueline): Encode width and height variations in the init data. // TODO(jacqueline): Encode width and height variations in the init data.
static const uint8_t kDisplayHeight = 128 + 2; static const uint8_t kDisplayHeight = 128;
static const uint8_t kDisplayWidth = 160 + 1; static const uint8_t kDisplayWidth = 160;
static const uint8_t kTransactionQueueSize = 2; static const uint8_t kTransactionQueueSize = 2;
static const gpio_num_t kDisplayDr = GPIO_NUM_33; static const gpio_num_t kDisplayDr = GPIO_NUM_33;

@ -35,6 +35,9 @@ Screen::Screen()
lv_obj_set_style_bg_opa(modal_content_, LV_OPA_TRANSP, 0); lv_obj_set_style_bg_opa(modal_content_, LV_OPA_TRANSP, 0);
lv_obj_set_style_bg_color(modal_content_, lv_color_black(), 0); lv_obj_set_style_bg_color(modal_content_, lv_color_black(), 0);
lv_obj_set_scrollbar_mode(root_, LV_SCROLLBAR_MODE_OFF);
lv_obj_set_scrollbar_mode(content_, LV_SCROLLBAR_MODE_OFF);
// Disable wrapping by default, since it's confusing and generally makes it // Disable wrapping by default, since it's confusing and generally makes it
// harder to navigate quickly. // harder to navigate quickly.
lv_group_set_wrap(group_, false); lv_group_set_wrap(group_, false);

Loading…
Cancel
Save