Browse Source

update

master
zhaohe 1 year ago
parent
commit
5ffcf21efa
  1. 2
      sdk
  2. 10
      usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl.cpp
  3. 8
      usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl_board.c
  4. 1
      usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl_board.h

2
sdk

@ -1 +1 @@
Subproject commit ad457de8fa7abf9ef99989db0f0f3cbc4ac9aeda
Subproject commit 78f92f9c25de63bcddeed80bfdd99e7aa47d8b6f

10
usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl.cpp

@ -51,13 +51,13 @@ void Subboard40And50TemperatureCtrl::initialize() {
static PumpCtrlModule pump;
static PeltierCtrlModule peltier;
temp[0].initializate(&hi2c1, TMP117::ID0);
temp[1].initializate(&hi2c1, TMP117::ID1);
temp[2].initializate(&hi2c1, TMP117::ID2);
temp[3].initializate(&hi2c1, TMP117::ID3);
temp[0].initializate(&hi2c1, subboard40_and_50_temperature_ctrl_board_i2c_reset, TMP117::ID0);
temp[1].initializate(&hi2c1, subboard40_and_50_temperature_ctrl_board_i2c_reset, TMP117::ID1);
temp[2].initializate(&hi2c1, subboard40_and_50_temperature_ctrl_board_i2c_reset, TMP117::ID2);
temp[3].initializate(&hi2c1, subboard40_and_50_temperature_ctrl_board_i2c_reset, TMP117::ID3);
for (size_t i = 0; i < 4; i++) {
ZLOGI(TAG, "temperature %d", i, temp[i].getTemperature());
ZLOGI(TAG, "temperature %d sensor is online %d", i, temp[i].isOnline());
}
if (getmoduleId(0) == 40) {

8
usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl_board.c

@ -174,3 +174,11 @@ void subboard40_and_50_temperature_ctrl_board_init() {
MX_TIM1_Init();
MX_I2C1_Init();
}
void subboard40_and_50_temperature_ctrl_board_i2c_reset() {
HAL_I2C_DeInit(&hi2c1);
__HAL_RCC_I2C1_CLK_DISABLE();
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6);
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7);
MX_I2C1_Init();
}

1
usrc/subboards/subboard40_and_50_temperature_ctrl/subboard40_and_50_temperature_ctrl_board.h

@ -6,6 +6,7 @@ extern "C" {
#endif
void subboard40_and_50_temperature_ctrl_board_init();
void subboard40_and_50_temperature_ctrl_board_i2c_reset();
#ifdef __cplusplus
}

Loading…
Cancel
Save