add button test at the board startup, part 4

Core/Inc/dht11.h

@@ -1,30 +0,0 @@
-#ifndef __DHT11
-#define __DHT11
-
-#define SKIP_LOW while (!(GPIOD->IDR & 0x0800)) {}
-#define SKIP_HIGH while (GPIOD->IDR & 0x0800) {}
-
-#define FILL_REGISTER do { \
-	for (int i = 0; i < 8; i++) { \
-		read_register <<= 1; \
-		SKIP_LOW; \
-		read_register |= dht11_measure_high_duration(); \
-	} } while (0)
-
-struct SysTickConfig {
-	uint32_t ctrl;
-	uint32_t load;
-	uint32_t val;
-};
-
-struct DHT11_Data {
-	uint8_t humid_integral;
-	uint8_t humid_decimal;
-	uint8_t temp_integral;
-	uint8_t temp_decimal;
-	uint8_t crc;
-};
-
-void dht11_show_both(void);
-
-#endif

Core/Inc/stm32f4xx_it.h

@@ -55,9 +55,11 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
-void EXTI0_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
+void EXTI0_IRQHandler(void);
+void EXTI9_5_IRQHandler(void);
+
 /* USER CODE END EFP */
 
 #ifdef __cplusplus

Core/Src/dht11.c

@@ -1,101 +0,0 @@
-#include "main.h"
-#include "generic_macros.h"
-#include "dht11.h"
-
-static struct SysTickConfig stc;
-static uint32_t *systick_base = (uint32_t *) SysTick_BASE;
-
-static void wait(uint32_t wait_us)
-{
-	int target_time = *(systick_base+8);
-	target_time -= wait_us << 4;
-
-	while (*(systick_base+8) > target_time) {}
-}
-
-static void dht11_save_systick_state(void)
-{
-	stc.ctrl = *(systick_base + 0);
-	stc.load = *(systick_base + 4);
-	stc.val  = *(systick_base + 8);
-}
-
-static void dht11_load_systick_state(void)
-{
-	*(systick_base + 4) = stc.load;
-	*(systick_base + 8) = stc.val;
-	*(systick_base + 0) = stc.ctrl;
-}
-
-static void dht11_init_systick(void)
-{
-	dht11_save_systick_state();
-
-	*(systick_base + 0) = 0x5;      // disable /8 prescaler, no interrupts, enable counting
-	*(systick_base + 4) = 0xFFFFFF; // load largest possible value
-
-	// verify value load
-	if (*(systick_base + 8) == 0)
-		PANIC(0x4000);
-}
-
-static size_t dht11_measure_high_duration(void)
-{
-	int current_time = *(systick_base+8);
-	SKIP_HIGH;
-
-	// elapsed_time > 49us ? 1 : 0
-	return (current_time - *(systick_base+8)) > (49 << 4);
-}
-
-static void dht11_read_value(struct DHT11_Data *data)
-{
-	dht11_init_systick();
-
-	register uint8_t read_register = 0;
-
-	GPIOD->BSRR = GPIO_PIN_11;       // enable DHT11
-	wait(50000);                     // hold HIGH for 50 ms
-	GPIOD->BSRR = GPIO_PIN_11 << 16; // start signal
-	wait(30000);                     // hold it for 30 ms
-	GPIOD->BSRR = GPIO_PIN_11;       // pull up, DHT will now take control over the connection
-
-	// switch GPIOD 11 to input mode
-	GPIOD->MODER &= 0xFF3FFFFF;
-
-	// read transmission start sequence from DHT11
-	SKIP_HIGH;
-	SKIP_LOW;
-	SKIP_HIGH;
-
-	// read humidity integral
-	FILL_REGISTER;
-	data->humid_integral = read_register;
-
-	// read humidity decimal
-	FILL_REGISTER;
-	data->humid_decimal = read_register;
-
-	// read temperature integral
-	FILL_REGISTER;
-	data->temp_integral = read_register;
-
-	// read temperature decimal
-	FILL_REGISTER;
-	data->temp_decimal = read_register;
-
-	// read crc
-	FILL_REGISTER;
-	data->crc = read_register;
-
-	// switch GPIOD 11 back to output mode
-	GPIOD->MODER |= 0x00900000;
-
-	dht11_load_systick_state();
-}
-
-void dht11_show_both(void)
-{
-	struct DHT11_Data data;
-	dht11_read_value(&data);
-}

Core/Src/main.c

@@ -25,7 +25,6 @@
 #include "generic_macros.h"
 #include "lcd.h"
 #include "external_temp.h"
-#include "dht11.h"
 
 /* USER CODE END Includes */
 
@@ -50,12 +49,11 @@ ADC_HandleTypeDef hadc1;
 /* USER CODE BEGIN PV */
 
 void ((*executors[])(void)) = {
-		dht11_show_both,
 		external_temp_show_celsius,
 		external_temp_show_fahrenheit
 };
 
-int current_executor_id = 0;
+size_t current_executor_id = 0;
 
 /* USER CODE END PV */
 
@@ -70,6 +68,91 @@ static void MX_ADC1_Init(void);
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
 
+void button_init_and_test(void)
+{
+	// letting the buttons be tested
+	display_write_data_seq("Fill any bar:");
+	DISPLAY_SET_CURSOR(1, 5);
+	display_write_data_seq("[-] [-----]");
+
+	size_t pressed_elements;
+
+	uint32_t sw_button_locations[5][2] = {
+			{GPIOC, GPIO_PIN_11},
+			{GPIOA, GPIO_PIN_15},
+			{GPIOC, GPIO_PIN_9},
+			{GPIOC, GPIO_PIN_6},
+			{GPIOC, GPIO_PIN_8}
+	};
+
+	do {
+		HAL_Delay(100);
+		pressed_elements = 0;
+
+		DISPLAY_SET_CURSOR(1, 6);
+
+		if (HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_0)) {
+			pressed_elements |= 0x20;
+			display_write_data_byte('*');
+		} else {
+			display_write_data_byte('-');
+		}
+
+		DISPLAY_SET_CURSOR(1, 10);
+
+		for (size_t i = 0; i < 5; i++) {
+			pressed_elements >>= 1;
+
+			size_t input = !HAL_GPIO_ReadPin(sw_button_locations[i][0], sw_button_locations[i][1]);
+
+			if (input) {
+				pressed_elements |= 0x20;
+				display_write_data_byte('*');
+			} else {
+				display_write_data_byte('-');
+			}
+		}
+	} while (!(((pressed_elements & 0x1) == 0x1) || ((pressed_elements & 0x3E) == 0x3E)));
+
+
+	// visual reaction to bar fill
+	DISPLAY_SET_CURSOR(0, 0);
+	display_write_data_seq("Release buttons");
+
+	GPIOD->ODR = 0x1000;
+	HAL_Delay(500);
+	GPIOD->ODR = 0x2000;
+	HAL_Delay(500);
+	GPIOD->ODR = 0x4000;
+	HAL_Delay(500);
+	GPIOD->ODR = 0x8000;
+	HAL_Delay(500);
+
+	// waiting for control buttons to be released
+	while (HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_0) | !HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_8));
+	GPIOD->ODR = 0x0000;
+	HAL_Delay(500);
+
+	// switch mode for user button
+	GPIO_InitTypeDef GPIO_InitStruct = {0};
+	GPIO_InitStruct.Pin = GPIO_PIN_0;
+	GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+	GPIO_InitStruct.Pull = GPIO_NOPULL;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+	HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0);
+	HAL_NVIC_EnableIRQ(EXTI0_IRQn);
+
+	// switch mode for SW5 (alternative advancing method)
+	GPIO_InitStruct.Pin = GPIO_PIN_8;
+	GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+	GPIO_InitStruct.Pull = GPIO_NOPULL;
+	HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+	HAL_NVIC_SetPriority(EXTI9_5_IRQn, 0, 0);
+	HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
+}
+
 /* USER CODE END 0 */
 
 /**
@@ -104,10 +187,11 @@ int main(void)
   MX_ADC1_Init();
   /* USER CODE BEGIN 2 */
 
-  GPIOD->ODR = 0xF000;
+  GPIOD->ODR = 0x1000;
   display_init();
-  HAL_Delay(1000);
-  GPIOD->ODR = 0x0000;
+
+  GPIOD->ODR = 0xF000;
+  button_init_and_test();
 
   /* USER CODE END 2 */
 
@@ -233,18 +317,18 @@ static void MX_GPIO_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   __HAL_RCC_GPIOE_CLK_ENABLE();
   __HAL_RCC_GPIOD_CLK_ENABLE();
+  __HAL_RCC_GPIOC_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOE, GPIO_PIN_7|GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12
                           |GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOD, GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
-                          |GPIO_PIN_15, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOD, GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15, GPIO_PIN_RESET);
 
-  /*Configure GPIO pin : PA0 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0;
-  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+  /*Configure GPIO pins : PA0 PA15 */
+  GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_15;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
@@ -257,18 +341,18 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PD11 PD12 PD13 PD14
-                           PD15 */
-  GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
-                          |GPIO_PIN_15;
+  /*Configure GPIO pins : PD12 PD13 PD14 PD15 */
+  GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
-  /* EXTI interrupt init*/
-  HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(EXTI0_IRQn);
+  /*Configure GPIO pins : PC6 PC8 PC9 PC11 */
+  GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_11;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
 /* USER CODE BEGIN MX_GPIO_Init_2 */
 /* USER CODE END MX_GPIO_Init_2 */

Core/Src/stm32f4xx_it.c

@@ -41,9 +41,7 @@
 
 /* Private variables ---------------------------------------------------------*/
 /* USER CODE BEGIN PV */
-extern void ((*executors[])(void));
-extern void *current_executor(void);
-extern int current_executor_id;
+extern size_t current_executor_id;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -200,29 +198,34 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f4xx.s).                    */
 /******************************************************************************/
 
-/**
-  * @brief This function handles EXTI line0 interrupt.
-  */
+/* USER CODE BEGIN 1 */
+
 void EXTI0_IRQHandler(void)
 {
-  /* USER CODE BEGIN EXTI0_IRQn 0 */
-
 	GPIOD->ODR = 0x1000;
 
 	current_executor_id += 1;
-	current_executor_id &= 1;
+	current_executor_id %= 2;
 
 	for (int i = 900000; i > 0; i--) asm("nop");
 
 	GPIOD->ODR = 0x0000;
 
-  /* USER CODE END EXTI0_IRQn 0 */
-  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
-  /* USER CODE BEGIN EXTI0_IRQn 1 */
-
-  /* USER CODE END EXTI0_IRQn 1 */
+	HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
 }
 
-/* USER CODE BEGIN 1 */
+void EXTI9_5_IRQHandler(void)
+{
+	GPIOD->ODR = 0x1000;
+
+	current_executor_id += 1;
+	current_executor_id %= 2;
+
+	for (int i = 900000; i > 0; i--) asm("nop");
+
+	GPIOD->ODR = 0x0000;
+
+	HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_8);
+}
 
 /* USER CODE END 1 */

Debug/Core/Src/subdir.mk

@@ -5,8 +5,6 @@
 
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
-../Core/Src/dht11.c \
-../Core/Src/external-temperature.c \
 ../Core/Src/external_temp.c \
 ../Core/Src/lcd.c \
 ../Core/Src/main.c \
@@ -17,8 +15,6 @@ C_SRCS += \
 ../Core/Src/system_stm32f4xx.c 
 
 OBJS += \
-./Core/Src/dht11.o \
-./Core/Src/external-temperature.o \
 ./Core/Src/external_temp.o \
 ./Core/Src/lcd.o \
 ./Core/Src/main.o \
@@ -29,8 +25,6 @@ OBJS += \
 ./Core/Src/system_stm32f4xx.o 
 
 C_DEPS += \
-./Core/Src/dht11.d \
-./Core/Src/external-temperature.d \
 ./Core/Src/external_temp.d \
 ./Core/Src/lcd.d \
 ./Core/Src/main.d \
@@ -48,7 +42,7 @@ Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
 clean: clean-Core-2f-Src
 
 clean-Core-2f-Src:
-	-$(RM) ./Core/Src/dht11.cyclo ./Core/Src/dht11.d ./Core/Src/dht11.o ./Core/Src/dht11.su ./Core/Src/external-temperature.cyclo ./Core/Src/external-temperature.d ./Core/Src/external-temperature.o ./Core/Src/external-temperature.su ./Core/Src/external_temp.cyclo ./Core/Src/external_temp.d ./Core/Src/external_temp.o ./Core/Src/external_temp.su ./Core/Src/lcd.cyclo ./Core/Src/lcd.d ./Core/Src/lcd.o ./Core/Src/lcd.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/stm32f4xx_hal_msp.cyclo ./Core/Src/stm32f4xx_hal_msp.d ./Core/Src/stm32f4xx_hal_msp.o ./Core/Src/stm32f4xx_hal_msp.su ./Core/Src/stm32f4xx_it.cyclo ./Core/Src/stm32f4xx_it.d ./Core/Src/stm32f4xx_it.o ./Core/Src/stm32f4xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f4xx.cyclo ./Core/Src/system_stm32f4xx.d ./Core/Src/system_stm32f4xx.o ./Core/Src/system_stm32f4xx.su
+	-$(RM) ./Core/Src/external_temp.cyclo ./Core/Src/external_temp.d ./Core/Src/external_temp.o ./Core/Src/external_temp.su ./Core/Src/lcd.cyclo ./Core/Src/lcd.d ./Core/Src/lcd.o ./Core/Src/lcd.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/stm32f4xx_hal_msp.cyclo ./Core/Src/stm32f4xx_hal_msp.d ./Core/Src/stm32f4xx_hal_msp.o ./Core/Src/stm32f4xx_hal_msp.su ./Core/Src/stm32f4xx_it.cyclo ./Core/Src/stm32f4xx_it.d ./Core/Src/stm32f4xx_it.o ./Core/Src/stm32f4xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f4xx.cyclo ./Core/Src/system_stm32f4xx.d ./Core/Src/system_stm32f4xx.o ./Core/Src/system_stm32f4xx.su
 
 .PHONY: clean-Core-2f-Src
 

Debug/objects.list

@@ -1,5 +1,3 @@
-"./Core/Src/dht11.o"
-"./Core/Src/external-temperature.o"
 "./Core/Src/external_temp.o"
 "./Core/Src/lcd.o"
 "./Core/Src/main.o"

test1.ioc

@@ -24,11 +24,15 @@ Mcu.Name=STM32F407V(E-G)Tx
 Mcu.Package=LQFP100
 Mcu.Pin0=PA0-WKUP
 Mcu.Pin1=PB1
-Mcu.Pin10=PD12
-Mcu.Pin11=PD13
-Mcu.Pin12=PD14
-Mcu.Pin13=PD15
-Mcu.Pin14=VP_SYS_VS_Systick
+Mcu.Pin10=PD13
+Mcu.Pin11=PD14
+Mcu.Pin12=PD15
+Mcu.Pin13=PC6
+Mcu.Pin14=PC8
+Mcu.Pin15=PC9
+Mcu.Pin16=PA15
+Mcu.Pin17=PC11
+Mcu.Pin18=VP_SYS_VS_Systick
 Mcu.Pin2=PE7
 Mcu.Pin3=PE10
 Mcu.Pin4=PE11
@@ -36,8 +40,8 @@ Mcu.Pin5=PE12
 Mcu.Pin6=PE13
 Mcu.Pin7=PE14
 Mcu.Pin8=PE15
-Mcu.Pin9=PD11
-Mcu.PinsNb=15
+Mcu.Pin9=PD12
+Mcu.PinsNb=19
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F407VGTx
@@ -45,7 +49,6 @@ MxCube.Version=6.12.1
 MxDb.Version=DB.6.0.121
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -56,11 +59,19 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 PA0-WKUP.Locked=true
-PA0-WKUP.Signal=GPXTI0
+PA0-WKUP.Signal=GPIO_Input
+PA15.Locked=true
+PA15.Signal=GPIO_Input
 PB1.Locked=true
 PB1.Signal=ADCx_IN9
-PD11.Locked=true
-PD11.Signal=GPIO_Output
+PC11.Locked=true
+PC11.Signal=GPIO_Input
+PC6.Locked=true
+PC6.Signal=GPIO_Input
+PC8.Locked=true
+PC8.Signal=GPIO_Input
+PC9.Locked=true
+PC9.Signal=GPIO_Input
 PD12.Locked=true
 PD12.Signal=GPIO_Output
 PD13.Locked=true
@@ -143,8 +154,6 @@ RCC.VCOOutputFreq_Value=192000000
 RCC.VcooutputI2S=96000000
 SH.ADCx_IN9.0=ADC1_IN9,IN9
 SH.ADCx_IN9.ConfNb=1
-SH.GPXTI0.0=GPIO_EXTI0
-SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom