commit 3fc0a2b9a619f8c40e1a4e88092ef95c12e42f29
author Chris Mumford <cmumford@google.com> Thu Nov 17 15:08:21 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Nov 17 07:09:00 2022 -0800
tree 4ed7947ef11a01cdfc48465a8a4858934abfad6a
parent 0918c1f593af8d7bc25ff26d8205b86f4e19e3dd

pw_display_pico_ili9341: minor cleanup

Inlined simple accessors and minor improvements to error handling.

Bug: none
Change-Id: I84ba86e4b7e6d3a00aa4c79c0a13865bc70dc8bb
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/119735
Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
Commit-Queue: Chris Mumford <cmumford@google.com>
GitOrigin-RevId: 5c99d4714d4e8a702a106643f2f18b41eddb2ba6

pw_graphics/pw_display_pico_ili9341/display.cc

diff --git a/pw_graphics/pw_display_pico_ili9341/display.cc b/pw_graphics/pw_display_pico_ili9341/display.cc
index 17cbb56..e3a4ce7 100644
--- a/pw_graphics/pw_display_pico_ili9341/display.cc
+++ b/pw_graphics/pw_display_pico_ili9341/display.cc
@@ -28,8 +28,6 @@
 #include "pico/stdlib.h"
 #include "pw_log/log.h"
 
-using pw::display_driver::DisplayDriverILI9341;
-
 namespace pw::display::backend {
 
 namespace {
@@ -75,17 +73,16 @@
 Status Display::Init() {
   InitGPIO();
   InitSPI();
-  InitDisplayDriver();
-  return OkStatus();
+  return InitDisplayDriver();
 }
 
 void Display::Update(pw::framebuffer::FramebufferRgb565& frame_buffer) {
-  display_driver_.Update(&frame_buffer);
+  display_driver_.Update(&frame_buffer).IgnoreError();
 }
 
 void Display::UpdatePixelDouble(
     pw::framebuffer::FramebufferRgb565* frame_buffer) {
-  display_driver_.UpdatePixelDouble(frame_buffer);
+  display_driver_.UpdatePixelDouble(frame_buffer).IgnoreError();
 }
 
 Status Display::InitFramebuffer(
@@ -128,16 +125,4 @@
   return OkStatus();
 }
 
-int Display::GetWidth() const { return kDisplayWidth; }
-
-int Display::GetHeight() const { return kDisplayHeight; }
-
-bool Display::TouchscreenAvailable() const { return false; }
-
-bool Display::NewTouchEvent() { return false; }
-
-pw::coordinates::Vec3Int Display::GetTouchPoint() {
-  return pw::coordinates::Vec3Int{0, 0, 0};
-}
-
 }  // namespace pw::display::backend

pw_graphics/pw_display_pico_ili9341/public_overrides/pw_display/display_backend.h

diff --git a/pw_graphics/pw_display_pico_ili9341/public_overrides/pw_display/display_backend.h b/pw_graphics/pw_display_pico_ili9341/public_overrides/pw_display/display_backend.h
index 13fdce6..2dbaeda 100644
--- a/pw_graphics/pw_display_pico_ili9341/public_overrides/pw_display/display_backend.h
+++ b/pw_graphics/pw_display_pico_ili9341/public_overrides/pw_display/display_backend.h
@@ -32,12 +32,14 @@
   Status Init() override;
   Status InitFramebuffer(
       pw::framebuffer::FramebufferRgb565* framebuffer) override;
-  int GetWidth() const override;
-  int GetHeight() const override;
+  int GetWidth() const override { return kDisplayWidth; }
+  int GetHeight() const override { return kDisplayHeight; }
   void Update(pw::framebuffer::FramebufferRgb565& framebuffer) override;
-  bool TouchscreenAvailable() const override;
-  bool NewTouchEvent() override;
-  pw::coordinates::Vec3Int GetTouchPoint() override;
+  bool TouchscreenAvailable() const override { return false; }
+  bool NewTouchEvent() override { return false; }
+  pw::coordinates::Vec3Int GetTouchPoint() override {
+    return pw::coordinates::Vec3Int{0, 0, 0};
+  }
 
  private:
   constexpr static int kDisplayWidth = 320;