[main] remove explicit button test, leave LEDs on for the entire time

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

Core/Src/24AA02E48.c

@@ -13,9 +13,9 @@ int EEPROM_24AA02E48_run_test(void)
 	size_t err_count = 0;
 
 	// write the Address Pointer register
-	uint8_t data_buffer[13];
-	data_buffer[12] = '\0';
-	data_buffer[0] = 0xF4;
+	uint8_t data_buffer[9];
+	data_buffer[8] = '\0';
+	data_buffer[0] = 0xF8;
 
 	for (size_t t = 0; t < 5; t++) {
 		op_result = HAL_I2C_Master_Transmit(&hi2c1, 0xA0, data_buffer, 1, 2000);
@@ -26,7 +26,7 @@ int EEPROM_24AA02E48_run_test(void)
 			DISPLAY_CLEAR;
 			display_write_data_seq("24AA02E48 EEPROM");
 
-			DISPLAY_SET_CURSOR(1, 0);
+			DISPLAY_SET_CURSOR(1, 4);
 			display_write_data_seq("W ");
 			display_write_data_byte('1' + t);
 			display_write_data_seq("/5 ");
@@ -52,7 +52,7 @@ int EEPROM_24AA02E48_run_test(void)
 	}
 
 	for (size_t t = 0; t < 5; t++) {
-		op_result = HAL_I2C_Master_Receive(&hi2c1, 0xA1, data_buffer, 12, 2000);
+		op_result = HAL_I2C_Master_Receive(&hi2c1, 0xA1, data_buffer, 8, 2000);
 
 		if (op_result) {
 			err_count++;
@@ -60,7 +60,7 @@ int EEPROM_24AA02E48_run_test(void)
 			DISPLAY_CLEAR;
 			display_write_data_seq("24AA02E48 EEPROM");
 
-			DISPLAY_SET_CURSOR(1, 0);
+			DISPLAY_SET_CURSOR(1, 4);
 			display_write_data_seq("R ");
 			display_write_data_byte('1' + t);
 			display_write_data_seq("/5 ");
@@ -89,15 +89,15 @@ int EEPROM_24AA02E48_run_test(void)
 	display_write_data_seq("24AA02E48 EEPROM");
 
 	if (err_count) {
-		DISPLAY_SET_CURSOR(1, 0);
-		display_write_data_byte('0' + err_count / 10 % 10);
+		DISPLAY_SET_CURSOR(1, 4);
+		display_write_data_byte('0' + (err_count / 10) % 10);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq("E ");
 		display_write_data_seq((char *) data_buffer);
 
 		return 1;
 	} else {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK ");
 		display_write_data_seq((char *) data_buffer);
 

Core/Src/CS43L22.c

@@ -54,13 +54,13 @@ int CS43L22_run_test(void)
 	display_write_data_seq("CS43L22 Audio");
 
 	if (err_count) {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" Errors");
 
 		return 1;
 	} else {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 
 		return 0;

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);
 
-	return HAL_ADC_GetValue(&hadc1);
+	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, 0);
+		DISPLAY_SET_CURSOR(1, 9);
 		display_write_data_byte('-');
 	}
 }
 
 static void DNI_print_celsius(int temperature)
 {
-	DISPLAY_SET_CURSOR(1, 7);
+	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, 7);
-	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 temp = DNI_convert_to_celsius(value);
-	DNI_print_celsius(temp);
+	int value = DNI_read();
 
-	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);
-
-	return 0;
+	if (value < 0) {
+		print_error(-value);
+		return 1;
+	} else {
+		int temp = DNI_convert_to_celsius(value);
+		DNI_print_celsius(temp);
+
+		print_ok();
+
+		return 0;
+	}
 }

Core/Src/LIS302DL.c

@@ -33,7 +33,7 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
 	DISPLAY_CLEAR;
 	display_write_data_seq("LIS302DL Accel ");
 	display_write_data_seq(postfix);
-	DISPLAY_SET_CURSOR(1, 0);
+	DISPLAY_SET_CURSOR(1, 4);
 	display_write_data_seq(prefix);
 	display_write_data_byte(' ');
 
@@ -125,14 +125,14 @@ int LIS302DL_run_test(void)
 
 	// print the execution stats
 	if (err_count) {
-		DISPLAY_SET_CURSOR(1, 0);
-		display_write_data_byte('0' + err_count / 10 % 10);
+		DISPLAY_SET_CURSOR(1, 4);
+		display_write_data_byte('0' + (err_count / 10) % 10);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" errs");
 
 		return 1;
 	} else {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 
 		return 0;
@@ -152,23 +152,23 @@ int LIS302DL_run_test_dynamic(void)
 	DISPLAY_CLEAR;
 	display_write_data_seq("LIS302DL Accel D");
 
-	// output retrieved values
-	print_at(data_xyz[2], 14);
-	print_at(data_xyz[1], 11);
-	print_at(data_xyz[0], 8);
-
 	// print the execution stats
 	if (err_count) {
-		DISPLAY_SET_CURSOR(1, 0);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('0' + err_count / 10 % 10);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" errs");
 
 		return 1;
 	} else {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 
+		// output retrieved values
+		print_at(data_xyz[2], 14);
+		print_at(data_xyz[1], 11);
+		print_at(data_xyz[0], 8);
+
 		return 0;
 	}
 }

Core/Src/LSM9DS1.c

@@ -10,7 +10,7 @@ extern I2C_HandleTypeDef hi2c1;
 
 static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, size_t t, char *prefix)
 {
-	DISPLAY_SET_CURSOR(1, 0);
+	DISPLAY_SET_CURSOR(1, 4);
 	display_write_data_seq(prefix);
 	display_write_data_byte(' ');
 
@@ -82,12 +82,12 @@ int LSM9DS1_test_accel(void)
 	FAILSAFE_POST_OP_ACCEL("R");
 
 	if (!err_count) {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 
 		return 0;
 	} else {
-		DISPLAY_SET_CURSOR(1, 0);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('0' + ((err_count / 10) % 10));
 		display_write_data_byte('0' + (err_count % 10));
 		display_write_data_seq(" errors");
@@ -124,12 +124,12 @@ int LSM9DS1_test_magnet(void)
 	FAILSAFE_POST_OP_MAGNET("R");
 
 	if (!err_count) {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 
 		return 0;
 	} else {
-		DISPLAY_SET_CURSOR(1, 0);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('0' + ((err_count / 10) % 10));
 		display_write_data_byte('0' + (err_count % 10));
 		display_write_data_seq(" errors");

Core/Src/MP45DT02.c

@@ -22,12 +22,12 @@ int MP45DT02_run_test(void)
 				display_write_data_seq("MP45DT02 Mic");
 
 				if (!t) {
-					DISPLAY_SET_CURSOR(1, 1);
+					DISPLAY_SET_CURSOR(1, 4);
 					display_write_data_seq("OK");
 				} else {
-					DISPLAY_SET_CURSOR(1, 0);
+					DISPLAY_SET_CURSOR(1, 4);
 					display_write_data_byte('0' + t);
-					display_write_data_seq(" full 0 samples");
+					display_write_data_seq(" 0 samples");
 				}
 
 				return 0;
@@ -37,9 +37,9 @@ int MP45DT02_run_test(void)
 		DISPLAY_CLEAR;
 		display_write_data_seq("MP45DT02 Mic");
 
-		DISPLAY_SET_CURSOR(1, 0);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('1' + t);
-		display_write_data_seq("/5: no 1 sampled");
+		display_write_data_seq("/5: all zeros");
 
 		HAL_Delay(1000);
 	}
@@ -48,8 +48,8 @@ int MP45DT02_run_test(void)
 	DISPLAY_CLEAR;
 	display_write_data_seq("MP45DT02 Mic");
 
-	DISPLAY_SET_CURSOR(1, 0);
-	display_write_data_seq("No good samples!");
+	DISPLAY_SET_CURSOR(1, 4);
+	display_write_data_seq("NO ONES");
 
 	return 1;
 }

Core/Src/PCA9685.c

@@ -30,7 +30,7 @@ int PCA9685_run_test(void)
 
 				DISPLAY_CLEAR;
 				display_write_data_seq("PCA9685 PWM");
-				DISPLAY_SET_CURSOR(1, 0);
+				DISPLAY_SET_CURSOR(1, 4);
 
 				display_write_data_seq("B");
 				display_write_data_byte('0' + i);
@@ -64,14 +64,14 @@ int PCA9685_run_test(void)
 	display_write_data_seq("PCA9685 PWM");
 
 	if (err_count) {
-		DISPLAY_SET_CURSOR(1, 0);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('0' + err_count / 10 % 10);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" errors");
 
 		return 1;
 	} else {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 
 		return 0;

Core/Src/SST25VF016B.c

@@ -30,7 +30,7 @@ int SST25VF016B_run_test(void)
 			DISPLAY_CLEAR;
 			display_write_data_seq("SST25VF016B Flas");
 
-			DISPLAY_SET_CURSOR(1, 0);
+			DISPLAY_SET_CURSOR(1, 4);
 			display_write_data_byte('1' + t);
 			display_write_data_seq("/5 ");
 
@@ -58,7 +58,7 @@ int SST25VF016B_run_test(void)
 	display_write_data_seq("SST25VF016B Flas");
 
 	if (err_count) {
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" Errors");
 
@@ -67,7 +67,7 @@ int SST25VF016B_run_test(void)
 		for (size_t i = 0; i < 4; i += 2) {
 			// odd reads MUST result in 0xBF
 			if (rx_buffer[4+i] != 0xBF) {
-				DISPLAY_SET_CURSOR(1, 0);
+				DISPLAY_SET_CURSOR(1, 4);
 				display_write_data_byte('B');
 				display_write_data_byte('1'+i);
 				display_write_data_seq(" WRONG");
@@ -81,7 +81,7 @@ int SST25VF016B_run_test(void)
 		for (size_t i = 1; i < 4; i += 2) {
 			// even reads MUST result in 0x41
 			if (rx_buffer[4+i] != 0x41) {
-				DISPLAY_SET_CURSOR(1, 0);
+				DISPLAY_SET_CURSOR(1, 4);
 				display_write_data_byte('B');
 				display_write_data_byte('1'+i);
 				display_write_data_seq(" WRONG");
@@ -92,7 +92,7 @@ int SST25VF016B_run_test(void)
 			}
 		}
 
-		DISPLAY_SET_CURSOR(1, 1);
+		DISPLAY_SET_CURSOR(1, 4);
 		display_write_data_seq("OK");
 	}
 

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,15 +158,10 @@ 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;
@@ -265,6 +194,13 @@ int main(void)
 	  if (cleanup_functions[display_current_frame-1])
 		  cleanup_functions[display_current_frame-1]();
 
+	  // write test number tag onto this framebuffer
+	  DISPLAY_SET_CURSOR(1, 0);
+	  DISPLAY_SET_INCREMENT;
+	  display_write_data_byte('T');
+	  display_write_data_byte('0' + (display_current_frame / 10) % 10);
+	  display_write_data_byte('0' + display_current_frame % 10);
+
 	  display_to_direct();
   }
 
@@ -273,7 +209,10 @@ int main(void)
   display_current_frame = 0;
 
   DISPLAY_CLEAR;
-  display_write_data_seq("All tests done!");
+  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:");