[sys] bump system clock up to 32 MHz

.cproject

@@ -24,7 +24,7 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.755606893" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.value.hard" valueType="enumerated"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1771260818" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1811760675" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VGTx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F407xx ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VGTX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.2006503660" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="16" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.2006503660" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="32" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.188797436" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/test1}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.901063855" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1851291017" name="MCU/MPU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -104,7 +104,7 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1646548773" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.value.hard" valueType="enumerated"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1901965124" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.859080388" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VGTx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F407xx ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VGTX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1202403298" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="16" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1202403298" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="32" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.584865598" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/test1}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1873374287" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1806292512" name="MCU/MPU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">

Core/Inc/DHT11.h

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

Core/Src/DHT11.c

@@ -0,0 +1,113 @@
+#include "main.h"
+#include "generic_macros.h"
+#include "lcd.h"
+#include "DHT11.h"
+
+extern TIM_HandleTypeDef htim2;
+
+static inline void wait(uint32_t wait_us)
+{
+	uint32_t target_time = TIM2->CNT;
+	target_time += wait_us << 4;
+
+	while (TIM2->CNT < target_time) {}
+}
+
+static inline 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(50000);                      // hold HIGH for 50 ms
+	GPIOD->BSRR = GPIO_PIN_11 << 16;  // start signal
+	wait(30000);                      // hold it for 30 ms
+	GPIOD->BSRR = GPIO_PIN_11;        // pull up, DHT will now take control over the connection
+
+	wait(100);
+	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;
+}
+
+int DHT11_run_test(void)
+{
+	DISPLAY_CLEAR;
+	display_write_data_seq("DHT11 Temp+Humid");
+
+	struct DHT11_Data data;
+	size_t result = dht11_read_value(&data);
+
+	size_t checksum_mismatch = ((
+			data.humid_decimal
+			+ data.humid_integral
+			+ data.temp_decimal
+			+ data.temp_integral
+			) & 0xFF) != data.crc;
+
+	if (result) {
+		DISPLAY_SET_CURSOR(1, 4);
+		display_write_data_seq("StartTimeout");
+	} else if (checksum_mismatch) {
+		DISPLAY_SET_CURSOR(1, 4);
+		display_write_data_seq("CRC Fault");
+	} else {
+		DISPLAY_SET_CURSOR(1, 4);
+		display_write_data_seq("OK");
+
+		DISPLAY_SET_CURSOR(1, 7);
+		display_write_data_byte('0' + (data.humid_integral/10)%10);
+		display_write_data_byte('0' + (data.humid_integral)%10);
+		display_write_data_seq("% ");
+
+		display_write_data_byte('0' + (data.temp_integral/10)%10);
+		display_write_data_byte('0' + (data.temp_integral)%10);
+		display_write_data_byte('.');
+		display_write_data_byte('0' + data.temp_decimal);
+		display_write_data_seq("C");
+	}
+
+	return (result || checksum_mismatch);
+}

Core/Src/main.c

@@ -32,6 +32,7 @@
 #include "LIS302DL.h"
 #include "MP45DT02.h"
 #include "LSM9DS1.h"
+#include "DHT11.h"
 
 /* USER CODE END Includes */
 
@@ -75,10 +76,10 @@ SPI_HandleTypeDef hspi1;
 
 TIM_HandleTypeDef htim2;
 
-extern size_t display_current_frame;
-
 /* USER CODE BEGIN PV */
 
+extern size_t display_current_frame;
+
 static const int ((*executors[])(void)) = {
 		DNI_show_celsius,
 		PCA9685_run_test,
@@ -88,7 +89,8 @@ static const int ((*executors[])(void)) = {
 		LIS302DL_run_test,
 		MP45DT02_run_test,
 		LSM9DS1_test_accel,
-		LSM9DS1_test_magnet
+		LSM9DS1_test_magnet,
+		DHT11_run_test
 };
 
 static const void ((*cleanup_functions[])(void)) = {
@@ -100,6 +102,7 @@ static const void ((*cleanup_functions[])(void)) = {
 		NULL,
 		NULL,
 		LSM9DS1_cleanup_accel,
+		NULL,
 		NULL
 };
 
@@ -280,14 +283,6 @@ void SystemClock_Config(void)
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
 
-  /** Macro to configure the PLL multiplication factor
-  */
-  __HAL_RCC_PLL_PLLM_CONFIG(16);
-
-  /** Macro to configure the PLL clock source
-  */
-  __HAL_RCC_PLL_PLLSOURCE_CONFIG(RCC_PLLSOURCE_HSI);
-
   /** Configure the main internal regulator output voltage
   */
   __HAL_RCC_PWR_CLK_ENABLE();
@@ -299,8 +294,12 @@ void SystemClock_Config(void)
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLM = 16;
+  RCC_OscInitStruct.PLL.PLLN = 128;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
+  RCC_OscInitStruct.PLL.PLLQ = 4;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
   {
     Error_Handler();
@@ -310,12 +309,12 @@ void SystemClock_Config(void)
   */
   RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
                               |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV4;
 
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
   {
     Error_Handler();
   }
@@ -568,10 +567,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
+  /*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.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;

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
@@ -181,36 +183,42 @@ ProjectManager.UAScriptAfterPath=
 ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=true
 ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_I2C1_Init-I2C1-false-HAL-true,5-MX_SPI1_Init-SPI1-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_I2S2_Init-I2S2-false-HAL-true
-RCC.AHBFreq_Value=16000000
+RCC.48MHZClocksFreq_Value=32000000
-RCC.APB1Freq_Value=16000000
+RCC.AHBFreq_Value=32000000
+RCC.APB1CLKDivider=RCC_HCLK_DIV4
+RCC.APB1Freq_Value=8000000
 RCC.APB1TimFreq_Value=16000000
-RCC.APB2Freq_Value=16000000
+RCC.APB2CLKDivider=RCC_HCLK_DIV4
+RCC.APB2Freq_Value=8000000
 RCC.APB2TimFreq_Value=16000000
-RCC.CortexFreq_Value=16000000
+RCC.CortexFreq_Value=32000000
-RCC.EthernetFreq_Value=16000000
+RCC.EthernetFreq_Value=32000000
-RCC.FCLKCortexFreq_Value=16000000
+RCC.FCLKCortexFreq_Value=32000000
 RCC.FamilyName=M
-RCC.HCLKFreq_Value=16000000
+RCC.HCLKFreq_Value=32000000
 RCC.HSE_VALUE=25000000
 RCC.HSI_VALUE=16000000
 RCC.I2SClocksFreq_Value=96000000
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2SClocksFreq_Value,LSE_VALUE,LSI_VALUE,MCO2PinFreq_Value,PLLCLKFreq_Value,PLLQCLKFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SYSCLKFreq_VALUE,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VcooutputI2S
+RCC.IPParameters=48MHZClocksFreq_Value,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2SClocksFreq_Value,LSE_VALUE,LSI_VALUE,MCO2PinFreq_Value,PLLCLKFreq_Value,PLLN,PLLP,PLLQCLKFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VcooutputI2S
 RCC.LSE_VALUE=32768
 RCC.LSI_VALUE=32000
-RCC.MCO2PinFreq_Value=16000000
+RCC.MCO2PinFreq_Value=32000000
-RCC.PLLCLKFreq_Value=96000000
+RCC.PLLCLKFreq_Value=32000000
-RCC.PLLQCLKFreq_Value=48000000
+RCC.PLLN=128
+RCC.PLLP=RCC_PLLP_DIV4
+RCC.PLLQCLKFreq_Value=32000000
 RCC.RTCFreq_Value=32000
 RCC.RTCHSEDivFreq_Value=12500000
-RCC.SYSCLKFreq_VALUE=16000000
+RCC.SYSCLKFreq_VALUE=32000000
+RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 RCC.VCOI2SOutputFreq_Value=192000000
 RCC.VCOInputFreq_Value=1000000
-RCC.VCOOutputFreq_Value=192000000
+RCC.VCOOutputFreq_Value=128000000
 RCC.VcooutputI2S=96000000
 SH.ADCx_IN9.0=ADC1_IN9,IN9
 SH.ADCx_IN9.ConfNb=1
 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_16
-SPI1.CalculateBaudRate=1000.0 KBits/s
+SPI1.CalculateBaudRate=500.0 KBits/s
 SPI1.Direction=SPI_DIRECTION_2LINES
 SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler
 SPI1.Mode=SPI_MODE_MASTER