diff --git a/usrc/base_service/fpga_if.c b/usrc/base_service/fpga_if.c index c1239d6..4191dcf 100644 --- a/usrc/base_service/fpga_if.c +++ b/usrc/base_service/fpga_if.c @@ -34,18 +34,11 @@ void fpga_if_init() { // xs_gpio_init_as_input(&fpga_if.camera_sync_code_irq_io, fpga_if.camera_sync_code_irq_pin, kxs_gpio_pulldown, kxs_gpio_rising_irq, false); xs_gpio_init_as_input(&fpga_if.timecode_irq_io, fpga_if.timecode_irq_pin, kxs_gpio_pulldown, kxs_gpio_rising_irq, false); xs_gpio_init_as_input(&fpga_if.xsync_workstate_start_sig_irq_io, fpga_if.xsync_workstate_start_sig_irq_io_pin, kxs_gpio_pulldown, kxs_gpio_rising_and_falling_irq, false); - xs_gpio_init_as_output(&fpga_if.reset_pin_io, fpga_if.reset_pin, kxs_gpio_nopull, false, false); + xs_gpio_init_as_output(&fpga_if.reset_pin_io, fpga_if.reset_pin, kxs_gpio_pullup, false, false); xs_gpio_write(&fpga_if.reset_pin_io, false); xs_delay_us(1); xs_gpio_write(&fpga_if.reset_pin_io, true); - - // for (size_t i = 0; i < 4; i++) { - // xs_gpio_init_as_output(&fpga_if.timecode_add[i], fpga_if.timecode_add_pin[i], kxs_gpio_nopull, false, false); - // } - // for (size_t i = 0; i < 8; i++) { - // xs_gpio_init_as_input(&fpga_if.timecode_data[i], fpga_if.timecode_data_pin[i], kxs_gpio_nopull, kxs_gpio_no_irq, false); - // } #endif } /** diff --git a/usrc/main.cpp b/usrc/main.cpp index 3005fb4..322d86c 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -143,6 +143,12 @@ void umain() { osDelay(10); debug_light_ctrl(); factory_reset_key_detect(); + + // xs_gpio_write(&fpga_if.reset_pin_io, true); + // + // if (xs_has_passedms(0) >= 1* 60 * 60 * 1000) { + // NVIC_SystemReset(); + // } // ZLOGI(TAG,"factory_reset_key_state %d",xs_gpio_read(&m_factory_reset_key)); // osDelay(10); @@ -159,7 +165,6 @@ void umain() { // } // count++; - // ZLOGI(TAG, "fpga_if_init: %d", xs_gpio_read(&fpga_if_get_instance()->xsync_workstate_start_sig_irq_io)); // ZLOGI(TAG, "rxdata: %x", rxdata); }