p_minhang_university_noise_detection
/
sound_adc_capture
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

updatre

master
zhaohe 2 years ago
parent
19b6846662
commit
e62f3ea6c5
10 changed files with 75 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      .vscode/c_cpp_properties.json
  2. 2
      .vscode/keil-assistant.log
  3. 11
      .vscode/settings.json
  4. BIN
      ADA4940.pdf
  5. 12
      app/MDK-ARM/app.uvprojx
  6. 2
      dep/libiflytop_micro
  7. 33
      src/umain.cpp
  8. 3
      src/umain.hpp
  9. BIN
      民航原理图.pdf
  10. BIN
      民航版位图.pdf

50
.vscode/c_cpp_properties.json
View File

@ -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",

2
.vscode/keil-assistant.log
View File

@ -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

11
.vscode/settings.json
View File

@ -1,11 +0,0 @@
{
"files.associations": {
"compare": "cpp",
"system_error": "cpp",
"array": "cpp",
"functional": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp"
}
}

BIN
ADA4940.pdf
View File

12
app/MDK-ARM/app.uvprojx
View File

@ -329,7 +329,7 @@
<uC99>1</uC99>
<uGnu>0</uGnu>
<useXO>0</useXO>
<v6Lang>3</v6Lang>
<v6Lang>6</v6Lang>
<v6LangP>9</v6LangP>
<vShortEn>1</vShortEn>
<vShortWch>1</vShortWch>
@ -964,6 +964,16 @@
<FileType>8</FileType>
<FilePath>..\..\src\board\hardwarelib.cpp</FilePath>
</File>
<File>
<FileName>ad77681.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\dep\libiflytop_micro\stm32\component\analogdevicesinc\ad77881\ad77681.c</FilePath>
</File>
<File>
<FileName>ad77681_impl.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\..\dep\libiflytop_micro\stm32\component\analogdevicesinc\ad77881\ad77681_impl.cpp</FilePath>
</File>
</Files>
</Group>
<Group>

2
dep/libiflytop_micro

@ -1 +1 @@
Subproject commit c0bdaba2f2561fe2cc97c308ad5c3a9745302a91
Subproject commit 708cb19c72f2960bee66cbd08cf61f21fbbfdce8

33
src/umain.cpp
View File

@ -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();

3
src/umain.hpp
View File

@ -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[]);

BIN
民航原理图.pdf
View File

BIN
民航版位图.pdf
View File

Write Preview
Loading…
Cancel
Save