diff --git a/app/Core/Src/main.c b/app/Core/Src/main.c index acc02be..bd5a174 100644 --- a/app/Core/Src/main.c +++ b/app/Core/Src/main.c @@ -89,7 +89,7 @@ int main(void) /* Initialize all configured peripherals */ MX_GPIO_Init(); - MX_IWDG_Init(); + // MX_IWDG_Init(); MX_USART2_UART_Init(); MX_TIM4_Init(); MX_CAN_Init(); diff --git a/dep/libiflytop_micro b/dep/libiflytop_micro index 54dd371..8042a2a 160000 --- a/dep/libiflytop_micro +++ b/dep/libiflytop_micro @@ -1 +1 @@ -Subproject commit 54dd3712885f7322cf152f2eba87c7381fdcbe47 +Subproject commit 8042a2a995e30ddd2907d1f77059e3dd402d1f7d diff --git a/src/umain.cpp b/src/umain.cpp index 46d2b7a..19ba356 100644 --- a/src/umain.cpp +++ b/src/umain.cpp @@ -29,11 +29,11 @@ struct ad77681_init_param ADC_default_init_param = { /* Configuration */ .power_mode = AD77681_FAST, // power_mode .mclk_div = AD77681_MCLK_DIV_8, // mclk_div - .conv_mode = AD77681_CONV_CONTINUOUS, // conv_mode + .conv_mode = AD77681_CONV_CONTINUOUS, // conv_mode .diag_mux_sel = AD77681_POSITIVE_FS, // diag_mux_sel .conv_diag_sel = false, // conv_diag_sel .conv_len = AD77681_CONV_16BIT, // conv_len - .crc_sel = AD77681_CRC, // crc_sel + .crc_sel = AD77681_CRC, // crc_sel .status_bit = 0, // status_bit .VCM_out = AD77681_VCM_HALF_VCC, /* VCM setup*/ .AINn = AD77681_AINn_ENABLED, /* AIN- precharge buffer*/ @@ -59,6 +59,8 @@ void Main::generateScheduleTicket() { } } +void Main::adcslaveinit() {} + void Main::main(int argc, char const *argv[]) { sys_loggger_enable(true); ZLOGI(TAG, "setup") @@ -68,18 +70,27 @@ void Main::main(int argc, char const *argv[]) { m_hardware.output_switch_init(); PB12.initAsOutput(true); + HAL_Delay(1000); m_ad77681.initialize("ad77681", &m_hardware, &hspi2, &PB12, ADC_default_init_param); - uint8_t adc_data[5]; + +#if 0 + uint8_t adc_data[6]; + double voltage; while (1) { - m_ad77681.spi_read_adc_data(adc_data, AD77681_CONTINUOUS_DATA_READ); - printf("[ADC DATA]: 0x"); - for (int i = 0; i < sizeof(adc_data); i++) { - printf("%x", adc_data[i]); - } - printf("\r\n"); - HAL_Delay(1000); + m_ad77681.spi_read_adc_data(adc_data, AD77681_REGISTER_DATA_READ); + // m_ad77681.data_to_voltage((uint32_t *)adc_data, &voltage); + // printf("[ADC DATA]: 0x"); + // for (int i = 0; i < sizeof(adc_data); i++) { + // printf("%02x", adc_data[i]); + // } + // printf("\r\n"); + // printf("{plotter}%d\n", *(int32_t *)adc_data); + // printf("{plotter}%f\n", voltage); + + HAL_Delay(1); // HAL_IWDG_Refresh(&hiwdg); } +#endif while (true) { m_hardware.periodicJob(); @@ -89,6 +100,6 @@ void Main::main(int argc, char const *argv[]) { m_hardware.input_sensors_table_dump(0); } - // HAL_IWDG_Refresh(&hiwdg); + HAL_IWDG_Refresh(&hiwdg); } } diff --git a/src/umain.hpp b/src/umain.hpp index c4f1a76..1e6b808 100644 --- a/src/umain.hpp +++ b/src/umain.hpp @@ -29,10 +29,11 @@ class Main : public __class { public: Hardware m_hardware; - int32_t m_ticket; // 保证一个数一个数的递增,但不保证时间准确 + int32_t m_ticket; // 保证一个数一个数的递增,但不保证时间准确 Ad77681Impl m_ad77681; Main() {} + void adcslaveinit(); void main(int argc, char const *argv[]); private: