Skip to content

Commit 72e7ffa

Browse files
committed
More cleanup
1 parent fd8050b commit 72e7ffa

6 files changed

Lines changed: 5 additions & 14 deletions

File tree

ports/atmel-samd/boards/snekboard/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1212
EXTERNAL_FLASH_DEVICES = "W25Q16JV_IQ"
1313
LONGINT_IMPL = MPZ
1414

15+
CIRCUITPY_GAMEPAD = 0
16+
CIRCUITPY_I2CSLAVE = 0
17+
1518
CFLAGS_INLINE_LIMIT = 60
1619
SUPEROPT_GC = 0

shared-bindings/displayio/EPaperDisplay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
//| .. currentmodule:: displayio
4343
//|
4444
//| :class:`EPaperDisplay` -- Manage updating an epaper display over a display bus
45-
//| ==========================================================================
45+
//| ==============================================================================
4646
//|
4747
//| This initializes an epaper display and connects it into CircuitPython. Unlike other
4848
//| objects in CircuitPython, EPaperDisplay objects live until `displayio.release_displays()`

shared-bindings/displayio/EPaperDisplay.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,9 @@ bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t* self
5353
// Returns time in milliseconds.
5454
uint32_t common_hal_displayio_epaperdisplay_get_time_to_refresh(displayio_epaperdisplay_obj_t* self);
5555

56-
bool common_hal_displayio_epaperdisplay_get_auto_brightness(displayio_epaperdisplay_obj_t* self);
57-
void common_hal_displayio_epaperdisplay_set_auto_brightness(displayio_epaperdisplay_obj_t* self, bool auto_brightness);
58-
5956
uint16_t common_hal_displayio_epaperdisplay_get_width(displayio_epaperdisplay_obj_t* self);
6057
uint16_t common_hal_displayio_epaperdisplay_get_height(displayio_epaperdisplay_obj_t* self);
6158

62-
mp_float_t common_hal_displayio_epaperdisplay_get_brightness(displayio_epaperdisplay_obj_t* self);
63-
bool common_hal_displayio_epaperdisplay_set_brightness(displayio_epaperdisplay_obj_t* self, mp_float_t brightness);
64-
6559
mp_obj_t common_hal_displayio_epaperdisplay_get_bus(displayio_epaperdisplay_obj_t* self);
6660

6761
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_EPAPERDISPLAY_H

shared-module/displayio/ColorConverter.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
142142
uint8_t luma = displayio_colorconverter_compute_luma(input_color);
143143
*output_color = luma >> (8 - colorspace->depth);
144144
return true;
145-
} else if (!colorspace->grayscale && colorspace->depth == 1) {
146145
}
147146
return false;
148147
}

shared-module/displayio/Group.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,6 @@ void displayio_group_finish_refresh(displayio_group_t *self) {
304304
}
305305

306306
displayio_area_t* displayio_group_get_refresh_areas(displayio_group_t *self, displayio_area_t* tail) {
307-
if (self->base.type != &displayio_group_type) {
308-
asm("bkpt");
309-
}
310307
if (self->item_removed) {
311308
self->dirty_area.next = tail;
312309
tail = &self->dirty_area;

shared-module/displayio/OnDiskBitmap.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,8 @@ uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *s
149149
if (self->bits_per_pixel == 1) {
150150
if (index == 1) {
151151
return 0xFFFFFF;
152-
} else if (index == 0) {
153-
return 0x000000;
154152
} else {
155-
asm("bkpt");
153+
return 0x000000;
156154
}
157155
}
158156
return self->palette_data[index];

0 commit comments

Comments
 (0)