[main] add delay between possible screen changes to make user button usable

Core/Src/main.c

@@ -120,72 +120,6 @@ static void MX_I2S2_Init(void);
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
 
-static 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] = {
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_11},
-			{(uint32_t) GPIOA, (uint32_t) GPIO_PIN_15},
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_9},
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_6},
-			{(uint32_t) GPIOC, (uint32_t) 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((GPIO_TypeDef *) 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(300);
-	GPIOD->ODR = 0x2000;
-	HAL_Delay(300);
-	GPIOD->ODR = 0x4000;
-	HAL_Delay(300);
-	GPIOD->ODR = 0x8000;
-	HAL_Delay(300);
-
-	// waiting for all buttons to be released
-	WAIT_UNTIL_ALL_BUTTONS_RELEASED;
-	GPIOD->ODR = 0x0000;
-	HAL_Delay(200);
-}
-
 /* USER CODE END 0 */
 
 /**
@@ -224,20 +158,17 @@ int main(void)
   MX_I2S2_Init();
   /* USER CODE BEGIN 2 */
 
-  HAL_TIM_Base_Start(&htim2);
+  GPIOD->BSRR = 0x1000;
-  TIM2->CNT = 0;
-  HAL_TIM_Base_Stop(&htim2);
-
-  GPIOD->ODR = 0x1000;
   display_init();
 
-  GPIOD->ODR = 0xF000;
+  GPIOD->BSRR = 0xF000;
-  button_init_and_test();
 
   // perform all tests
   size_t successful_tests = 0;
   size_t failed_tests = 0;
 
+  const int test_amount = LEN(executors);
+
   for (display_current_frame = 1; display_current_frame < LEN(executors)+1; display_current_frame++)
   {
 	  DISPLAY_CLEAR;
@@ -280,17 +211,21 @@ int main(void)
   display_current_frame = 0;
 
   DISPLAY_CLEAR;
+  if (successful_tests == LEN(executors))
 	  display_write_data_seq("All tests done!");
+  else
+	  display_write_data_seq("Failures found!");
 
-  DISPLAY_SET_CURSOR(1, 2);
+  DISPLAY_SET_CURSOR(1, 1);
-  display_write_data_seq("P:");
+  display_write_data_seq("PASSED   /");
+
+  DISPLAY_SET_CURSOR(1, 8);
   display_write_data_byte('0' + (successful_tests / 10) % 10);
-  display_write_data_byte('0' + (successful_tests) % 10);
+  display_write_data_byte('0' + successful_tests % 10);
 
-  DISPLAY_SET_CURSOR(1, 10);
+  DISPLAY_SET_CURSOR(1, 11);
-  display_write_data_seq("F:");
+  display_write_data_byte('0' + (test_amount / 10) % 10);
-  display_write_data_byte('0' + (failed_tests / 10) % 10);
+  display_write_data_byte('0' + test_amount % 10);
-  display_write_data_byte('0' + (failed_tests) % 10);
 
   display_to_direct();
 
@@ -304,6 +239,8 @@ int main(void)
 	  display_load(display_current_frame);
 
 	  while (1) {
+		  HAL_Delay(15);
+
 		  // go to next report
 		  if (UB || SWT1 || SWT5) {
 			  display_current_frame += 1;