Merge pull request #1374 from openmv/rp2_dcmi_pio_updates

Rp2 dcmi pio updates
This commit is contained in:
Ibrahim Abd Elkader 2021-06-21 23:35:33 +02:00 committed by GitHub
commit 0d1fc25a25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 153 additions and 41 deletions

View File

@ -0,0 +1,110 @@
; This file is part of the OpenMV project.
;
; Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
; Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
;
; This work is licensed under the MIT license, see the file LICENSE for details.
; Image Sensor PIO program.
.define public PXCLK 29
.define public HSYNC 12
.define public VSYNC 13
.program dcmi_default
.wrap_target
pull block ; Read number of lines in OSR
mov y, osr ; Copy OSR to Y
pull block ; Read line width in bytes in OSR
wait 1 gpio VSYNC ; Wait for VSYNC to go low
wait 0 gpio VSYNC
HSYNC_LOOP:
mov x, osr ; Copy line width from OSR to X
wait 0 gpio HSYNC ; Wait for HSYNC to go high
wait 1 gpio HSYNC
PIXEL_LOOP:
wait 0 gpio PXCLK
wait 1 gpio PXCLK
in pins 7 ; Workaround for NANO noncontiguous data bus.
jmp pin SET_MSB
in null, 1
jmp DONE
SET_MSB:
in osr, 1 ; OSR always has an odd value (width - 1)
DONE:
jmp x-- PIXEL_LOOP ; Keep reading pixels while x != 0
jmp y-- HSYNC_LOOP ; Keep reading lines while y != 0
.wrap
.program dcmi_odd_byte
.wrap_target
pull block ; Read number of lines in OSR
mov y, osr ; Copy OSR to Y
pull block ; Read line width in bytes in OSR
wait 1 gpio VSYNC ; Wait for VSYNC to go low
wait 0 gpio VSYNC
HSYNC_LOOP:
mov x, osr ; Copy line width from OSR to X
wait 0 gpio HSYNC ; Wait for HSYNC to go high
wait 1 gpio HSYNC
PIXEL_LOOP:
wait 0 gpio PXCLK
wait 1 gpio PXCLK
in pins 7 ; Workaround for NANO noncontiguous data bus.
jmp pin SET_MSB
in null, 1
jmp DONE
SET_MSB:
in osr, 1 ; OSR always has an odd value (width - 1)
DONE:
wait 0 gpio PXCLK
wait 1 gpio PXCLK
jmp x-- PIXEL_LOOP ; Keep reading pixels while x != 0
jmp y-- HSYNC_LOOP ; Keep reading lines while y != 0
.wrap
% c-sdk {
static inline int dcmi_config(uint32_t pixformat)
{
uint offset;
pio_sm_config config;
pio_sm_set_enabled(DCMI_PIO, DCMI_SM, false);
pio_sm_clear_fifos(DCMI_PIO, DCMI_SM);
for(uint i=DCMI_D0_PIN; i<DCMI_D0_PIN+7; i++) {
pio_gpio_init(DCMI_PIO, i);
}
pio_sm_set_consecutive_pindirs(DCMI_PIO, DCMI_SM, DCMI_D0_PIN, 7, false);
if (pixformat == PIXFORMAT_GRAYSCALE) {
offset = pio_add_program(DCMI_PIO, &dcmi_odd_byte_program);
config = dcmi_odd_byte_program_get_default_config(offset);
} else {
offset = pio_add_program(DCMI_PIO, &dcmi_default_program);
config = dcmi_default_program_get_default_config(offset);
}
sm_config_set_clkdiv(&config, 1);
sm_config_set_in_pins(&config, DCMI_D0_PIN);
gpio_init(DCMI_D7_PIN);
gpio_set_dir(DCMI_D7_PIN, GPIO_IN);
sm_config_set_jmp_pin(&config, DCMI_D7_PIN);
sm_config_set_in_shift(&config, true, true, 32);
pio_sm_init(DCMI_PIO, DCMI_SM, offset, &config);
pio_sm_set_enabled(DCMI_PIO, DCMI_SM, true);
return 0;
}
%}

View File

@ -1,4 +1,4 @@
set(MICROPY_PY_SENSOR 0)
set(MICROPY_PY_SENSOR 1)
set(MICROPY_PY_ULAB 1)
set(MICROPY_PY_WINC1500 0)
set(MICROPY_PY_LWIP 0)

View File

@ -131,7 +131,7 @@ extern unsigned char *OMV_UNIQUE_ID_ADDR;
#define LCD_RST_PIN (4)
#define LCD_RST_PIN_WRITE(bit) gpio_put(LCD_RST_PIN, bit);
#define LCD_RS_PIN (25)
#define LCD_RS_PIN (0)
#define LCD_RS_PIN_WRITE(bit) gpio_put(LCD_RS_PIN, bit);
#define LCD_CS_PIN (5)
@ -164,7 +164,7 @@ extern unsigned char *OMV_UNIQUE_ID_ADDR;
#define DCMI_D4_PIN (19)
#define DCMI_D5_PIN (20)
#define DCMI_D6_PIN (21)
#define DCMI_D7_PIN (22) // This pin is missing
#define DCMI_D7_PIN (25) // MSB is read separately.
#define DCMI_XCLK_PIN (28)

View File

@ -19,17 +19,17 @@
wait 1 gpio VSYNC ; Wait for VSYNC to go low
wait 0 gpio VSYNC
line_loop:
HSYNC_LOOP:
mov x, osr ; Copy line width from OSR to X
wait 0 gpio HSYNC ; Wait for HSYNC to go high
wait 1 gpio HSYNC
pixels_loop:
PIXEL_LOOP:
wait 0 gpio PXCLK
wait 1 gpio PXCLK
in pins 8
jmp x-- pixels_loop ; Keep reading pixels while x != 0
jmp y-- line_loop ; Keep reading lines while y != 0
jmp x-- PIXEL_LOOP ; Keep reading pixels while x != 0
jmp y-- HSYNC_LOOP ; Keep reading lines while y != 0
.wrap
.program dcmi_odd_byte
@ -41,17 +41,48 @@ pixels_loop:
wait 1 gpio VSYNC ; Wait for VSYNC to go low
wait 0 gpio VSYNC
line_loop:
HSYNC_LOOP:
mov x, osr ; Copy line width from OSR to X
wait 0 gpio HSYNC ; Wait for HSYNC to go high
wait 1 gpio HSYNC
pixels_loop:
PIXEL_LOOP:
wait 0 gpio PXCLK
wait 1 gpio PXCLK
in pins 8
wait 0 gpio PXCLK
wait 1 gpio PXCLK
jmp x-- pixels_loop ; Keep reading pixels while x != 0
jmp y-- line_loop ; Keep reading lines while y != 0
jmp x-- PIXEL_LOOP ; Keep reading pixels while x != 0
jmp y-- HSYNC_LOOP ; Keep reading lines while y != 0
.wrap
% c-sdk {
static inline int dcmi_config(uint32_t pixformat)
{
uint offset;
pio_sm_config config;
pio_sm_set_enabled(DCMI_PIO, DCMI_SM, false);
pio_sm_clear_fifos(DCMI_PIO, DCMI_SM);
for(uint i=DCMI_D0_PIN; i<DCMI_D0_PIN+8; i++) {
pio_gpio_init(DCMI_PIO, i);
}
pio_sm_set_consecutive_pindirs(DCMI_PIO, DCMI_SM, DCMI_D0_PIN, 8, false);
if (pixformat == PIXFORMAT_GRAYSCALE) {
offset = pio_add_program(DCMI_PIO, &dcmi_odd_byte_program);
config = dcmi_odd_byte_program_get_default_config(offset);
} else {
offset = pio_add_program(DCMI_PIO, &dcmi_default_program);
config = dcmi_default_program_get_default_config(offset);
}
sm_config_set_clkdiv(&config, 1);
sm_config_set_in_pins(&config, DCMI_D0_PIN);
sm_config_set_in_shift(&config, true, true, 32);
pio_sm_init(DCMI_PIO, DCMI_SM, offset, &config);
pio_sm_set_enabled(DCMI_PIO, DCMI_SM, true);
return 0;
}
%}

View File

@ -183,7 +183,7 @@ if(MICROPY_PY_SENSOR)
# Generate DCMI PIO header
pico_generate_pio_header(${MICROPY_TARGET}
${TOP_DIR}/${OMV_DIR}/ports/${PORT}/dcmi.pio
${OMV_BOARD_CONFIG_DIR}/dcmi.pio
)
endif()

View File

@ -137,35 +137,6 @@ static void dma_config(int w, int h, int bpp, uint32_t *capture_buf, bool rev_by
dma_irqn_set_channel_enabled(DCMI_DMA, DCMI_DMA_CHANNEL, true);
}
static int dcmi_config(uint32_t pixformat)
{
uint offset;
pio_sm_config config;
pio_sm_set_enabled(DCMI_PIO, DCMI_SM, false);
pio_sm_clear_fifos(DCMI_PIO, DCMI_SM);
for(uint i=DCMI_D0_PIN; i<DCMI_D0_PIN+8; i++) {
pio_gpio_init(DCMI_PIO, i);
}
pio_sm_set_consecutive_pindirs(DCMI_PIO, DCMI_SM, DCMI_D0_PIN, 8, false);
if (pixformat == PIXFORMAT_GRAYSCALE) {
offset = pio_add_program(DCMI_PIO, &dcmi_odd_byte_program);
config = dcmi_odd_byte_program_get_default_config(offset);
} else {
offset = pio_add_program(DCMI_PIO, &dcmi_default_program);
config = dcmi_default_program_get_default_config(offset);
}
sm_config_set_clkdiv(&config, 1);
sm_config_set_in_pins(&config, DCMI_D0_PIN);
sm_config_set_in_shift(&config, true, true, 32);
pio_sm_init(DCMI_PIO, DCMI_SM, offset, &config);
pio_sm_set_enabled(DCMI_PIO, DCMI_SM, true);
return 0;
}
void dcmi_abort()
{
// Disable DMA channel