diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 2c6200a..93a2c3b 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,30 +3,32 @@ { "name": "app", "includePath": [ - "./app\\Core\\Inc", - "./app\\Drivers\\STM32F1xx_HAL_Driver\\Inc", - "./app\\Drivers\\STM32F1xx_HAL_Driver\\Inc\\Legacy", - "./app\\Drivers\\CMSIS\\Device\\ST\\STM32F1xx\\Include", - "./app\\Drivers\\CMSIS\\Include", - "./dep", - "./src", - "./app\\MDK-ARM", - "./app\\Core\\Src", - "./app\\Drivers\\STM32F1xx_HAL_Driver\\Src", - "./dep\\libiflytop_micro\\stm32\\basic", - "./dep\\libiflytop_micro\\stm32\\component\\pid", - "./dep\\libiflytop_micro\\stm32\\component\\iflytop_can_slave_v1", - "./dep\\libiflytop_micro\\stm32\\component\\motor_control", - "./dep\\libiflytop_micro\\stm32\\component\\iflytop_can_slave_module", - "./dep\\libiflytop_micro\\stm32\\component\\gxservo", - "./dep\\libiflytop_micro\\stm32\\component\\m3078", - "./dep\\libiflytop_micro\\stm32\\component\\pwm", - "./dep\\libiflytop_micro\\stm32\\component\\tmc\\ic\\TMC4361A", - "./dep\\libiflytop_micro\\stm32\\component\\tmc\\ic\\TMC5130", - "./dep\\libiflytop_micro\\stm32\\component\\tmc\\ic", - "./dep\\libiflytop_micro\\stm32\\component\\tmcutils", - "./dep\\libiflytop_micro\\stm32\\component\\tmp117", - "./src\\board" + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Core\\Inc", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Drivers\\STM32F1xx_HAL_Driver\\Inc", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Drivers\\STM32F1xx_HAL_Driver\\Inc\\Legacy", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Drivers\\CMSIS\\Device\\ST\\STM32F1xx\\Include", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Drivers\\CMSIS\\Include", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\src", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libtrinamic\\IFLYTOP-TMC-API", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\MDK-ARM", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Core\\Src", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\app\\Drivers\\STM32F1xx_HAL_Driver\\Src", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\basic", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\pid", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\iflytop_can_slave_v1", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\motor_control", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\iflytop_can_slave_module", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\gxservo", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\m3078", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\pwm", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\tmc\\ic\\TMC4361A", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\tmc\\ic\\TMC5130", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\tmc\\ic", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\tmcutils", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\tmp117", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\src\\board", + "d:\\workspace\\p_minhang_university_noise_detection\\sound_adc_capture\\dep\\libiflytop_micro\\stm32\\component\\analogdevicesinc\\ad77881" ], "defines": [ "USE_HAL_DRIVER", diff --git a/.vscode/keil-assistant.log b/.vscode/keil-assistant.log index 2361011..3b16d49 100644 --- a/.vscode/keil-assistant.log +++ b/.vscode/keil-assistant.log @@ -1,2 +1,2 @@ -[info] Log at : 2023/6/14|21:19:34|GMT+0800 +[info] Log at : 2023/6/25|09:54:12|GMT+0800 diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 61b9e11..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "files.associations": { - "compare": "cpp", - "system_error": "cpp", - "array": "cpp", - "functional": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp" - } -} \ No newline at end of file diff --git a/ADA4940.pdf b/ADA4940.pdf new file mode 100644 index 0000000..4ef8fde Binary files /dev/null and b/ADA4940.pdf differ diff --git a/app/MDK-ARM/app.uvprojx b/app/MDK-ARM/app.uvprojx index 24ac63c..f9de8a8 100644 --- a/app/MDK-ARM/app.uvprojx +++ b/app/MDK-ARM/app.uvprojx @@ -329,7 +329,7 @@ 1 0 0 - 3 + 6 9 1 1 @@ -964,6 +964,16 @@ 8 ..\..\src\board\hardwarelib.cpp + + ad77681.c + 1 + ..\..\dep\libiflytop_micro\stm32\component\analogdevicesinc\ad77881\ad77681.c + + + ad77681_impl.cpp + 8 + ..\..\dep\libiflytop_micro\stm32\component\analogdevicesinc\ad77881\ad77681_impl.cpp + diff --git a/dep/libiflytop_micro b/dep/libiflytop_micro index c0bdaba..708cb19 160000 --- a/dep/libiflytop_micro +++ b/dep/libiflytop_micro @@ -1 +1 @@ -Subproject commit c0bdaba2f2561fe2cc97c308ad5c3a9745302a91 +Subproject commit 708cb19c72f2960bee66cbd08cf61f21fbbfdce8 diff --git a/src/umain.cpp b/src/umain.cpp index d1465fe..fb60b75 100644 --- a/src/umain.cpp +++ b/src/umain.cpp @@ -17,6 +17,36 @@ int random(int max) { return SysTick->VAL % max; } /******************************************************************************* * MAIN * *******************************************************************************/ +struct ad77681_init_param ADC_default_init_param = { + /* SPI */ + // { + // .chip_select = AD77681_SPI_CS, + // .max_speed_hz = 1000000, + // .mode = NO_OS_SPI_MODE_3, + // .platform_ops = &spi_eng_platform_ops, + // .extra = (void*)&spi_eng_init_param, + // }, + /* Configuration */ + AD77681_FAST, // power_mode + AD77681_MCLK_DIV_8, // mclk_div + AD77681_CONV_CONTINUOUS, // conv_mode + AD77681_POSITIVE_FS, // diag_mux_sel + false, // conv_diag_sel + AD77681_CONV_16BIT, // conv_len + AD77681_CRC, // crc_sel + 0, // status_bit + AD77681_VCM_HALF_VCC, /* VCM setup*/ + AD77681_AINn_ENABLED, /* AIN- precharge buffer*/ + AD77681_AINp_ENABLED, /* AIN+ precharge buffer*/ + AD77681_BUFn_ENABLED, /* REF- buffer*/ + AD77681_BUFp_ENABLED, /* REF+ buffer*/ + AD77681_FIR, /* FIR Filter*/ + AD77681_SINC5_FIR_DECx32, /* Decimate by 32*/ + 0, /* OS ratio of SINC3*/ + 4096, /* Reference voltage*/ + 16384, /* MCLK in kHz*/ +}; + void Main::generateScheduleTicket() { static uint32_t lastTicket = 0; if (m_hardware.getTicket() != lastTicket) { @@ -33,6 +63,9 @@ void Main::main(int argc, char const *argv[]) { m_hardware.input_sensors_init(); m_hardware.output_switch_init(); + PB12.initAsOutput(true); + m_ad77681.initialize("ad77681", &m_hardware, &hspi1, &PB12, ADC_default_init_param); + while (true) { m_hardware.periodicJob(); m_hardware.debug_light_periodicJob(); diff --git a/src/umain.hpp b/src/umain.hpp index b859353..c4f1a76 100644 --- a/src/umain.hpp +++ b/src/umain.hpp @@ -18,6 +18,8 @@ #include "libiflytop_micro\stm32\component\iflytop_can_slave_module\single_axis_motor_control_v2.hpp" #include "libiflytop_micro\stm32\component\iflytop_can_slave_v1\iflytop_can_slave.hpp" #endif + +#include "libiflytop_micro\stm32\component\analogdevicesinc\ad77881\ad77681_impl.hpp" // namespace iflytop { @@ -28,6 +30,7 @@ class Main : public __class { Hardware m_hardware; int32_t m_ticket; // 保证一个数一个数的递增，但不保证时间准确 + Ad77681Impl m_ad77681; Main() {} void main(int argc, char const *argv[]); diff --git a/民航原理图.pdf b/民航原理图.pdf new file mode 100644 index 0000000..ad5a43a Binary files /dev/null and b/民航原理图.pdf differ diff --git a/民航版位图.pdf b/民航版位图.pdf new file mode 100644 index 0000000..6a8d970 Binary files /dev/null and b/民航版位图.pdf differ