Compare commits

..

12 Commits

Author SHA1 Message Date
ІО-23 Шмуляр Олег c9b90a679e [lcd] forbid writing outside of current framebuffer memory 2025-04-19 15:54:14 +03:00
ІО-23 Шмуляр Олег ee3249beca [lcd] forbid writing to non-existant framebuffers 2025-04-19 15:04:15 +03:00
ІО-23 Шмуляр Олег cc32a3092a [main] add macros for checking specific buttons 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег e65c4d612c [main] large code cleanup 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 7940c95b23 [main] fix: cast wrongly converted integer back into the pointer to remove warning 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 5bbbc9fe44 [main] enhancement: remove delay between running tests 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 4c9c1ff2c8 [PCA9685] remove OUT ENABLED label as it is no longer used in interactive tests 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 0eb025d3d4 add new UI for testing phase, update modules to indicate success or failure in the return value 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 87eb642adc record change in .cproject which seems impossible to revert 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 5c9846fce3 [main] add simple navigation between test reports 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 063ed8bb51 [lcd] fix: add display_load prototype 2025-04-19 14:52:22 +03:00
ІО-23 Шмуляр Олег 3ccc0ca0f3 [lcd] add support for operating on virtual framebuffers
Current implementation contains full support for:
- transparent switching between direct and framebuffer rendering modes
- writing characters to framebuffers
- loading frame from memory to physical display

As well as partial support for instruction writes including:
- resetting the display (clears memory, sets cursor at 0:0, switches to increment mode)
- switching between increment/decrement modes
- setting cursor position
2025-04-19 14:52:22 +03:00
24 changed files with 292 additions and 165 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7,6 +7,8 @@
#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)
@ -16,11 +18,17 @@
#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

View File

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

View File

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

View File

@ -4,7 +4,7 @@
extern I2C_HandleTypeDef hi2c1;
void CS43L22_run_test(void)
int CS43L22_run_test(void)
{
DISPLAY_CLEAR;
display_write_data_seq("CS43L22 Audio");
@ -57,9 +57,13 @@ void 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;
}
}

View File

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

View File

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

View File

@ -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);
}
void LSM9DS1_test_accel(void)
int LSM9DS1_test_accel(void)
{
DISPLAY_CLEAR;
display_write_data_seq("LSM9DS1 Accel");
@ -84,11 +84,15 @@ void 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;
}
}
@ -99,7 +103,7 @@ void LSM9DS1_cleanup_accel(void)
HAL_I2C_Master_Transmit(&hi2c1, 0xD6, buffer, 2, 1000);
}
void LSM9DS1_test_magnet(void)
int LSM9DS1_test_magnet(void)
{
DISPLAY_CLEAR;
display_write_data_seq("LSM9DS1 Magnet");
@ -122,10 +126,14 @@ void 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;
}
}

View File

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

View File

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

View File

@ -4,13 +4,14 @@
extern SPI_HandleTypeDef hspi1;
void SST25VF016B_run_test(void)
int 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];
@ -46,8 +47,6 @@ void SST25VF016B_run_test(void)
display_write_data_seq("TIMEOUT");
break;
}
HAL_Delay(2000);
} else {
break;
}
@ -62,6 +61,8 @@ void 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
@ -70,6 +71,9 @@ void 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;
}
}
@ -81,6 +85,9 @@ void 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;
}
}
@ -94,4 +101,6 @@ void 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);
}

View File

@ -2,8 +2,21 @@
#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);
@ -17,7 +30,17 @@ void display_init(void)
display_write_instruction_byte(0x80);
}
uint8_t display_read_status(void)
void display_to_framebuffer(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;
@ -43,7 +66,7 @@ uint8_t display_read_status(void)
return status;
}
void display_write_instruction_byte(uint8_t code)
static void display_write_instruction_byte_direct(uint8_t code)
{
DISPLAY_POLL_UNTIL_READY;
@ -62,7 +85,37 @@ void display_write_instruction_byte(uint8_t code)
GPIOE->BSRR = (DISPLAY_ENA << 16);
}
void display_write_data_byte(uint8_t code)
static void display_write_instruction_byte_framebuffer(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;
@ -81,12 +134,51 @@ void display_write_data_byte(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] != 0)
if (codes[i])
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]);
}
}

View File

@ -30,7 +30,6 @@
#include "CS43L22.h"
#include "SST25VF016B.h"
#include "LIS302DL.h"
#include "DHT11.h"
#include "MP45DT02.h"
#include "LSM9DS1.h"
@ -47,6 +46,17 @@
#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 -------------------------------------------------------------*/
@ -65,24 +75,23 @@ SPI_HandleTypeDef hspi1;
TIM_HandleTypeDef htim2;
extern size_t display_current_frame;
/* USER CODE BEGIN PV */
void ((*executors[])(void)) = {
static const int ((*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
};
void ((*cleanup_functions[])(void)) = {
NULL,
static const void ((*cleanup_functions[])(void)) = {
NULL,
PCA9685_cleanup,
NULL,
@ -90,29 +99,10 @@ 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 -----------------------------------------------*/
@ -130,67 +120,7 @@ static void MX_I2S2_Init(void);
/* Private user code ---------------------------------------------------------*/
/* USER CODE BEGIN 0 */
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)
static void button_init_and_test(void)
{
// letting the buttons be tested
display_write_data_seq("Fill any bar:");
@ -200,11 +130,11 @@ void button_init_and_test(void)
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}
{(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 {
@ -225,7 +155,7 @@ void button_init_and_test(void)
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]);
size_t input = !HAL_GPIO_ReadPin((GPIO_TypeDef *) sw_button_locations[i][0], sw_button_locations[i][1]);
if (input) {
pressed_elements |= 0x20;
@ -242,16 +172,16 @@ void button_init_and_test(void)
display_write_data_seq("Release buttons");
GPIOD->ODR = 0x1000;
HAL_Delay(500);
HAL_Delay(300);
GPIOD->ODR = 0x2000;
HAL_Delay(500);
HAL_Delay(300);
GPIOD->ODR = 0x4000;
HAL_Delay(500);
HAL_Delay(300);
GPIOD->ODR = 0x8000;
HAL_Delay(500);
HAL_Delay(300);
// waiting for control buttons to be released
WAIT_UNTIL_CB_RELEASED;
// waiting for all buttons to be released
WAIT_UNTIL_ALL_BUTTONS_RELEASED;
GPIOD->ODR = 0x0000;
HAL_Delay(200);
}
@ -293,7 +223,6 @@ 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;
@ -305,34 +234,91 @@ 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)
{
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();
while (1) {
WAIT_UNTIL_ALL_BUTTONS_RELEASED;
executors[current_executor_id]();
display_load(display_current_frame);
if (delay_between_runs[current_executor_id] == -1) {
WAIT_UNTIL_CB_PRESSED;
HAL_Delay(150);
GPIOD->BSRR = 0x1000;
while (1) {
// go to next report
if (UB || SWT1 || SWT5) {
display_current_frame += 1;
display_current_frame %= LEN(executors)+1;
break;
}
WAIT_UNTIL_CB_RELEASED;
HAL_Delay(150);
GPIOD->BSRR = 0x1000 << 16;
// go to previous report
else if (SWT3 || SWT4) {
display_current_frame -= 1;
if (cleanup_functions[current_executor_id])
cleanup_functions[current_executor_id]();
if ((int) display_current_frame == -1)
display_current_frame = LEN(executors);
switch_to_next_test();
} else {
HAL_Delay(delay_between_runs[current_executor_id]);
break;
}
// return to summary frame
else if (SWT2) {
display_current_frame = 0;
break;
}
}
/* USER CODE END WHILE */

View File

@ -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");

View File

@ -7,7 +7,6 @@
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 \
@ -25,7 +24,6 @@ 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 \
@ -43,7 +41,6 @@ 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 \
@ -66,7 +63,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/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
-$(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
.PHONY: clean-Core-2f-Src

View File

@ -1,6 +1,5 @@
"./Core/Src/24AA02E48.o"
"./Core/Src/CS43L22.o"
"./Core/Src/DHT11.o"
"./Core/Src/DNI.o"
"./Core/Src/LIS302DL.o"
"./Core/Src/LSM9DS1.o"