[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

.cproject

@@ -36,7 +36,7 @@
 							</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">
 								<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">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>

Core/Inc/DHT11.h

@@ -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

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,16 +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);
 
 #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/DHT11.c

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

Core/Src/PCA9685.c

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

Core/Src/lcd.c

@@ -2,21 +2,8 @@
 #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);
 
@@ -30,17 +17,7 @@ void display_init(void)
 	  display_write_instruction_byte(0x80);
 }
 
-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)
+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)
-{
-	// 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)
+void display_write_data_byte(uint8_t code)
 {
 	DISPLAY_POLL_UNTIL_READY;
 
@@ -134,45 +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)
-{
-	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"
 
@@ -64,8 +65,6 @@ SPI_HandleTypeDef hspi1;
 
 TIM_HandleTypeDef htim2;
 
-extern size_t display_current_frame;
-
 /* USER CODE BEGIN PV */
 
 void ((*executors[])(void)) = {
@@ -79,7 +78,8 @@ void ((*executors[])(void)) = {
 		LIS302DL_run_test_dynamic,
 		MP45DT02_run_test,
 		LSM9DS1_test_accel,
-		LSM9DS1_test_magnet
+		LSM9DS1_test_magnet,
+		DHT11_run_test
 };
 
 void ((*cleanup_functions[])(void)) = {
@@ -93,6 +93,7 @@ void ((*cleanup_functions[])(void)) = {
 		NULL,
 		NULL,
 		LSM9DS1_cleanup_accel,
+		NULL,
 		NULL
 };
 
@@ -107,10 +108,11 @@ int delay_between_runs[] = {
 		200,
 		-1,
 		-1,
+		-1,
 		-1
 		};
 
-size_t current_executor_id = 0;
+size_t current_executor_id = 11;
 
 size_t buttons_interrupt_enabled;
 
@@ -134,7 +136,7 @@ static void MX_I2S2_Init(void);
 void switch_to_next_test(void)
 {
 	current_executor_id += 1;
-	current_executor_id %= 11;
+	current_executor_id %= 12;
 }
 
 void buttons_switch_to_interrupt(void)
@@ -306,30 +308,10 @@ int main(void)
   GPIOD->ODR = 0xF000;
   button_init_and_test();
 
-  // perform all tests
-  display_to_framebuffer();
-
-  for (display_current_frame = 0; display_current_frame < 11; display_current_frame++)
-  {
-	  executors[display_current_frame]();
-  }
-
-  display_to_direct();
-  display_current_frame = 0;
-
-  while (1) {
-	  display_load(display_current_frame);
-	  display_current_frame++;
-	  display_current_frame %= 11;
-	  HAL_Delay(1000);
-  }
-
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
-
-  /*
   while (1)
   {
 	if (delay_between_runs[current_executor_id] == -1 && buttons_interrupt_enabled)
@@ -355,11 +337,10 @@ int main(void)
 	} else {
 		HAL_Delay(delay_between_runs[current_executor_id]);
 	}
-	*/
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
-  //}
+  }
   /* USER CODE END 3 */
 }
 
@@ -660,10 +641,17 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PD11 PD12 PD13 PD14
-                           PD15 PD4 PD7 */
-  GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
-                          |GPIO_PIN_15|GPIO_PIN_4|GPIO_PIN_7;
+  /*Configure GPIO pin : PD11 */
+  GPIO_InitStruct.Pin = GPIO_PIN_11;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  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.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;

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"

test1.ioc

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