Skip to content

Commit 83d710d

Browse files
kdschlosserkdschlosser
committed
debugging code cleanup
1 parent 2bed280 commit 83d710d

File tree

7 files changed

+160
-231
lines changed

7 files changed

+160
-231
lines changed

‎ext_mod/lcd_bus/esp32_src/dsi_bus.c‎

Lines changed: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,20 @@
127127

128128
self->bus_config.pclk_hz = (uint32_t)args[ARG_freq].u_int;
129129

130-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
131-
printf("bus_id=%d\n", self->bus_config.bus_id);
132-
printf("num_data_lanes=%d\n", self->bus_config.num_data_lanes);
133-
printf("lane_bit_rate_mbps=%d\n",self->bus_config.lane_bit_rate_mbps);
134-
printf("phy_clk_src=%d\n", self->bus_config.phy_clk_src);
135-
printf("virtual_channel=%d\n", self->panel_io_config.virtual_channel);
136-
printf("dpi_clk_src=%d\n", self->panel_config.dpi_clk_src);
137-
printf("dpi_clock_freq_mhz=%d\n", self->panel_config.dpi_clock_freq_mhz);
138-
printf("hsync_front_porch=%d\n", self->panel_config.video_timing.hsync_front_porch);
139-
printf("hsync_back_porch=%d\n", self->panel_config.video_timing.hsync_back_porch);
140-
printf("hsync_pulse_width=%d\n", self->panel_config.video_timing.hsync_pulse_width);
141-
printf("vsync_front_porch=%d\n", self->panel_config.video_timing.vsync_front_porch);
142-
printf("vsync_back_porch=%d\n", self->panel_config.video_timing.vsync_back_porch);
143-
printf("vsync_pulse_width=%d\n", self->panel_config.video_timing.vsync_pulse_width);
144-
printf("pclk_hz[10]=%d\n", self->bus_config.pclk_hz);
145-
#endif
130+
LCD_DEBUG_PRINT("bus_id=%d\n", self->bus_config.bus_id)
131+
LCD_DEBUG_PRINT("num_data_lanes=%d\n", self->bus_config.num_data_lanes)
132+
LCD_DEBUG_PRINT("lane_bit_rate_mbps=%d\n",self->bus_config.lane_bit_rate_mbps)
133+
LCD_DEBUG_PRINT("phy_clk_src=%d\n", self->bus_config.phy_clk_src)
134+
LCD_DEBUG_PRINT("virtual_channel=%d\n", self->panel_io_config.virtual_channel)
135+
LCD_DEBUG_PRINT("dpi_clk_src=%d\n", self->panel_config.dpi_clk_src)
136+
LCD_DEBUG_PRINT("dpi_clock_freq_mhz=%d\n", self->panel_config.dpi_clock_freq_mhz)
137+
LCD_DEBUG_PRINT("hsync_front_porch=%d\n", self->panel_config.video_timing.hsync_front_porch)
138+
LCD_DEBUG_PRINT("hsync_back_porch=%d\n", self->panel_config.video_timing.hsync_back_porch)
139+
LCD_DEBUG_PRINT("hsync_pulse_width=%d\n", self->panel_config.video_timing.hsync_pulse_width)
140+
LCD_DEBUG_PRINT("vsync_front_porch=%d\n", self->panel_config.video_timing.vsync_front_porch)
141+
LCD_DEBUG_PRINT("vsync_back_porch=%d\n", self->panel_config.video_timing.vsync_back_porch)
142+
LCD_DEBUG_PRINT("vsync_pulse_width=%d\n", self->panel_config.video_timing.vsync_pulse_width)
143+
LCD_DEBUG_PRINT("pclk_hz[10]=%d\n", self->bus_config.pclk_hz)
146144

147145
self->panel_io_handle.get_lane_count = &dsi_get_lane_count;
148146
self->panel_io_handle.del = &dsi_del;
@@ -157,9 +155,7 @@
157155

158156
mp_lcd_err_t dsi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap, uint8_t cmd_bits, uint8_t param_bits)
159157
{
160-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
161-
printf("dsi_init(self, width=%i, height=%i, bpp=%i, buffer_size=%lu, rgb565_byte_swap=%i, cmd_bits=%i, param_bits=%i)\n", width, height, bpp, buffer_size, (uint8_t)rgb565_byte_swap, cmd_bits, param_bits);
162-
#endif
158+
LCD_DEBUG_PRINT("dsi_init(self, width=%i, height=%i, bpp=%i, buffer_size=%lu, rgb565_byte_swap=%i, cmd_bits=%i, param_bits=%i)\n", width, height, bpp, buffer_size, (uint8_t)rgb565_byte_swap, cmd_bits, param_bits)
163159

164160
mp_lcd_dsi_bus_obj_t *self = (mp_lcd_dsi_bus_obj_t *)obj;
165161

@@ -187,13 +183,12 @@
187183
self->panel_io_config.lcd_cmd_bits = (int)cmd_bits;
188184
self->panel_io_config.lcd_param_bits = (int)param_bits;
189185

190-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
191-
printf("lcd_cmd_bits=%d\n", self->panel_io_config.lcd_cmd_bits);
192-
printf("lcd_param_bits=%d\n", self->panel_io_config.lcd_param_bits);
193-
printf("h_size=%d\n", self->panel_config.video_timing.h_size);
194-
printf("v_size=%d\n", self->panel_config.video_timing.v_size);
195-
printf("pixel_format=%d\n", self->panel_config.pixel_format);
196-
#endif
186+
LCD_DEBUG_PRINT("lcd_cmd_bits=%d\n", self->panel_io_config.lcd_cmd_bits)
187+
LCD_DEBUG_PRINT("lcd_param_bits=%d\n", self->panel_io_config.lcd_param_bits)
188+
LCD_DEBUG_PRINT("h_size=%d\n", self->panel_config.video_timing.h_size)
189+
LCD_DEBUG_PRINT("v_size=%d\n", self->panel_config.video_timing.v_size)
190+
LCD_DEBUG_PRINT("pixel_format=%d\n", self->panel_config.pixel_format)
191+
197192
esp_err_t ret = esp_lcd_new_dsi_bus(&self->bus_config, &self->bus_handle);
198193

199194
if (ret != 0) {
@@ -253,9 +248,7 @@
253248

254249
mp_lcd_err_t dsi_del(mp_obj_t obj)
255250
{
256-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
257-
printf("dsi_del(self)\n");
258-
#endif
251+
LCD_DEBUG_PRINT("dsi_del(self)\n")
259252

260253
mp_lcd_dsi_bus_obj_t *self = (mp_lcd_dsi_bus_obj_t *)obj;
261254

@@ -286,9 +279,7 @@
286279
mp_lcd_dsi_bus_obj_t *self = (mp_lcd_dsi_bus_obj_t *)obj;
287280
*lane_count = (uint8_t)self->bus_config.num_data_lanes;
288281

289-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
290-
printf("dsi_get_lane_count(self)-> %d\n", (uint8_t)self->bus_config.num_data_lanes);
291-
#endif
282+
LCD_DEBUG_PRINT("dsi_get_lane_count(self)-> %d\n", (uint8_t)self->bus_config.num_data_lanes)
292283

293284
return LCD_OK;
294285
}
@@ -309,15 +300,11 @@
309300
if (array_buf == self->view1) {
310301
heap_caps_free(item_buf);
311302
self->view1 = NULL;
312-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
313-
printf("dsi_free_framebuffer(self, buf=1)\n");
314-
#endif
303+
LCD_DEBUG_PRINT("dsi_free_framebuffer(self, buf=1)\n")
315304
} else if (array_buf == self->view2) {
316305
heap_caps_free(item_buf);
317306
self->view2 = NULL;
318-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
319-
printf("dsi_free_framebuffer(self, buf=2)\n");
320-
#endif
307+
LCD_DEBUG_PRINT("dsi_free_framebuffer(self, buf=2)\n")
321308
} else {
322309
mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("No matching buffer found"));
323310
}
@@ -327,9 +314,7 @@
327314

328315
mp_obj_t dsi_allocate_framebuffer(mp_obj_t obj, uint32_t size, uint32_t caps)
329316
{
330-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
331-
printf("dsi_allocate_framebuffer(self, size=%lu, caps=%lu)\n", size, caps);
332-
#endif
317+
LCD_DEBUG_PRINT("dsi_allocate_framebuffer(self, size=%lu, caps=%lu)\n", size, caps)
333318

334319
mp_lcd_dsi_bus_obj_t *self = (mp_lcd_dsi_bus_obj_t *)obj;
335320

@@ -375,7 +360,8 @@
375360
self->panel_config.num_fbs = 2;
376361
} else {
377362
heap_caps_free(buf);
378-
mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("There is a maximum of 2 frame buffers allowed"));
363+
mp_raise_msg(&mp_type_MemoryError,
364+
MP_ERROR_TEXT("There is a maximum of 2 frame buffers allowed"));
379365
return mp_const_none;
380366
}
381367

@@ -385,9 +371,8 @@
385371

386372
mp_lcd_err_t dsi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update)
387373
{
388-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
389-
printf("dsi_tx_color(self, lcd_cmd=%d, color, color_size=%d, x_start=%d, y_start=%d, x_end=%d, y_end=%d)\n", lcd_cmd, color_size, x_start, y_start, x_end, y_end);
390-
#endif
374+
LCD_DEBUG_PRINT("dsi_tx_color(self, lcd_cmd=%d, color, color_size=%d, x_start=%d, y_start=%d, x_end=%d, y_end=%d)\n", lcd_cmd, color_size, x_start, y_start, x_end, y_end)
375+
391376
LCD_UNUSED(rotation);
392377
LCD_UNUSED(last_update);
393378

‎ext_mod/lcd_bus/esp32_src/i80_bus.c‎

Lines changed: 38 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -149,39 +149,37 @@
149149
self->panel_io_config.flags.pclk_active_neg = (unsigned int)args[ARG_pclk_active_low].u_bool;
150150
self->panel_io_config.flags.pclk_idle_low = (unsigned int)args[ARG_pclk_idle_low].u_bool;
151151

152-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
153-
printf("dc_gpio_num=%d\n", self->bus_config.dc_gpio_num);
154-
printf("wr_gpio_num=%d\n", self->bus_config.wr_gpio_num);
155-
printf("clk_src=%d\n", self->bus_config.clk_src);
156-
printf("data_gpio_nums[0]=%d\n", self->bus_config.data_gpio_nums[0]);
157-
printf("data_gpio_nums[1]=%d\n", self->bus_config.data_gpio_nums[1]);
158-
printf("data_gpio_nums[2]=%d\n", self->bus_config.data_gpio_nums[2]);
159-
printf("data_gpio_nums[3]=%d\n", self->bus_config.data_gpio_nums[3]);
160-
printf("data_gpio_nums[4]=%d\n", self->bus_config.data_gpio_nums[4]);
161-
printf("data_gpio_nums[5]=%d\n", self->bus_config.data_gpio_nums[5]);
162-
printf("data_gpio_nums[6]=%d\n", self->bus_config.data_gpio_nums[6]);
163-
printf("data_gpio_nums[7]=%d\n", self->bus_config.data_gpio_nums[7]);
164-
printf("data_gpio_nums[8]=%d\n", self->bus_config.data_gpio_nums[8]);
165-
printf("data_gpio_nums[9]=%d\n", self->bus_config.data_gpio_nums[9]);
166-
printf("data_gpio_nums[10]=%d\n", self->bus_config.data_gpio_nums[10]);
167-
printf("data_gpio_nums[11]=%d\n", self->bus_config.data_gpio_nums[11]);
168-
printf("data_gpio_nums[12]=%d\n", self->bus_config.data_gpio_nums[12]);
169-
printf("data_gpio_nums[13]=%d\n", self->bus_config.data_gpio_nums[13]);
170-
printf("data_gpio_nums[14]=%d\n", self->bus_config.data_gpio_nums[14]);
171-
printf("data_gpio_nums[15]=%d\n", self->bus_config.data_gpio_nums[15]);
172-
printf("bus_width=%d\n", self->bus_config.bus_width);
173-
printf("cs_gpio_num=%d\n", self->panel_io_config.cs_gpio_num);
174-
printf("pclk_hz=%lu\n", self->panel_io_config.pclk_hz);
175-
printf("trans_queue_depth=%d\n", self->panel_io_config.trans_queue_depth);
176-
printf("dc_idle_level=%d\n", self->panel_io_config.dc_levels.dc_idle_level);
177-
printf("dc_cmd_level=%d\n", self->panel_io_config.dc_levels.dc_cmd_level);
178-
printf("dc_dummy_level=%d\n", self->panel_io_config.dc_levels.dc_dummy_level);
179-
printf("dc_data_level=%d\n", self->panel_io_config.dc_levels.dc_data_level);
180-
printf("cs_active_high=%d\n", self->panel_io_config.flags.cs_active_high);
181-
printf("reverse_color_bits=%d\n", self->panel_io_config.flags.reverse_color_bits);
182-
printf("pclk_active_neg=%d\n", self->panel_io_config.flags.pclk_active_neg);
183-
printf("pclk_idle_low=%d\n", self->panel_io_config.flags.pclk_idle_low);
184-
#endif
152+
LCD_DEBUG_PRINT("dc_gpio_num=%d\n", self->bus_config.dc_gpio_num)
153+
LCD_DEBUG_PRINT("wr_gpio_num=%d\n", self->bus_config.wr_gpio_num)
154+
LCD_DEBUG_PRINT("clk_src=%d\n", self->bus_config.clk_src)
155+
LCD_DEBUG_PRINT("data_gpio_nums[0]=%d\n", self->bus_config.data_gpio_nums[0])
156+
LCD_DEBUG_PRINT("data_gpio_nums[1]=%d\n", self->bus_config.data_gpio_nums[1])
157+
LCD_DEBUG_PRINT("data_gpio_nums[2]=%d\n", self->bus_config.data_gpio_nums[2])
158+
LCD_DEBUG_PRINT("data_gpio_nums[3]=%d\n", self->bus_config.data_gpio_nums[3])
159+
LCD_DEBUG_PRINT("data_gpio_nums[4]=%d\n", self->bus_config.data_gpio_nums[4])
160+
LCD_DEBUG_PRINT("data_gpio_nums[5]=%d\n", self->bus_config.data_gpio_nums[5])
161+
LCD_DEBUG_PRINT("data_gpio_nums[6]=%d\n", self->bus_config.data_gpio_nums[6])
162+
LCD_DEBUG_PRINT("data_gpio_nums[7]=%d\n", self->bus_config.data_gpio_nums[7])
163+
LCD_DEBUG_PRINT("data_gpio_nums[8]=%d\n", self->bus_config.data_gpio_nums[8])
164+
LCD_DEBUG_PRINT("data_gpio_nums[9]=%d\n", self->bus_config.data_gpio_nums[9])
165+
LCD_DEBUG_PRINT("data_gpio_nums[10]=%d\n", self->bus_config.data_gpio_nums[10])
166+
LCD_DEBUG_PRINT("data_gpio_nums[11]=%d\n", self->bus_config.data_gpio_nums[11])
167+
LCD_DEBUG_PRINT("data_gpio_nums[12]=%d\n", self->bus_config.data_gpio_nums[12])
168+
LCD_DEBUG_PRINT("data_gpio_nums[13]=%d\n", self->bus_config.data_gpio_nums[13])
169+
LCD_DEBUG_PRINT("data_gpio_nums[14]=%d\n", self->bus_config.data_gpio_nums[14])
170+
LCD_DEBUG_PRINT("data_gpio_nums[15]=%d\n", self->bus_config.data_gpio_nums[15])
171+
LCD_DEBUG_PRINT("bus_width=%d\n", self->bus_config.bus_width)
172+
LCD_DEBUG_PRINT("cs_gpio_num=%d\n", self->panel_io_config.cs_gpio_num)
173+
LCD_DEBUG_PRINT("pclk_hz=%lu\n", self->panel_io_config.pclk_hz)
174+
LCD_DEBUG_PRINT("trans_queue_depth=%d\n", self->panel_io_config.trans_queue_depth)
175+
LCD_DEBUG_PRINT("dc_idle_level=%d\n", self->panel_io_config.dc_levels.dc_idle_level)
176+
LCD_DEBUG_PRINT("dc_cmd_level=%d\n", self->panel_io_config.dc_levels.dc_cmd_level)
177+
LCD_DEBUG_PRINT("dc_dummy_level=%d\n", self->panel_io_config.dc_levels.dc_dummy_level)
178+
LCD_DEBUG_PRINT("dc_data_level=%d\n", self->panel_io_config.dc_levels.dc_data_level)
179+
LCD_DEBUG_PRINT("cs_active_high=%d\n", self->panel_io_config.flags.cs_active_high)
180+
LCD_DEBUG_PRINT("reverse_color_bits=%d\n", self->panel_io_config.flags.reverse_color_bits)
181+
LCD_DEBUG_PRINT("pclk_active_neg=%d\n", self->panel_io_config.flags.pclk_active_neg)
182+
LCD_DEBUG_PRINT("pclk_idle_low=%d\n", self->panel_io_config.flags.pclk_idle_low)
185183

186184
self->panel_io_handle.init = &i80_init;
187185
self->panel_io_handle.del = &i80_del;
@@ -193,9 +191,7 @@
193191

194192
mp_lcd_err_t i80_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap, uint8_t cmd_bits, uint8_t param_bits)
195193
{
196-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
197-
printf("i80_init(self, width=%i, height=%i, bpp=%i, buffer_size=%lu, rgb565_byte_swap=%i, cmd_bits=%i, param_bits=%i)\n", width, height, bpp, buffer_size, (uint8_t)rgb565_byte_swap, cmd_bits, param_bits);
198-
#endif
194+
LCD_DEBUG_PRINT("i80_init(self, width=%i, height=%i, bpp=%i, buffer_size=%lu, rgb565_byte_swap=%i, cmd_bits=%i, param_bits=%i)\n", width, height, bpp, buffer_size, (uint8_t)rgb565_byte_swap, cmd_bits, param_bits)
199195

200196
mp_lcd_i80_bus_obj_t *self = (mp_lcd_i80_bus_obj_t *)obj;
201197
self->rgb565_byte_swap = false;
@@ -208,11 +204,10 @@
208204
self->panel_io_config.lcd_param_bits = (int)param_bits;
209205
self->bus_config.max_transfer_bytes = (size_t)buffer_size;
210206

211-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
212-
printf("lcd_cmd_bits=%d\n", self->panel_io_config.lcd_cmd_bits);
213-
printf("lcd_param_bits=%d\n", self->panel_io_config.lcd_param_bits);
214-
printf("max_transfer_bytes=%d\n", self->bus_config.max_transfer_bytes);
215-
#endif
207+
LCD_DEBUG_PRINT("lcd_cmd_bits=%d\n", self->panel_io_config.lcd_cmd_bits)
208+
LCD_DEBUG_PRINT("lcd_param_bits=%d\n", self->panel_io_config.lcd_param_bits)
209+
LCD_DEBUG_PRINT("max_transfer_bytes=%d\n", self->bus_config.max_transfer_bytes)
210+
216211
esp_err_t ret = esp_lcd_new_i80_bus(&self->bus_config, &self->bus_handle);
217212

218213
if (ret != 0) {
@@ -231,9 +226,7 @@
231226

232227
mp_lcd_err_t i80_del(mp_obj_t obj)
233228
{
234-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
235-
printf("i80_del(self)\n");
236-
#endif
229+
LCD_DEBUG_PRINT("i80_del(self)\n")
237230

238231
mp_lcd_i80_bus_obj_t *self = (mp_lcd_i80_bus_obj_t *)obj;
239232

@@ -255,9 +248,7 @@
255248
mp_lcd_i80_bus_obj_t *self = (mp_lcd_i80_bus_obj_t *)obj;
256249
*lane_count = (uint8_t)self->bus_config.bus_width;
257250

258-
#if CONFIG_LCD_ENABLE_DEBUG_LOG
259-
printf("i80_get_lane_count(self)-> %d\n", (uint8_t)self->bus_config.bus_width);
260-
#endif
251+
LCD_DEBUG_PRINT("i80_get_lane_count(self)-> %d\n", (uint8_t)self->bus_config.bus_width)
261252

262253
return LCD_OK;
263254
}

0 commit comments

Comments
 (0)