From 72e7ffa324f8184cb2d9a5ca9fa620a2a5a56b69 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 22 Aug 2019 16:16:09 -0700
Subject: [PATCH] More cleanup

---
 ports/atmel-samd/boards/snekboard/mpconfigboard.mk | 3 +++
 shared-bindings/displayio/EPaperDisplay.c          | 2 +-
 shared-bindings/displayio/EPaperDisplay.h          | 6 ------
 shared-module/displayio/ColorConverter.c           | 1 -
 shared-module/displayio/Group.c                    | 3 ---
 shared-module/displayio/OnDiskBitmap.c             | 4 +---
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
index 9892ade8f2..6ad78b0daf 100644
--- a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
@@ -12,5 +12,8 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JV_IQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_I2CSLAVE = 0
+
 CFLAGS_INLINE_LIMIT = 60
 SUPEROPT_GC = 0
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index dd773e410c..5d0d8ac949 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -42,7 +42,7 @@
 //| .. currentmodule:: displayio
 //|
 //| :class:`EPaperDisplay` -- Manage updating an epaper display over a display bus
-//| ==========================================================================
+//| ==============================================================================
 //|
 //| This initializes an epaper display and connects it into CircuitPython. Unlike other
 //| objects in CircuitPython, EPaperDisplay objects live until `displayio.release_displays()`
diff --git a/shared-bindings/displayio/EPaperDisplay.h b/shared-bindings/displayio/EPaperDisplay.h
index 786fc3628f..e4b81c8838 100644
--- a/shared-bindings/displayio/EPaperDisplay.h
+++ b/shared-bindings/displayio/EPaperDisplay.h
@@ -53,15 +53,9 @@ bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t* self
 // Returns time in milliseconds.
 uint32_t common_hal_displayio_epaperdisplay_get_time_to_refresh(displayio_epaperdisplay_obj_t* self);
 
-bool common_hal_displayio_epaperdisplay_get_auto_brightness(displayio_epaperdisplay_obj_t* self);
-void common_hal_displayio_epaperdisplay_set_auto_brightness(displayio_epaperdisplay_obj_t* self, bool auto_brightness);
-
 uint16_t common_hal_displayio_epaperdisplay_get_width(displayio_epaperdisplay_obj_t* self);
 uint16_t common_hal_displayio_epaperdisplay_get_height(displayio_epaperdisplay_obj_t* self);
 
-mp_float_t common_hal_displayio_epaperdisplay_get_brightness(displayio_epaperdisplay_obj_t* self);
-bool common_hal_displayio_epaperdisplay_set_brightness(displayio_epaperdisplay_obj_t* self, mp_float_t brightness);
-
 mp_obj_t common_hal_displayio_epaperdisplay_get_bus(displayio_epaperdisplay_obj_t* self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_EPAPERDISPLAY_H
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 0277c79f0f..e0c4ca2869 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -142,7 +142,6 @@ bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
         uint8_t luma = displayio_colorconverter_compute_luma(input_color);
         *output_color = luma >> (8 - colorspace->depth);
         return true;
-    } else if (!colorspace->grayscale && colorspace->depth == 1) {
     }
     return false;
 }
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
index eb6e9a4537..38418a0299 100644
--- a/shared-module/displayio/Group.c
+++ b/shared-module/displayio/Group.c
@@ -304,9 +304,6 @@ void displayio_group_finish_refresh(displayio_group_t *self) {
 }
 
 displayio_area_t* displayio_group_get_refresh_areas(displayio_group_t *self, displayio_area_t* tail) {
-    if (self->base.type != &displayio_group_type) {
-        asm("bkpt");
-    }
     if (self->item_removed) {
         self->dirty_area.next = tail;
         tail = &self->dirty_area;
diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c
index 10fc0c4a2e..993fc03de6 100644
--- a/shared-module/displayio/OnDiskBitmap.c
+++ b/shared-module/displayio/OnDiskBitmap.c
@@ -149,10 +149,8 @@ uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *s
             if (self->bits_per_pixel == 1) {
                 if (index == 1) {
                     return 0xFFFFFF;
-                } else if (index == 0) {
-                    return 0x000000;
                 } else {
-                    asm("bkpt");
+                    return 0x000000;
                 }
             }
             return self->palette_data[index];