diff options
| author | cooljqln <cooljqln@noreply.codeberg.org> | 2024-03-19 00:32:08 +0000 |
|---|---|---|
| committer | cooljqln <cooljqln@noreply.codeberg.org> | 2024-03-19 00:32:08 +0000 |
| commit | edd5eecc14bd5f7f25446555459836dd10f2af33 (patch) | |
| tree | 4b8f707f22481af0402c4e7e4659cb04aaf7ea75 | |
| parent | 1ea25ab9d3bc9d7ad85bccd3a3c9e4f56c71a80f (diff) | |
| parent | c4238173345ae65b69535c21b282448d5f012d43 (diff) | |
| download | tangara-fw-edd5eecc14bd5f7f25446555459836dd10f2af33.tar.gz | |
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
| -rw-r--r-- | .env.ps1 | 4 | ||||
| -rw-r--r-- | src/drivers/display.cpp | 4 | ||||
| -rw-r--r-- | src/ui/screen.cpp | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.env.ps1 b/.env.ps1 new file mode 100644 index 00000000..26fe4c34 --- /dev/null +++ b/.env.ps1 @@ -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" diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp index cb3ee3a0..026e1346 100644 --- a/src/drivers/display.cpp +++ b/src/drivers/display.cpp @@ -40,8 +40,8 @@ [[maybe_unused]] static const char* kTag = "DISPLAY"; // TODO(jacqueline): Encode width and height variations in the init data. -static const uint8_t kDisplayHeight = 128 + 2; -static const uint8_t kDisplayWidth = 160 + 1; +static const uint8_t kDisplayHeight = 128; +static const uint8_t kDisplayWidth = 160; static const uint8_t kTransactionQueueSize = 2; static const gpio_num_t kDisplayDr = GPIO_NUM_33; diff --git a/src/ui/screen.cpp b/src/ui/screen.cpp index 3e4f8e42..aafc982c 100644 --- a/src/ui/screen.cpp +++ b/src/ui/screen.cpp @@ -35,6 +35,9 @@ Screen::Screen() 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_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 // harder to navigate quickly. lv_group_set_wrap(group_, false); |