Compare commits
1 Commits
7844c8bdce
...
2422ef0043
| Author | SHA1 | Date | |
|---|---|---|---|
| 2422ef0043 |
@ -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" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o0" 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 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"/>
|
||||
|
||||
@ -32,8 +32,6 @@ void EEPROM_24AA02E48_run_test(void)
|
||||
display_write_data_seq("/5 ");
|
||||
|
||||
switch (op_result) {
|
||||
case HAL_OK:
|
||||
break;
|
||||
case HAL_ERROR:
|
||||
display_write_data_seq("ERROR");
|
||||
break;
|
||||
@ -66,8 +64,6 @@ void EEPROM_24AA02E48_run_test(void)
|
||||
display_write_data_seq("/5 ");
|
||||
|
||||
switch (op_result) {
|
||||
case HAL_OK:
|
||||
break;
|
||||
case HAL_ERROR:
|
||||
display_write_data_seq("ERROR");
|
||||
break;
|
||||
@ -93,10 +89,10 @@ void EEPROM_24AA02E48_run_test(void)
|
||||
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);
|
||||
display_write_data_seq(data_buffer);
|
||||
} else {
|
||||
DISPLAY_SET_CURSOR(1, 1);
|
||||
display_write_data_seq("OK ");
|
||||
display_write_data_seq((char *) data_buffer);
|
||||
display_write_data_seq(data_buffer);
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,8 +31,6 @@ void CS43L22_run_test(void)
|
||||
display_write_data_seq("/5 ");
|
||||
|
||||
switch (op_result) {
|
||||
case HAL_OK:
|
||||
break;
|
||||
case HAL_ERROR:
|
||||
display_write_data_seq("ERROR");
|
||||
break;
|
||||
|
||||
@ -15,7 +15,6 @@ static void wait(uint32_t wait_us)
|
||||
|
||||
static size_t dht11_measure_high_duration(void)
|
||||
{
|
||||
SKIP_LOW;
|
||||
uint32_t start_time = TIM2->CNT;
|
||||
SKIP_HIGH;
|
||||
uint32_t end_time = TIM2->CNT;
|
||||
@ -29,7 +28,7 @@ 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;
|
||||
register uint8_t read_register = 0;
|
||||
|
||||
TIM2->CNT = 0;
|
||||
HAL_TIM_Base_Start(&htim2);
|
||||
@ -45,11 +44,11 @@ static size_t dht11_read_value(struct DHT11_Data *data)
|
||||
|
||||
GPIOD->MODER &= 0xFF3FFFFF; // switch GPIOD 11 to input mode
|
||||
|
||||
// reading pull down from DHT11
|
||||
// reading transmission from DHT11
|
||||
SKIP_LOW;
|
||||
|
||||
// waiting for 500ms max
|
||||
for (size_t i = TIM2->CNT + (500000 << 4); TIM2->CNT <= i; )
|
||||
// waiting for 50 ms max
|
||||
for (size_t i = TIM2->CNT + (50000 << 4); TIM2->CNT >= i; )
|
||||
if (!(GPIOD->IDR & 0x0800))
|
||||
goto reading_data;
|
||||
|
||||
@ -61,10 +60,11 @@ reading_data:
|
||||
for (size_t i = 0; i < 5; i++) {
|
||||
for (register size_t j = 0; j < 8; j++) {
|
||||
read_register <<= 1;
|
||||
SKIP_LOW;
|
||||
read_register |= dht11_measure_high_duration();
|
||||
}
|
||||
|
||||
buffer[i] = (uint8_t) read_register;
|
||||
buffer[i] = read_register;
|
||||
}
|
||||
|
||||
HAL_TIM_Base_Stop(&htim2);
|
||||
|
||||
@ -43,8 +43,6 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
|
||||
display_write_data_seq("/5 ");
|
||||
|
||||
switch (result) {
|
||||
case HAL_OK:
|
||||
break;
|
||||
case HAL_ERROR:
|
||||
display_write_data_seq("ERROR");
|
||||
break;
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
#include "lcd.h"
|
||||
|
||||
#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_MAGNET(prefix) if (op_result) print_error_magnet(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; }
|
||||
|
||||
extern I2C_HandleTypeDef hi2c1;
|
||||
|
||||
@ -20,8 +20,6 @@ static void print_error_message(HAL_StatusTypeDef result, size_t *err_count, siz
|
||||
display_write_data_seq("/5 ");
|
||||
|
||||
switch (result) {
|
||||
case HAL_OK:
|
||||
break;
|
||||
case HAL_ERROR:
|
||||
display_write_data_seq("ERROR");
|
||||
break;
|
||||
@ -112,12 +110,12 @@ void LSM9DS1_test_magnet(void)
|
||||
buffer[0] = 0x28;
|
||||
FAILSAFE_PRE_OP;
|
||||
op_result = HAL_I2C_Master_Transmit(&hi2c1, 0x3C, buffer, 1, 1000);
|
||||
FAILSAFE_POST_OP_MAGNET("A");
|
||||
FAILSAFE_POST_OP_ACCEL("A");
|
||||
|
||||
// read from registers sequentially
|
||||
FAILSAFE_PRE_OP;
|
||||
op_result = HAL_I2C_Master_Receive(&hi2c1, 0x3D, buffer, 6, 1000);
|
||||
FAILSAFE_POST_OP_MAGNET("R");
|
||||
FAILSAFE_POST_OP_ACCEL("R");
|
||||
|
||||
if (!err_count) {
|
||||
DISPLAY_SET_CURSOR(1, 1);
|
||||
|
||||
@ -40,8 +40,6 @@ 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;
|
||||
|
||||
@ -112,7 +112,7 @@ int delay_between_runs[] = {
|
||||
-1
|
||||
};
|
||||
|
||||
size_t current_executor_id = 11;
|
||||
size_t current_executor_id = 0;
|
||||
|
||||
size_t buttons_interrupt_enabled;
|
||||
|
||||
@ -641,17 +641,10 @@ static void MX_GPIO_Init(void)
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
|
||||
|
||||
/*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;
|
||||
/*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;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user