hasslesstech/ak-kr-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hasslesstech:master
Branches Tags
hasslesstech:master
hasslesstech:dev
hasslesstech:KSZ8081RND
hasslesstech:if-rework-4
hasslesstech:if-rework-3
hasslesstech:if-rework-2
hasslesstech:if-rework-1
hasslesstech:dht11-v2
hasslesstech:dht11
..
compare: hasslesstech:KSZ8081RND
Branches Tags
hasslesstech:dev
hasslesstech:master
hasslesstech:KSZ8081RND
hasslesstech:if-rework-4
hasslesstech:if-rework-3
hasslesstech:if-rework-2
hasslesstech:if-rework-1
hasslesstech:dht11-v2
hasslesstech:dht11

No commits in common. "master" and "KSZ8081RND" have entirely different histories.
master ... KSZ8081RND

3 changed files with 27 additions and 22 deletions
Show Stats Expand all files Collapse all files

35
Core/Src/DHT11.c
View File

@ -31,34 +31,29 @@ 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->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
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
wait(100);
GPIOD->MODER &= 0xFF3FFFFF; // switch GPIOD 11 to input mode
// reading pull down from DHT11
SKIP_LOW;
// reading pull down from DHT11
SKIP_LOW;
// waiting for response
for (size_t i = TIM2->CNT + (200000 << 4); TIM2->CNT <= i; )
if (!(GPIOD->IDR & 0x0800))
goto reading_data;
}
// 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
HAL_TIM_Base_Stop(&htim2);
return 1;
reading_data:

2
Core/Src/KSZ8081RND.c
View File

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

12
Core/Src/LSM9DS1.c
View File

@ -32,6 +32,8 @@ 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)
@ -85,6 +87,11 @@ 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;
}
}
@ -122,6 +129,11 @@ 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;
}
}