mitchell/wires
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to rev 1.1

Browse Source
This commit is contained in:
mitchell
2024-10-12 12:44:33 -05:00
parent fdef1f3a8b
commit b1d439d82e
11 changed files with 9088 additions and 9008 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Inc/main.h
+10 -8
View File
@@ -57,6 +57,8 @@ void Error_Handler(void);
/* USER CODE END EFP */
/* Private defines -----------------------------------------------------------*/
#define LED2_Pin GPIO_PIN_13
#define LED2_GPIO_Port GPIOC
#define LED3_Pin GPIO_PIN_0
#define LED3_GPIO_Port GPIOA
#define TX_Pin GPIO_PIN_2
@@ -79,20 +81,20 @@ void Error_Handler(void);
#define WIRE2_GPIO_Port GPIOB
#define WIRE1_Pin GPIO_PIN_10
#define WIRE1_GPIO_Port GPIOB
#define BUZZ_Pin GPIO_PIN_13
#define RELAY1_Pin GPIO_PIN_13
#define RELAY1_GPIO_Port GPIOB
#define RELAY2_Pin GPIO_PIN_14
#define RELAY2_GPIO_Port GPIOB
#define BUZZ_Pin GPIO_PIN_15
#define BUZZ_GPIO_Port GPIOB
#define LED4_Pin GPIO_PIN_14
#define LED4_GPIO_Port GPIOB
#define RELAY_Pin GPIO_PIN_15
#define RELAY_GPIO_Port GPIOB
#define HELP_BTN_Pin GPIO_PIN_8
#define HELP_BTN_GPIO_Port GPIOA
#define INT_Pin GPIO_PIN_10
#define INT_GPIO_Port GPIOA
#define LED1_Pin GPIO_PIN_8
#define LED4_Pin GPIO_PIN_8
#define LED4_GPIO_Port GPIOB
#define LED1_Pin GPIO_PIN_9
#define LED1_GPIO_Port GPIOB
#define LED2_Pin GPIO_PIN_9
#define LED2_GPIO_Port GPIOB
/* USER CODE BEGIN Private defines */
Core/Src/main.c
+19 -7
View File
@@ -324,16 +324,27 @@ static void MX_GPIO_Init(void)
/* USER CODE END MX_GPIO_Init_1 */
/* GPIO Ports Clock Enable */
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOF_CLK_ENABLE();
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(LED2_GPIO_Port, LED2_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOA, LED3_Pin|HELP_BTN_Pin|INT_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOB, BUZZ_Pin|LED4_Pin|RELAY_Pin|LED1_Pin
|LED2_Pin, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, RELAY1_Pin|RELAY2_Pin|BUZZ_Pin|LED4_Pin
|LED1_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin : LED2_Pin */
GPIO_InitStruct.Pin = LED2_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(LED2_GPIO_Port, &GPIO_InitStruct);
/*Configure GPIO pins : LED3_Pin HELP_BTN_Pin INT_Pin */
GPIO_InitStruct.Pin = LED3_Pin|HELP_BTN_Pin|INT_Pin;
@@ -354,10 +365,10 @@ static void MX_GPIO_Init(void)
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/*Configure GPIO pins : BUZZ_Pin LED4_Pin RELAY_Pin LED1_Pin
LED2_Pin */
GPIO_InitStruct.Pin = BUZZ_Pin|LED4_Pin|RELAY_Pin|LED1_Pin
|LED2_Pin;
/*Configure GPIO pins : RELAY1_Pin RELAY2_Pin BUZZ_Pin LED4_Pin
LED1_Pin */
GPIO_InitStruct.Pin = RELAY1_Pin|RELAY2_Pin|BUZZ_Pin|LED4_Pin
|LED1_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@@ -517,7 +528,8 @@ void set_relay_buzz(void)
if (relay_buzz != old_relay_buzz) {
old_relay_buzz = relay_buzz;
HAL_GPIO_WritePin(BUZZ_GPIO_Port, BUZZ_Pin, (relay_buzz >> BUZZ_BIT_IDX) & 1);
HAL_GPIO_WritePin(RELAY_GPIO_Port, RELAY_Pin, (relay_buzz >> RELAY_BIT_IDX) & 1);
HAL_GPIO_WritePin(RELAY1_GPIO_Port, RELAY1_Pin, (relay_buzz >> RELAY_BIT_IDX) & 1);
HAL_GPIO_WritePin(RELAY2_GPIO_Port, RELAY2_Pin, (relay_buzz >> RELAY_BIT_IDX) & 1);
}
}