5 Commits

5 changed files with 28 additions and 94 deletions

View File

@@ -44,8 +44,6 @@ int EEPROM_24AA02E48_run_test(void)
display_write_data_seq("TIMEOUT");
break;
}
HAL_Delay(2000);
} else {
break;
}
@@ -78,29 +76,16 @@ int EEPROM_24AA02E48_run_test(void)
display_write_data_seq("TIMEOUT");
break;
}
HAL_Delay(2000);
} else {
break;
}
}
DISPLAY_CLEAR;
display_write_data_seq("24AA02E48 EEPROM");
if (err_count) {
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 {
if (!err_count) {
DISPLAY_SET_CURSOR(1, 4);
display_write_data_seq("OK ");
display_write_data_seq((char *) data_buffer);
}
return 0;
}
return !!err_count;
}

View File

@@ -31,9 +31,12 @@ static size_t dht11_read_value(struct DHT11_Data *data)
register uint32_t read_register = 0;
TIM2->CNT = 0;
HAL_TIM_Base_Start(&htim2);
// try to trigger the output
for (int t = 0; t < 10; t++) {
TIM2->CNT = 0;
GPIOD->MODER |= 0x00400000; // enable output mode on GPIOD 11
GPIOD->BSRR = GPIO_PIN_11; // enable DHT11
@@ -48,12 +51,14 @@ static size_t dht11_read_value(struct DHT11_Data *data)
// reading pull down from DHT11
SKIP_LOW;
// waiting for 500ms max
for (size_t i = TIM2->CNT + (500000 << 4); TIM2->CNT <= i; )
// waiting for response
for (size_t i = TIM2->CNT + (200000 << 4); TIM2->CNT <= i; )
if (!(GPIOD->IDR & 0x0800))
goto reading_data;
}
// if didn't exit through goto, then DHT11 awaiting has timed out
HAL_TIM_Base_Stop(&htim2);
return 1;
reading_data:

View File

@@ -98,6 +98,7 @@ int ReadRegister(uint32_t reg, uint16_t *value)
ETH->MACMIIAR = tmpreg1;
TIM2->CNT = 0;
HAL_TIM_Base_Start(&htim2);
while (ETH->MACMIIAR & 1) {
@@ -122,6 +123,7 @@ int WriteRegister(uint32_t reg, uint16_t value)
ETH->MACMIIDR = value;
ETH->MACMIIAR = tmpreg1;
TIM2->CNT = 0;
HAL_TIM_Base_Start(&htim2);
while (ETH->MACMIIAR & 1) {

View File

@@ -55,8 +55,6 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
display_write_data_seq("TIMEOUT");
break;
}
HAL_Delay(2000);
}
static void retrieve_data(size_t *err_count, uint8_t *data_xyz, char *postfix)
@@ -115,52 +113,8 @@ int LIS302DL_run_test(void)
retrieve_data(&err_count, data_xyz, "");
DISPLAY_CLEAR;
display_write_data_seq("LIS302DL Accel");
// 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, 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, 4);
display_write_data_seq("OK");
return 0;
}
}
int LIS302DL_run_test_dynamic(void)
{
DISPLAY_CLEAR;
display_write_data_seq("LIS302DL Accel D");
size_t err_count = 0;
uint8_t data_xyz[3];
retrieve_data(&err_count, data_xyz, "D");
DISPLAY_CLEAR;
display_write_data_seq("LIS302DL Accel D");
// print the execution stats
if (err_count) {
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 {
if (!err_count) {
DISPLAY_SET_CURSOR(1, 4);
display_write_data_seq("OK");
@@ -168,7 +122,7 @@ int LIS302DL_run_test_dynamic(void)
print_at(data_xyz[2], 14);
print_at(data_xyz[1], 11);
print_at(data_xyz[0], 8);
}
return 0;
}
return !!err_count;
}

View File

@@ -32,8 +32,6 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
display_write_data_seq("TIMEOUT");
break;
}
HAL_Delay(1000);
}
static void print_error_accel(HAL_StatusTypeDef result, size_t *err_count, size_t t, char *prefix)
@@ -87,11 +85,6 @@ int LSM9DS1_test_accel(void)
return 0;
} else {
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;
}
}
@@ -129,11 +122,6 @@ int LSM9DS1_test_magnet(void)
return 0;
} else {
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;
}
}