Compare commits

...

7 Commits

Author SHA1 Message Date
7844c8bdce [DHT11] minor bugfixes, minor speed improvements
- fix timeout awaiting, add more time
- move SKIP_LOW into dht11_measure_high_duration function to execute the function call before the PD11 line goes high, thus increasing the precision of signal length measurement
2025-04-19 13:38:11 +03:00
4b467f6701 [DHT11] add testing code, currently not functional 2025-04-19 12:59:40 +03:00
9370ddbadd [PCA9685] fix: add HAL_OK case to remove warning 2025-04-14 20:24:29 +03:00
ac75969758 [LSM9DS1] fix warnings, fix wrong macro usage 2025-04-14 18:27:07 +03:00
c74299dc0d [LIS302DL] fix warnings 2025-04-14 18:27:07 +03:00
8d41a30bff [CS43L22] fix warnings 2025-04-14 18:27:07 +03:00
8b5bbd3e9a [24AA02E48] fix warnings 2025-04-14 18:27:07 +03:00
10 changed files with 145 additions and 14 deletions

View File

@ -36,7 +36,7 @@
</tool> </tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1285639549" name="MCU/MPU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler"> <tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1285639549" name="MCU/MPU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.75005491" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/> <option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.75005491" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1711938240" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/> <option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1711938240" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o0" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1662015804" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1662015804" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/> <listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>

17
Core/Inc/DHT11.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef __DHT11
#define __DHT11
#define SKIP_LOW while (!(GPIOD->IDR & 0x0800)) {}
#define SKIP_HIGH while (GPIOD->IDR & 0x0800) {}
struct DHT11_Data {
uint8_t humid_integral;
uint8_t humid_decimal;
uint8_t temp_integral;
uint8_t temp_decimal;
uint8_t crc;
};
void DHT11_run_test(void);
#endif

View File

@ -32,6 +32,8 @@ void EEPROM_24AA02E48_run_test(void)
display_write_data_seq("/5 "); display_write_data_seq("/5 ");
switch (op_result) { switch (op_result) {
case HAL_OK:
break;
case HAL_ERROR: case HAL_ERROR:
display_write_data_seq("ERROR"); display_write_data_seq("ERROR");
break; break;
@ -64,6 +66,8 @@ void EEPROM_24AA02E48_run_test(void)
display_write_data_seq("/5 "); display_write_data_seq("/5 ");
switch (op_result) { switch (op_result) {
case HAL_OK:
break;
case HAL_ERROR: case HAL_ERROR:
display_write_data_seq("ERROR"); display_write_data_seq("ERROR");
break; break;
@ -89,10 +93,10 @@ void EEPROM_24AA02E48_run_test(void)
display_write_data_byte('0' + err_count / 10 % 10); display_write_data_byte('0' + err_count / 10 % 10);
display_write_data_byte('0' + err_count % 10); display_write_data_byte('0' + err_count % 10);
display_write_data_seq("E "); display_write_data_seq("E ");
display_write_data_seq(data_buffer); display_write_data_seq((char *) data_buffer);
} else { } else {
DISPLAY_SET_CURSOR(1, 1); DISPLAY_SET_CURSOR(1, 1);
display_write_data_seq("OK "); display_write_data_seq("OK ");
display_write_data_seq(data_buffer); display_write_data_seq((char *) data_buffer);
} }
} }

View File

@ -31,6 +31,8 @@ void CS43L22_run_test(void)
display_write_data_seq("/5 "); display_write_data_seq("/5 ");
switch (op_result) { switch (op_result) {
case HAL_OK:
break;
case HAL_ERROR: case HAL_ERROR:
display_write_data_seq("ERROR"); display_write_data_seq("ERROR");
break; break;

90
Core/Src/DHT11.c Normal file
View File

@ -0,0 +1,90 @@
#include "main.h"
#include "generic_macros.h"
#include "lcd.h"
#include "DHT11.h"
extern TIM_HandleTypeDef htim2;
static void wait(uint32_t wait_us)
{
uint32_t target_time = TIM2->CNT;
target_time += wait_us << 4;
while (TIM2->CNT < target_time) {}
}
static size_t dht11_measure_high_duration(void)
{
SKIP_LOW;
uint32_t start_time = TIM2->CNT;
SKIP_HIGH;
uint32_t end_time = TIM2->CNT;
// elapsed_time > 49us ? 1 : 0
return (end_time - start_time) > (49 << 4);
}
static size_t dht11_read_value(struct DHT11_Data *data)
{
// treat data as a normal array to simplify read loop
uint8_t *buffer = (uint8_t *) data;
register uint32_t read_register = 0;
TIM2->CNT = 0;
HAL_TIM_Base_Start(&htim2);
GPIOD->MODER |= 0x00400000; // enable output mode on GPIOD 11
GPIOD->BSRR = GPIO_PIN_11; // enable DHT11
wait(18000); // hold HIGH for 18 ms
GPIOD->BSRR = GPIO_PIN_11 << 16; // start signal
wait(20); // hold it for 20 us
GPIOD->BSRR = GPIO_PIN_11; // pull up, DHT will now take control over the connection
wait(40);
GPIOD->MODER &= 0xFF3FFFFF; // switch GPIOD 11 to input mode
// reading pull down from DHT11
SKIP_LOW;
// waiting for 500ms max
for (size_t i = TIM2->CNT + (500000 << 4); TIM2->CNT <= i; )
if (!(GPIOD->IDR & 0x0800))
goto reading_data;
// if didn't exit through goto, then DHT11 awaiting has timed out
return 1;
reading_data:
// read 5 bytes of data
for (size_t i = 0; i < 5; i++) {
for (register size_t j = 0; j < 8; j++) {
read_register <<= 1;
read_register |= dht11_measure_high_duration();
}
buffer[i] = (uint8_t) read_register;
}
HAL_TIM_Base_Stop(&htim2);
return 0;
}
void DHT11_run_test(void)
{
DISPLAY_CLEAR;
display_write_data_seq("DHT11 Temp+Humid");
struct DHT11_Data data;
size_t result = dht11_read_value(&data);
if (result == 1) {
DISPLAY_SET_CURSOR(1, 1);
display_write_data_seq("START TIMEOUT");
} else {
DISPLAY_SET_CURSOR(1, 1);
display_write_data_seq("OK");
}
}

View File

@ -43,6 +43,8 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
display_write_data_seq("/5 "); display_write_data_seq("/5 ");
switch (result) { switch (result) {
case HAL_OK:
break;
case HAL_ERROR: case HAL_ERROR:
display_write_data_seq("ERROR"); display_write_data_seq("ERROR");
break; break;

View File

@ -3,8 +3,8 @@
#include "lcd.h" #include "lcd.h"
#define FAILSAFE_PRE_OP for (size_t t = 0; t < 5; t++) { #define FAILSAFE_PRE_OP for (size_t t = 0; t < 5; t++) {
#define FAILSAFE_POST_OP_ACCEL(prefix) if (op_result) print_error_accel(op_result, err_count, t, prefix); else break; } #define FAILSAFE_POST_OP_ACCEL(prefix) if (op_result) print_error_accel(op_result, &err_count, t, prefix); else break; }
#define FAILSAFE_POST_OP_MAGNET(prefix) if (op_result) print_error_magnet(op_result, err_count, t, prefix); else break; } #define FAILSAFE_POST_OP_MAGNET(prefix) if (op_result) print_error_magnet(op_result, &err_count, t, prefix); else break; }
extern I2C_HandleTypeDef hi2c1; extern I2C_HandleTypeDef hi2c1;
@ -20,6 +20,8 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
display_write_data_seq("/5 "); display_write_data_seq("/5 ");
switch (result) { switch (result) {
case HAL_OK:
break;
case HAL_ERROR: case HAL_ERROR:
display_write_data_seq("ERROR"); display_write_data_seq("ERROR");
break; break;
@ -110,12 +112,12 @@ void LSM9DS1_test_magnet(void)
buffer[0] = 0x28; buffer[0] = 0x28;
FAILSAFE_PRE_OP; FAILSAFE_PRE_OP;
op_result = HAL_I2C_Master_Transmit(&hi2c1, 0x3C, buffer, 1, 1000); op_result = HAL_I2C_Master_Transmit(&hi2c1, 0x3C, buffer, 1, 1000);
FAILSAFE_POST_OP_ACCEL("A"); FAILSAFE_POST_OP_MAGNET("A");
// read from registers sequentially // read from registers sequentially
FAILSAFE_PRE_OP; FAILSAFE_PRE_OP;
op_result = HAL_I2C_Master_Receive(&hi2c1, 0x3D, buffer, 6, 1000); op_result = HAL_I2C_Master_Receive(&hi2c1, 0x3D, buffer, 6, 1000);
FAILSAFE_POST_OP_ACCEL("R"); FAILSAFE_POST_OP_MAGNET("R");
if (!err_count) { if (!err_count) {
DISPLAY_SET_CURSOR(1, 1); DISPLAY_SET_CURSOR(1, 1);

View File

@ -40,6 +40,8 @@ void PCA9685_run_test(void)
display_write_data_seq("/5 "); display_write_data_seq("/5 ");
switch (op_result) { switch (op_result) {
case HAL_OK:
break;
case HAL_ERROR: case HAL_ERROR:
display_write_data_seq("ERROR"); display_write_data_seq("ERROR");
break; break;

View File

@ -78,7 +78,8 @@ void ((*executors[])(void)) = {
LIS302DL_run_test_dynamic, LIS302DL_run_test_dynamic,
MP45DT02_run_test, MP45DT02_run_test,
LSM9DS1_test_accel, LSM9DS1_test_accel,
LSM9DS1_test_magnet LSM9DS1_test_magnet,
DHT11_run_test
}; };
void ((*cleanup_functions[])(void)) = { void ((*cleanup_functions[])(void)) = {
@ -92,6 +93,7 @@ void ((*cleanup_functions[])(void)) = {
NULL, NULL,
NULL, NULL,
LSM9DS1_cleanup_accel, LSM9DS1_cleanup_accel,
NULL,
NULL NULL
}; };
@ -106,10 +108,11 @@ int delay_between_runs[] = {
200, 200,
-1, -1,
-1, -1,
-1,
-1 -1
}; };
size_t current_executor_id = 0; size_t current_executor_id = 11;
size_t buttons_interrupt_enabled; size_t buttons_interrupt_enabled;
@ -133,7 +136,7 @@ static void MX_I2S2_Init(void);
void switch_to_next_test(void) void switch_to_next_test(void)
{ {
current_executor_id += 1; current_executor_id += 1;
current_executor_id %= 11; current_executor_id %= 12;
} }
void buttons_switch_to_interrupt(void) void buttons_switch_to_interrupt(void)
@ -638,10 +641,17 @@ static void MX_GPIO_Init(void)
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
/*Configure GPIO pins : PD11 PD12 PD13 PD14 /*Configure GPIO pin : PD11 */
PD15 PD4 PD7 */ GPIO_InitStruct.Pin = GPIO_PIN_11;
GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14 GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|GPIO_PIN_15|GPIO_PIN_4|GPIO_PIN_7; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
/*Configure GPIO pins : PD12 PD13 PD14 PD15
PD4 PD7 */
GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15
|GPIO_PIN_4|GPIO_PIN_7;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;

View File

@ -121,6 +121,8 @@ PC8.Locked=true
PC8.Signal=GPIO_Input PC8.Signal=GPIO_Input
PC9.Locked=true PC9.Locked=true
PC9.Signal=GPIO_Input PC9.Signal=GPIO_Input
PD11.GPIOParameters=GPIO_Speed
PD11.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
PD11.Locked=true PD11.Locked=true
PD11.Signal=GPIO_Output PD11.Signal=GPIO_Output
PD12.Locked=true PD12.Locked=true