.cproject

@@ -150,7 +150,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="Src/mock_lcd.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
 					</sourceEntries>
 				</configuration>

Core/Inc/24AA02E48.h

@@ -1,6 +1,6 @@
 #ifndef __EEPROM_24AA02E48
 #define __EEPROM_24AA02E48
 
-int EEPROM_24AA02E48_run_test(void);
+void EEPROM_24AA02E48_run_test(void);
 
 #endif

Core/Inc/CS43L22.h

@@ -1,7 +1,7 @@
 #ifndef __CS43L22
 #define __CS43L22
 
-int CS43L22_run_test(void);
+void CS43L22_run_test(void);
 void CS43L22_cleanup(void);
 
 #endif

Core/Inc/DNI.h

@@ -3,7 +3,7 @@
 
 extern ADC_HandleTypeDef hadc1;
 
-int DNI_show_celsius(void);
+void DNI_show_celsius(void);
-int DNI_show_fahrenheit(void);
+void DNI_show_fahrenheit(void);
 
 #endif

Core/Inc/LIS302DL.h

@@ -1,7 +1,7 @@
 #ifndef __LIS302DL
 #define __LIS302DL
 
-int LIS302DL_run_test(void);
+void LIS302DL_run_test(void);
-int LIS302DL_run_test_dynamic(void);
+void LIS302DL_run_test_dynamic(void);
 
 #endif

Core/Inc/LSM9DS1.h

@@ -1,8 +1,8 @@
 #ifndef __LSM9DS1
 #define __LSM9DS1
 
-int LSM9DS1_test_accel(void);
+void LSM9DS1_test_accel(void);
 void LSM9DS1_cleanup_accel(void);
-int LSM9DS1_test_magnet(void);
+void LSM9DS1_test_magnet(void);
 
 #endif

Core/Inc/MP45DT02.h

@@ -1,6 +1,6 @@
 #ifndef __MP45DT02
 #define __MP45DT02
 
-int MP45DT02_run_test(void);
+void MP45DT02_run_test(void);
 
 #endif

Core/Inc/PCA9685.h

@@ -1,7 +1,7 @@
 #ifndef __PCA9685
 #define __PCA9685
 
-int PCA9685_run_test(void);
+void PCA9685_run_test(void);
 void PCA9685_cleanup(void);
 
 #endif

Core/Inc/SST25VF016B.h

@@ -1,6 +1,6 @@
 #ifndef __SST25VF016B
 #define __SST25VF016B
 
-int SST25VF016B_run_test(void);
+void SST25VF016B_run_test(void);
 
 #endif

Core/Inc/lcd.h

@@ -7,8 +7,6 @@
 #define DISPLAY_RW  ((uint16_t) (0x1U << 10))
 #define DISPLAY_ENA ((uint16_t) (0x1U << 11))
 
-#define DISPLAY_FRAMES_AVAILABLE 14
-
 #define DISPLAY_POLL_UNTIL_READY do { while (display_read_status() & 0x80) {} } while (0)
 
 #define DISPLAY_SET_INCREMENT do { display_write_instruction_byte(0x06); } while (0)
@@ -18,17 +16,11 @@
 
 #define DISPLAY_CLEAR do { display_write_instruction_byte(0x01); } while (0)
 
-struct Display_emu_state {
-	size_t cursor_offset:5;
-	size_t next:1;
-};
 
 void display_init(void);
+uint8_t display_read_status(void);
 void display_write_instruction_byte(uint8_t code);
 void display_write_data_byte(uint8_t code);
 void display_write_data_seq(char *codes);
-void display_to_framebuffer(void);
-void display_to_direct(void);
-void display_load(uint32_t frame_no);
 
 #endif

Core/Inc/main.h

@@ -32,8 +32,6 @@ extern "C" {
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
-#include <string.h>
-
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/

Core/Src/24AA02E48.c

@@ -4,7 +4,7 @@
 
 extern I2C_HandleTypeDef hi2c1;
 
-int EEPROM_24AA02E48_run_test(void)
+void EEPROM_24AA02E48_run_test(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("24AA02E48 EEPROM");
@@ -94,13 +94,9 @@ int EEPROM_24AA02E48_run_test(void)
 		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_write_data_seq("OK ");
 		display_write_data_seq((char *) data_buffer);
-
-		return 0;
 	}
 }

Core/Src/CS43L22.c

@@ -4,7 +4,7 @@
 
 extern I2C_HandleTypeDef hi2c1;
 
-int CS43L22_run_test(void)
+void CS43L22_run_test(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("CS43L22 Audio");
@@ -57,13 +57,9 @@ int CS43L22_run_test(void)
 		DISPLAY_SET_CURSOR(1, 1);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" Errors");
-
-		return 1;
 	} else {
 		DISPLAY_SET_CURSOR(1, 1);
 		display_write_data_seq("OK");
-
-		return 0;
 	}
 }
 

Core/Src/DNI.c

@@ -73,7 +73,7 @@ static void DNI_print_fahrenheit(int temperature)
 	DNI_print(temperature);
 }
 
-int DNI_show_celsius(void)
+void DNI_show_celsius(void)
 {
 	DISPLAY_CLEAR;
 	DISPLAY_SET_INCREMENT;
@@ -83,11 +83,9 @@ int DNI_show_celsius(void)
 	uint32_t value = DNI_read();
 	int temp = DNI_convert_to_celsius(value);
 	DNI_print_celsius(temp);
-
-	return 0;
 }
 
-int DNI_show_fahrenheit(void)
+void DNI_show_fahrenheit(void)
 {
 	DISPLAY_CLEAR;
 	DISPLAY_SET_INCREMENT;
@@ -97,6 +95,4 @@ int DNI_show_fahrenheit(void)
 	uint32_t value = DNI_read();
 	int temp = DNI_convert_to_fahrenheit(value);
 	DNI_print_fahrenheit(temp);
-
-	return 0;
 }

Core/Src/LIS302DL.c

@@ -105,7 +105,7 @@ static void retrieve_data(size_t *err_count, uint8_t *data_xyz, char *postfix)
 	FAILSAFE_POST_OP("RZ");
 }
 
-int LIS302DL_run_test(void)
+void LIS302DL_run_test(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("LIS302DL Accel");
@@ -129,17 +129,13 @@ int LIS302DL_run_test(void)
 		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_write_data_seq("OK");
-
-		return 0;
 	}
 }
 
-int LIS302DL_run_test_dynamic(void)
+void LIS302DL_run_test_dynamic(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("LIS302DL Accel D");
@@ -163,12 +159,8 @@ int LIS302DL_run_test_dynamic(void)
 		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_write_data_seq("OK");
-
-		return 0;
 	}
 }

Core/Src/LSM9DS1.c

@@ -52,7 +52,7 @@ static void print_error_magnet(HAL_StatusTypeDef result, size_t *err_count, size
 	print_error_message(result, err_count, t, prefix);
 }
 
-int LSM9DS1_test_accel(void)
+void LSM9DS1_test_accel(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("LSM9DS1 Accel");
@@ -84,15 +84,11 @@ int LSM9DS1_test_accel(void)
 	if (!err_count) {
 		DISPLAY_SET_CURSOR(1, 1);
 		display_write_data_seq("OK");
-
-		return 0;
 	} else {
 		DISPLAY_SET_CURSOR(1, 0);
 		display_write_data_byte('0' + ((err_count / 10) % 10));
 		display_write_data_byte('0' + (err_count % 10));
 		display_write_data_seq(" errors");
-
-		return 1;
 	}
 }
 
@@ -103,7 +99,7 @@ void LSM9DS1_cleanup_accel(void)
 	HAL_I2C_Master_Transmit(&hi2c1, 0xD6, buffer, 2, 1000);
 }
 
-int LSM9DS1_test_magnet(void)
+void LSM9DS1_test_magnet(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("LSM9DS1 Magnet");
@@ -126,14 +122,10 @@ int LSM9DS1_test_magnet(void)
 	if (!err_count) {
 		DISPLAY_SET_CURSOR(1, 1);
 		display_write_data_seq("OK");
-
-		return 0;
 	} else {
 		DISPLAY_SET_CURSOR(1, 0);
 		display_write_data_byte('0' + ((err_count / 10) % 10));
 		display_write_data_byte('0' + (err_count % 10));
 		display_write_data_seq(" errors");
-
-		return 1;
 	}
 }

Core/Src/MP45DT02.c

@@ -6,7 +6,7 @@
 
 extern I2S_HandleTypeDef hi2s2;
 
-int MP45DT02_run_test(void)
+void MP45DT02_run_test(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("MP45DT02 Mic");
@@ -30,7 +30,7 @@ int MP45DT02_run_test(void)
 					display_write_data_seq(" full 0 samples");
 				}
 
-				return 0;
+				return;
 			}
 
 		// if ended up here, then no samples equaled to 1; that is not a good sign
@@ -50,6 +50,4 @@ int MP45DT02_run_test(void)
 
 	DISPLAY_SET_CURSOR(1, 0);
 	display_write_data_seq("No good samples!");
-
-	return 1;
 }

Core/Src/PCA9685.c

@@ -4,7 +4,7 @@
 
 extern I2C_HandleTypeDef hi2c1;
 
-int PCA9685_run_test(void)
+void PCA9685_run_test(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("PCA9685 PWM");
@@ -68,13 +68,9 @@ int PCA9685_run_test(void)
 		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_write_data_seq("OK");
+		display_write_data_seq("OK  OUT ENABLED");
-
-		return 0;
 	}
 }
 

Core/Src/SST25VF016B.c

@@ -4,14 +4,13 @@
 
 extern SPI_HandleTypeDef hspi1;
 
-int SST25VF016B_run_test(void)
+void SST25VF016B_run_test(void)
 {
 	DISPLAY_CLEAR;
 	display_write_data_seq("SST25VF016B Flas");
 
 	HAL_StatusTypeDef op_result;
 	size_t err_count = 0;
-	size_t chip_id_fault = 0;
 
 	uint8_t tx_buffer[8] = {0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 	uint8_t rx_buffer[9];
@@ -47,6 +46,8 @@ int SST25VF016B_run_test(void)
 				display_write_data_seq("TIMEOUT");
 				break;
 			}
+
+			HAL_Delay(2000);
 		} else {
 			break;
 		}
@@ -61,8 +62,6 @@ int SST25VF016B_run_test(void)
 		DISPLAY_SET_CURSOR(1, 1);
 		display_write_data_byte('0' + err_count % 10);
 		display_write_data_seq(" Errors");
-
-		return 1;
 	} else {
 		for (size_t i = 0; i < 4; i += 2) {
 			// odd reads MUST result in 0xBF
@@ -71,9 +70,6 @@ int SST25VF016B_run_test(void)
 				display_write_data_byte('B');
 				display_write_data_byte('1'+i);
 				display_write_data_seq(" WRONG");
-
-				chip_id_fault = 1;
-
 				goto write_retrieved_data;
 			}
 		}
@@ -85,9 +81,6 @@ int SST25VF016B_run_test(void)
 				display_write_data_byte('B');
 				display_write_data_byte('1'+i);
 				display_write_data_seq(" WRONG");
-
-				chip_id_fault = 1;
-
 				goto write_retrieved_data;
 			}
 		}
@@ -101,6 +94,4 @@ int SST25VF016B_run_test(void)
 	display_write_data_seq((char *) &(rx_buffer[4]));
 
 	HAL_GPIO_WritePin(GPIOD, GPIO_PIN_7, GPIO_PIN_SET);
-
-	return (err_count || chip_id_fault);
 }

Core/Src/lcd.c

@@ -2,45 +2,22 @@
 #include "lcd.h"
 #include "generic_macros.h"
 
-static char display_framebuffer[16*2*DISPLAY_FRAMES_AVAILABLE];
-size_t display_current_frame;
-static size_t display_framebuffer_mode;
-
-static struct Display_emu_state des;
-
 void display_init(void)
 {
-	// prepare virtual framebuffer
-	display_current_frame = 0;
-	display_framebuffer_mode = 0;
-	des.cursor_offset = 0;
-	des.next = 0;
-	memset(display_framebuffer, 0x20, 16*2*DISPLAY_FRAMES_AVAILABLE);
-
 	// switch to 4-bit 2-line mode
-	display_write_instruction_byte(0x28);
+	  display_write_instruction_byte(0x28);
 
-	// clear display
+	  // clear display
-	display_write_instruction_byte(0x01);
+	  display_write_instruction_byte(0x01);
 
-	// enable display
+	  // enable display
-	display_write_instruction_byte(0x0C);
+	  display_write_instruction_byte(0x0C);
 
-	// move cursor to first line
+	  // move cursor to first line
-	display_write_instruction_byte(0x80);
+	  display_write_instruction_byte(0x80);
 }
 
-void display_to_framebuffer(void)
+uint8_t display_read_status(void)
-{
-	display_framebuffer_mode = 1;
-}
-
-void display_to_direct(void)
-{
-	display_framebuffer_mode = 0;
-}
-
-static uint8_t display_read_status(void)
 {
 	// make sure GPIOE is in correct mode
 	GPIOE->MODER = 0x00504000;
@@ -66,7 +43,7 @@ static uint8_t display_read_status(void)
 	return status;
 }
 
-static void display_write_instruction_byte_direct(uint8_t code)
+void display_write_instruction_byte(uint8_t code)
 {
 	DISPLAY_POLL_UNTIL_READY;
 
@@ -85,37 +62,7 @@ static void display_write_instruction_byte_direct(uint8_t code)
 	GPIOE->BSRR = (DISPLAY_ENA << 16);
 }
 
-static void display_write_instruction_byte_framebuffer(uint8_t code)
+void display_write_data_byte(uint8_t code)
-{
-	// emulate physical display behavior on receiving instructions
-	if (code & 0x80) {
-		// decode new cursor offset
-		size_t offset = ((code & 0x40) >> 2) | (code & 0xF);
-		des.cursor_offset = offset;
-	} else if (code == 0x01) {
-		// reset screen
-		memset(&(display_framebuffer[16*2*display_current_frame]), 0x20, 16*2);
-		des.cursor_offset = 0;
-		des.next = 0;
-	} else if (code == 0x06) {
-		// set increment mode
-		des.next = 0;
-	} else if (code == 0x04) {
-		// set decrement mode
-		des.next = 1;
-	}
-}
-
-void display_write_instruction_byte(uint8_t code)
-{
-	if (display_framebuffer_mode) {
-		display_write_instruction_byte_framebuffer(code);
-	} else {
-		display_write_instruction_byte_direct(code);
-	}
-}
-
-static void display_write_data_byte_direct(uint8_t code)
 {
 	DISPLAY_POLL_UNTIL_READY;
 
@@ -134,51 +81,12 @@ static void display_write_data_byte_direct(uint8_t code)
 	GPIOE->BSRR = DISPLAY_ENA << 16;
 }
 
-static void display_write_data_byte_framebuffer(uint8_t code)
-{
-	if (display_current_frame >= DISPLAY_FRAMES_AVAILABLE)
-		return;
-
-	if (((int) des.cursor_offset >= 32) || ((int) des.cursor_offset < 0))
-		return;
-
-	display_framebuffer[16*2*display_current_frame + des.cursor_offset] = (char) code;
-	des.cursor_offset += des.next ? -1 : 1;
-}
-
-void display_write_data_byte(uint8_t code)
-{
-	if (display_framebuffer_mode) {
-		display_write_data_byte_framebuffer(code);
-	} else {
-		display_write_data_byte_direct(code);
-	}
-}
-
 void display_write_data_seq(char *codes)
 {
 	for (size_t i = 0; i < 16; i++) {
-		if (codes[i])
+		if (codes[i] != 0)
 			display_write_data_byte(codes[i]);
 		else
 			break;
 	}
 }
-
-void display_load(uint32_t frame_no)
-{
-	if (display_framebuffer_mode)
-		return;
-
-	DISPLAY_CLEAR;
-
-	for (uint32_t i = 0; i < 16; i++) {
-		display_write_data_byte_direct(display_framebuffer[16*2*display_current_frame + i]);
-	}
-
-	DISPLAY_SET_CURSOR(1, 0);
-
-	for (uint32_t i = 0; i < 16; i++) {
-		display_write_data_byte_direct(display_framebuffer[16*2*display_current_frame + i + 16]);
-	}
-}

Core/Src/main.c

@@ -30,6 +30,7 @@
 #include "CS43L22.h"
 #include "SST25VF016B.h"
 #include "LIS302DL.h"
+#include "DHT11.h"
 #include "MP45DT02.h"
 #include "LSM9DS1.h"
 
@@ -46,17 +47,6 @@
 #define WAIT_UNTIL_CB_PRESSED while (!HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_0) && HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_8))
 #define WAIT_UNTIL_CB_RELEASED while (HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_0) || !HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_8))
 
-#define UB (GPIOA->IDR & GPIO_PIN_0)
-#define SWT1 !(GPIOC->IDR & GPIO_PIN_11)
-#define SWT2 !(GPIOA->IDR & GPIO_PIN_15)
-#define SWT3 !(GPIOC->IDR & GPIO_PIN_9)
-#define SWT4 !(GPIOC->IDR & GPIO_PIN_6)
-#define SWT5 !(GPIOC->IDR & GPIO_PIN_8)
-
-#define WAIT_UNTIL_ALL_BUTTONS_RELEASED do {} while ( UB || SWT1 || SWT2 || SWT3 || SWT4 || SWT5 )
-
-#define LEN(x) ( sizeof(x) / sizeof((x)[0]) )
-
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -75,23 +65,24 @@ SPI_HandleTypeDef hspi1;
 
 TIM_HandleTypeDef htim2;
 
-extern size_t display_current_frame;
-
 /* USER CODE BEGIN PV */
 
-static const int ((*executors[])(void)) = {
+void ((*executors[])(void)) = {
 		DNI_show_celsius,
+		DNI_show_fahrenheit,
 		PCA9685_run_test,
 		EEPROM_24AA02E48_run_test,
 		CS43L22_run_test,
 		SST25VF016B_run_test,
 		LIS302DL_run_test,
+		LIS302DL_run_test_dynamic,
 		MP45DT02_run_test,
 		LSM9DS1_test_accel,
 		LSM9DS1_test_magnet
 };
 
-static const void ((*cleanup_functions[])(void)) = {
+void ((*cleanup_functions[])(void)) = {
+		NULL,
 		NULL,
 		PCA9685_cleanup,
 		NULL,
@@ -99,10 +90,29 @@ static const void ((*cleanup_functions[])(void)) = {
 		NULL,
 		NULL,
 		NULL,
+		NULL,
 		LSM9DS1_cleanup_accel,
 		NULL
 };
 
+int delay_between_runs[] = {
+		250,
+		250,
+		-1,
+		-1,
+		-1,
+		-1,
+		-1,
+		200,
+		-1,
+		-1,
+		-1
+		};
+
+size_t current_executor_id = 0;
+
+size_t buttons_interrupt_enabled;
+
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -120,7 +130,67 @@ static void MX_I2S2_Init(void);
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
 
-static void button_init_and_test(void)
+void switch_to_next_test(void)
+{
+	current_executor_id += 1;
+	current_executor_id %= 11;
+}
+
+void buttons_switch_to_interrupt(void)
+{
+	// save current executor ID
+	size_t tmp = current_executor_id;
+
+	// configure 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);
+
+	// configure 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);
+
+	// restore current executor ID
+	current_executor_id = tmp;
+
+	// set interrupt mode flag
+	buttons_interrupt_enabled = 1;
+}
+
+void buttons_switch_to_input(void)
+{
+	// configure user button
+	GPIO_InitTypeDef GPIO_InitStruct = {0};
+	GPIO_InitStruct.Pin = GPIO_PIN_0;
+	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	GPIO_InitStruct.Pull = GPIO_NOPULL;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+	HAL_NVIC_DisableIRQ(EXTI0_IRQn);
+
+	// configure SW5 (alternative input method)
+	GPIO_InitStruct.Pin = GPIO_PIN_8;
+	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	GPIO_InitStruct.Pull = GPIO_NOPULL;
+	HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+	HAL_NVIC_DisableIRQ(EXTI9_5_IRQn);
+
+	// clear interrupt mode flag
+	buttons_interrupt_enabled = 0;
+}
+
+void button_init_and_test(void)
 {
 	// letting the buttons be tested
 	display_write_data_seq("Fill any bar:");
@@ -130,11 +200,11 @@ static void button_init_and_test(void)
 	size_t pressed_elements;
 
 	uint32_t sw_button_locations[5][2] = {
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_11},
+			{GPIOC, GPIO_PIN_11},
-			{(uint32_t) GPIOA, (uint32_t) GPIO_PIN_15},
+			{GPIOA, GPIO_PIN_15},
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_9},
+			{GPIOC, GPIO_PIN_9},
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_6},
+			{GPIOC, GPIO_PIN_6},
-			{(uint32_t) GPIOC, (uint32_t) GPIO_PIN_8}
+			{GPIOC, GPIO_PIN_8}
 	};
 
 	do {
@@ -155,7 +225,7 @@ static void button_init_and_test(void)
 		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]);
+			size_t input = !HAL_GPIO_ReadPin(sw_button_locations[i][0], sw_button_locations[i][1]);
 
 			if (input) {
 				pressed_elements |= 0x20;
@@ -172,16 +242,16 @@ static void button_init_and_test(void)
 	display_write_data_seq("Release buttons");
 
 	GPIOD->ODR = 0x1000;
-	HAL_Delay(300);
+	HAL_Delay(500);
 	GPIOD->ODR = 0x2000;
-	HAL_Delay(300);
+	HAL_Delay(500);
 	GPIOD->ODR = 0x4000;
-	HAL_Delay(300);
+	HAL_Delay(500);
 	GPIOD->ODR = 0x8000;
-	HAL_Delay(300);
+	HAL_Delay(500);
 
-	// waiting for all buttons to be released
+	// waiting for control buttons to be released
-	WAIT_UNTIL_ALL_BUTTONS_RELEASED;
+	WAIT_UNTIL_CB_RELEASED;
 	GPIOD->ODR = 0x0000;
 	HAL_Delay(200);
 }
@@ -223,6 +293,7 @@ int main(void)
   MX_TIM2_Init();
   MX_I2S2_Init();
   /* USER CODE BEGIN 2 */
+  buttons_interrupt_enabled = 0;
 
   HAL_TIM_Base_Start(&htim2);
   TIM2->CNT = 0;
@@ -234,92 +305,35 @@ int main(void)
   GPIOD->ODR = 0xF000;
   button_init_and_test();
 
-  // perform all tests
-  size_t successful_tests = 0;
-  size_t failed_tests = 0;
-
-  for (display_current_frame = 1; display_current_frame < LEN(executors)+1; display_current_frame++)
-  {
-	  DISPLAY_CLEAR;
-	  display_write_data_seq("Testing...");
-
-	  DISPLAY_SET_CURSOR(1, 2);
-	  display_write_data_seq("P:");
-	  display_write_data_byte('0' + (successful_tests / 10) % 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_to_framebuffer();
-
-	  // test
-	  if (executors[display_current_frame-1]())
-		  failed_tests++;
-	  else
-		  successful_tests++;
-
-	  // cleanup (if required)
-	  if (cleanup_functions[display_current_frame-1])
-		  cleanup_functions[display_current_frame-1]();
-
-	  display_to_direct();
-  }
-
-  // render final result to first framebuffer
-  display_to_framebuffer();
-  display_current_frame = 0;
-
-  DISPLAY_CLEAR;
-  display_write_data_seq("All tests done!");
-
-  DISPLAY_SET_CURSOR(1, 2);
-  display_write_data_seq("P:");
-  display_write_data_byte('0' + (successful_tests / 10) % 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_to_direct();
-
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
-  while (1) {
+  while (1)
-	  WAIT_UNTIL_ALL_BUTTONS_RELEASED;
+  {
+	if (delay_between_runs[current_executor_id] == -1 && buttons_interrupt_enabled)
+		buttons_switch_to_input();
+	else if (delay_between_runs[current_executor_id] != -1 && !buttons_interrupt_enabled)
+		buttons_switch_to_interrupt();
 
-	  display_load(display_current_frame);
+	executors[current_executor_id]();
 
-	  while (1) {
+	if (delay_between_runs[current_executor_id] == -1) {
-		  // go to next report
+		WAIT_UNTIL_CB_PRESSED;
-		  if (UB || SWT1 || SWT5) {
+		HAL_Delay(150);
-			  display_current_frame += 1;
+		GPIOD->BSRR = 0x1000;
-			  display_current_frame %= LEN(executors)+1;
-			  break;
-		  }
 
-		  // go to previous report
+		WAIT_UNTIL_CB_RELEASED;
-		  else if (SWT3 || SWT4) {
+		HAL_Delay(150);
-			  display_current_frame -= 1;
+		GPIOD->BSRR = 0x1000 << 16;
 
-			  if ((int) display_current_frame == -1)
+		if (cleanup_functions[current_executor_id])
-				  display_current_frame = LEN(executors);
+			cleanup_functions[current_executor_id]();
 
-			  break;
+		switch_to_next_test();
-		  }
+	} else {
-
+		HAL_Delay(delay_between_runs[current_executor_id]);
-		  // return to summary frame
+	}
-		  else if (SWT2) {
-			  display_current_frame = 0;
-			  break;
-		  }
-	  }
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */

Core/Src/stm32f4xx_it.c

@@ -204,7 +204,7 @@ void EXTI0_IRQHandler(void)
 {
 	GPIOD->ODR = 0x1000;
 
-	//switch_to_next_test();
+	switch_to_next_test();
 
 	for (int i = 300000; i > 0; i--) asm("nop");
 
@@ -217,7 +217,7 @@ void EXTI9_5_IRQHandler(void)
 {
 	GPIOD->ODR = 0x1000;
 
-	//switch_to_next_test();
+	switch_to_next_test();
 
 	for (int i = 300000; i > 0; i--) asm("nop");
 

Debug/Core/Src/subdir.mk

@@ -7,6 +7,7 @@
 C_SRCS += \
 ../Core/Src/24AA02E48.c \
 ../Core/Src/CS43L22.c \
+../Core/Src/DHT11.c \
 ../Core/Src/DNI.c \
 ../Core/Src/LIS302DL.c \
 ../Core/Src/LSM9DS1.c \
@@ -24,6 +25,7 @@ C_SRCS += \
 OBJS += \
 ./Core/Src/24AA02E48.o \
 ./Core/Src/CS43L22.o \
+./Core/Src/DHT11.o \
 ./Core/Src/DNI.o \
 ./Core/Src/LIS302DL.o \
 ./Core/Src/LSM9DS1.o \
@@ -41,6 +43,7 @@ OBJS += \
 C_DEPS += \
 ./Core/Src/24AA02E48.d \
 ./Core/Src/CS43L22.d \
+./Core/Src/DHT11.d \
 ./Core/Src/DNI.d \
 ./Core/Src/LIS302DL.d \
 ./Core/Src/LSM9DS1.d \
@@ -63,7 +66,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/24AA02E48.cyclo ./Core/Src/24AA02E48.d ./Core/Src/24AA02E48.o ./Core/Src/24AA02E48.su ./Core/Src/CS43L22.cyclo ./Core/Src/CS43L22.d ./Core/Src/CS43L22.o ./Core/Src/CS43L22.su ./Core/Src/DNI.cyclo ./Core/Src/DNI.d ./Core/Src/DNI.o ./Core/Src/DNI.su ./Core/Src/LIS302DL.cyclo ./Core/Src/LIS302DL.d ./Core/Src/LIS302DL.o ./Core/Src/LIS302DL.su ./Core/Src/LSM9DS1.cyclo ./Core/Src/LSM9DS1.d ./Core/Src/LSM9DS1.o ./Core/Src/LSM9DS1.su ./Core/Src/MP45DT02.cyclo ./Core/Src/MP45DT02.d ./Core/Src/MP45DT02.o ./Core/Src/MP45DT02.su ./Core/Src/PCA9685.cyclo ./Core/Src/PCA9685.d ./Core/Src/PCA9685.o ./Core/Src/PCA9685.su ./Core/Src/SST25VF016B.cyclo ./Core/Src/SST25VF016B.d ./Core/Src/SST25VF016B.o ./Core/Src/SST25VF016B.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/24AA02E48.cyclo ./Core/Src/24AA02E48.d ./Core/Src/24AA02E48.o ./Core/Src/24AA02E48.su ./Core/Src/CS43L22.cyclo ./Core/Src/CS43L22.d ./Core/Src/CS43L22.o ./Core/Src/CS43L22.su ./Core/Src/DHT11.cyclo ./Core/Src/DHT11.d ./Core/Src/DHT11.o ./Core/Src/DHT11.su ./Core/Src/DNI.cyclo ./Core/Src/DNI.d ./Core/Src/DNI.o ./Core/Src/DNI.su ./Core/Src/LIS302DL.cyclo ./Core/Src/LIS302DL.d ./Core/Src/LIS302DL.o ./Core/Src/LIS302DL.su ./Core/Src/LSM9DS1.cyclo ./Core/Src/LSM9DS1.d ./Core/Src/LSM9DS1.o ./Core/Src/LSM9DS1.su ./Core/Src/MP45DT02.cyclo ./Core/Src/MP45DT02.d ./Core/Src/MP45DT02.o ./Core/Src/MP45DT02.su ./Core/Src/PCA9685.cyclo ./Core/Src/PCA9685.d ./Core/Src/PCA9685.o ./Core/Src/PCA9685.su ./Core/Src/SST25VF016B.cyclo ./Core/Src/SST25VF016B.d ./Core/Src/SST25VF016B.o ./Core/Src/SST25VF016B.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,6 @@
 "./Core/Src/24AA02E48.o"
 "./Core/Src/CS43L22.o"
+"./Core/Src/DHT11.o"
 "./Core/Src/DNI.o"
 "./Core/Src/LIS302DL.o"
 "./Core/Src/LSM9DS1.o"