Browse Source

update

master
zhaohe 1 year ago
parent
commit
1faeb0b5bb
  1. 2
      .vscode
  2. 2
      sdk
  3. 2
      usrc/project_configs.h
  4. 4
      usrc/subboards/subboard40_and_50_temperature_ctrl/pri_board.h
  5. 6
      usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl_board.c
  6. 2
      usrc/subboards/subboard90_optical_module/optical_module_v2.cpp

2
.vscode

@ -1 +1 @@
Subproject commit 13b086073e8e162b38e929b9ef54f84c5425db0a
Subproject commit 5df2c93b8f8287996fe8e6c8e4d9eb1bf4b8971a

2
sdk

@ -1 +1 @@
Subproject commit 8a22b9f19f91e7b4d07956fdb86499f4ce50d36d
Subproject commit d5d5ce658e50035877728b13d3b6c21d0abefe92

2
usrc/project_configs.h

@ -1,5 +1,5 @@
#pragma once
#define PC_VERSION 400
#define PC_VERSION 401
#define PC_MANUFACTURER "http://www.iflytop.com/"
#define PC_PROJECT_NAME "a8000_subboard"
#define PC_IFLYTOP_ENABLE_OS 1

4
usrc/subboards/subboard40_and_50_temperature_ctrl/pri_board.h

@ -35,7 +35,7 @@
#define PELTIER_POLARITY false
#define TIMER2_FREQ 1000
#define TIMER1_FREQ 1000
#define ENABL_TRACE true
#define ENABL_TRACE false
#define FAN0_CFG \
{ \
@ -112,7 +112,7 @@
.freq = TIMER1_FREQ, \
.polarity = false, \
}, \
.in1_chnannel_index = 1, .in2 = PE11, .nsleep = PB2, .nfault = PB3, .sensePin = PB4, .shaft = !PELTIER_POLARITY, .enableTrace = ENABL_TRACE, \
.in1_chnannel_index = 1, .in2 = PE11, .nsleep = PB2, .nfault = PB3, .sensePin = PB4, .shaft = PELTIER_POLARITY, .enableTrace = ENABL_TRACE, \
}
#define PUMP_CFG \

6
usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl_board.c

@ -1,6 +1,5 @@
#include "main.h"
#include "public_service/public_service.h"
/* TIM2 init function */
void MX_TIM2_Init(void) {
__HAL_RCC_GPIOA_CLK_ENABLE();
@ -177,9 +176,10 @@ void subboard40_and_50_temperature_ctrl_board_init() {
}
void subboard40_and_50_temperature_ctrl_board_i2c_reset() {
printf("restart temperature sensor\n");
HAL_I2C_DeInit(&hi2c1);
__HAL_RCC_I2C1_CLK_DISABLE();
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6);
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7);
// HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6);
// HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7);
MX_I2C1_Init();
}

2
usrc/subboards/subboard90_optical_module/optical_module_v2.cpp

@ -588,7 +588,7 @@ int32_t OpticalModuleV2::reverse_capture_data() {
adc_capture_buf[i] = adc_capture_buf[adc_capture_point_num - i];
adc_capture_buf[adc_capture_point_num - i] = temp;
}
return 0;
// for (int32_t i = 0; i < adc_capture_point_num; i++) {
// adc_capture_buf_tmp_buf[i] = adc_capture_buf[adc_capture_point_num - i];
// }

Loading…
Cancel
Save