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

- remove the usage of ancient PANIC macro
- remove the unused fahrenheit conversion code
- add proper detection and printouts of HAL errors

Core/Src/DNI.c

@@ -3,25 +3,23 @@
 #include "lcd.h"
 #include "DNI.h"
 
-static uint32_t DNI_read(void)
+static int DNI_read(void)
 {
 	HAL_ADC_Start(&hadc1);
-	if (HAL_ADC_PollForConversion(&hadc1, 100) != HAL_OK)
-		PANIC(0x4000);
 
+	HAL_StatusTypeDef s = HAL_ADC_PollForConversion(&hadc1, 100);
+
+	if (HAL_OK != s)
+		return -s;
+	else
 		return HAL_ADC_GetValue(&hadc1);
 }
 
-static int DNI_convert_to_celsius(uint32_t value)
+static int DNI_convert_to_celsius(int value)
 {
 	return (2512 - value) << 2;
 }
 
-static int DNI_convert_to_fahrenheit(uint32_t value)
-{
-	return (2953 - value) * 50 / 7;
-}
-
 static void DNI_print(int temperature)
 {
 	int add_sign = temperature < 0;
@@ -50,27 +48,48 @@ static void DNI_print(int temperature)
 	}
 
 	if (add_sign) {
-		DISPLAY_SET_CURSOR(1, 4);
+		DISPLAY_SET_CURSOR(1, 9);
 		display_write_data_byte('-');
 	}
 }
 
 static void DNI_print_celsius(int temperature)
 {
-	DISPLAY_SET_CURSOR(1, 10);
+	DISPLAY_SET_CURSOR(1, 15);
 	DISPLAY_SET_DECREMENT;
 	display_write_data_seq("C ");
 
 	DNI_print(temperature);
 }
 
-static void DNI_print_fahrenheit(int temperature)
+static void print_ok(void)
 {
-	DISPLAY_SET_CURSOR(1, 10);
-	DISPLAY_SET_DECREMENT;
-	display_write_data_seq("F ");
+	DISPLAY_SET_CURSOR(1, 4);
+	DISPLAY_SET_INCREMENT;
+	display_write_data_seq("OK");
+}
 
-	DNI_print(temperature);
+static void print_error(int err_code)
+{
+	DISPLAY_SET_CURSOR(1, 4);
+	DISPLAY_SET_INCREMENT;
+
+	switch (err_code) {
+	case HAL_OK:
+		break;
+	case HAL_ERROR:
+		display_write_data_seq("HAL_ERROR");
+		break;
+	case HAL_BUSY:
+		display_write_data_seq("HAL_BUSY");
+		break;
+	case HAL_TIMEOUT:
+		display_write_data_seq("HAL_TIMEOUT");
+		break;
+	default:
+		display_write_data_seq("WRONG ERROR");
+		break;
+	}
 }
 
 int DNI_show_celsius(void)
@@ -80,23 +99,17 @@ int DNI_show_celsius(void)
 
 	display_write_data_seq("DNI Temperature");
 
-	uint32_t value = DNI_read();
+	int value = DNI_read();
+
+	if (value < 0) {
+		print_error(-value);
+		return 1;
+	} else {
 		int temp = DNI_convert_to_celsius(value);
 		DNI_print_celsius(temp);
 
-	return 0;
-}
-
-int DNI_show_fahrenheit(void)
-{
-	DISPLAY_CLEAR;
-	DISPLAY_SET_INCREMENT;
-
-	display_write_data_seq("DNI Temperature");
-
-	uint32_t value = DNI_read();
-	int temp = DNI_convert_to_fahrenheit(value);
-	DNI_print_fahrenheit(temp);
+		print_ok();
 
 		return 0;
 	}
+}

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);
-  TIM2->CNT = 0;
-  HAL_TIM_Base_Stop(&htim2);
-
-  GPIOD->ODR = 0x1000;
+  GPIOD->BSRR = 0x1000;
   display_init();
 
-  GPIOD->ODR = 0xF000;
-  button_init_and_test();
+  GPIOD->BSRR = 0xF000;
 
   // 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_write_data_seq("P:");
+  DISPLAY_SET_CURSOR(1, 1);
+  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_write_data_seq("F:");
-  display_write_data_byte('0' + (failed_tests / 10) % 10);
-  display_write_data_byte('0' + (failed_tests) % 10);
+  DISPLAY_SET_CURSOR(1, 11);
+  display_write_data_byte('0' + (test_amount / 10) % 10);
+  display_write_data_byte('0' + test_amount % 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;