Skip to content

Commit f2c40d7

Browse files
committed
uvc: remove traces of the bitmap mode of operation
1 parent 906c604 commit f2c40d7

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

shared-bindings/uvc/__init__.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#pragma once
2828

2929
#include "shared-module/displayio/Bitmap.h"
30-
extern displayio_bitmap_t uvc_bitmap_obj;
3130
bool shared_module_uvc_enable(mp_int_t frame_width, mp_int_t frame_height);
3231
bool shared_module_uvc_disable(void);
3332
void shared_module_uvc_swapbuffers(void);

shared-module/uvc/__init__.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ static unsigned interval_ms = 1000 / DEFAULT_FRAME_RATE;
1919
static uint8_t *frame_buffer_yuyv;
2020
uint16_t *uvc_framebuffer_rgb565;
2121

22-
displayio_bitmap_t uvc_bitmap_obj = {
23-
.base = {.type = &displayio_bitmap_type },
24-
.bits_per_value = 16,
25-
.x_shift = 1,
26-
.x_mask = 1,
27-
.bitmask = 0xffff,
28-
// (other fields set when enabling uvc)
29-
};
30-
3122
static bool uvc_is_enabled = false;
3223
uint16_t uvc_frame_width, uvc_frame_height;
3324

@@ -61,11 +52,6 @@ bool shared_module_uvc_enable(mp_int_t frame_width, mp_int_t frame_height) {
6152
memset(frame_buffer_yuyv, 0, framebuffer_size);
6253
memset(uvc_framebuffer_rgb565, 0, framebuffer_size);
6354

64-
uvc_bitmap_obj.data = (uint32_t *)frame_buffer_rgb565_uint32;
65-
uvc_bitmap_obj.width = uvc_frame_width;
66-
uvc_bitmap_obj.height = uvc_frame_height;
67-
uvc_bitmap_obj.stride = uvc_frame_width / 2; /* in uint32_t units */
68-
6955
uvc_is_enabled = true;
7056

7157
return true;
@@ -75,7 +61,6 @@ bool shared_module_uvc_disable(void) {
7561
if (tud_connected()) {
7662
return false;
7763
}
78-
uvc_bitmap_obj.data = NULL; // should be redundant
7964
uvc_is_enabled = false;
8065
port_free(frame_buffer_yuyv);
8166
port_free(uvc_framebuffer_rgb565);

0 commit comments

Comments
 (0)