|
@@ -349,7 +349,7 @@ int main(void)
|
|
|
/* USER CODE END WHILE */
|
|
/* USER CODE END WHILE */
|
|
|
|
|
|
|
|
/* USER CODE BEGIN 3 */
|
|
/* USER CODE BEGIN 3 */
|
|
|
- printf("deviceInfo.commandFromCloud:%02x\r\n",deviceInfo.commandFromCloud);
|
|
|
|
|
|
|
+ // printf("deviceInfo.commandFromCloud:%02x\r\n",deviceInfo.commandFromCloud);
|
|
|
// GPIO_PinState sosState = HAL_GPIO_ReadPin(SOS_KEY_GPIO_Port, SOS_KEY_Pin);
|
|
// GPIO_PinState sosState = HAL_GPIO_ReadPin(SOS_KEY_GPIO_Port, SOS_KEY_Pin);
|
|
|
// GPIO_PinState powerState = HAL_GPIO_ReadPin(JUGE_PIN_GPIO_Port, JUGE_PIN_Pin);
|
|
// GPIO_PinState powerState = HAL_GPIO_ReadPin(JUGE_PIN_GPIO_Port, JUGE_PIN_Pin);
|
|
|
//
|
|
//
|
|
@@ -835,11 +835,17 @@ static void MX_GPIO_Init(void)
|
|
|
/*Configure GPIO pin Output Level */
|
|
/*Configure GPIO pin Output Level */
|
|
|
HAL_GPIO_WritePin(PowerLED_GPIO_Port, PowerLED_Pin, GPIO_PIN_RESET);
|
|
HAL_GPIO_WritePin(PowerLED_GPIO_Port, PowerLED_Pin, GPIO_PIN_RESET);
|
|
|
|
|
|
|
|
- /*Configure GPIO pins : SOS_KEY_Pin JUGE_PIN_Pin */
|
|
|
|
|
- GPIO_InitStruct.Pin = SOS_KEY_Pin|JUGE_PIN_Pin;
|
|
|
|
|
|
|
+ /*Configure GPIO pin : SOS_KEY_Pin */
|
|
|
|
|
+ GPIO_InitStruct.Pin = SOS_KEY_Pin;
|
|
|
|
|
+ GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
|
|
|
|
|
+ GPIO_InitStruct.Pull = GPIO_PULLUP;
|
|
|
|
|
+ HAL_GPIO_Init(SOS_KEY_GPIO_Port, &GPIO_InitStruct);
|
|
|
|
|
+
|
|
|
|
|
+ /*Configure GPIO pin : JUGE_PIN_Pin */
|
|
|
|
|
+ GPIO_InitStruct.Pin = JUGE_PIN_Pin;
|
|
|
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
|
|
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
|
|
|
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
|
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
|
|
- HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
|
|
|
|
|
|
+ HAL_GPIO_Init(JUGE_PIN_GPIO_Port, &GPIO_InitStruct);
|
|
|
|
|
|
|
|
/*Configure GPIO pin : POWER_ON_Pin */
|
|
/*Configure GPIO pin : POWER_ON_Pin */
|
|
|
GPIO_InitStruct.Pin = POWER_ON_Pin;
|
|
GPIO_InitStruct.Pin = POWER_ON_Pin;
|