leo/pse-uisim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more accurate timer

Browse Source
This commit is contained in:
leo 2023-09-16 15:55:52 +02:00
parent 55d723bfd4
commit 5afb207678
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PSE-firmware

@ -1 +1 @@
Subproject commit 7bcb3a7afa7bb6ca19d1c33939bd28d2a9db5b98 Subproject commit d0877672a3653eeed5fe7b65185ec45d93943f26

19
stm32f1xx_hal.c
View File

@ -1,4 +1,5 @@
#include "stm32f1xx_hal.h" #include "stm32f1xx_hal.h"
#include <bits/time.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -18,8 +19,8 @@ void HAL_GPIO_TogglePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin){
printf("toggling pin\n"); printf("toggling pin\n");
} }
GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin){ GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin){
printf("reading pin\n");
uint8_t pin = get_1st_pin_from_bitmask(GPIO_Pin); uint8_t pin = get_1st_pin_from_bitmask(GPIO_Pin);
printf("reading pin %d\n", gpio_status[GPIOx->index][pin]);
return gpio_status[GPIOx->index][pin]; return gpio_status[GPIOx->index][pin];
} }
void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState){ void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState){
@ -30,10 +31,22 @@ void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState Pin
static void* tim_handler(void* arg){ static void* tim_handler(void* arg){
TIM_HandleTypeDef* htim = arg; TIM_HandleTypeDef* htim = arg;
struct timespec start, current;
clock_gettime(CLOCK_MONOTONIC, &start);
while(htim->started){ while(htim->started){
uint64_t delay_ps = 15625 * htim->presc * htim->period; uint64_t delay_ps = (uint64_t) 15625 * (htim->presc+1) * (htim->period+1);
printf("delay : %lu\n", delay_ps); printf("delay : %lu\n", delay_ps);
usleep(delay_ps / 1000000);
clock_gettime(CLOCK_MONOTONIC, &current);
uint64_t time = (uint64_t) 1000000000 * (current.tv_sec - start.tv_sec) + (current.tv_nsec - start.tv_nsec);
if(delay_ps / 1000 > time)
usleep((delay_ps / 1000 - time) / 1000);
else printf("oups");
clock_gettime(CLOCK_MONOTONIC, &start);
HAL_TIM_PeriodElapsedCallback(htim); HAL_TIM_PeriodElapsedCallback(htim);
} }
return NULL; return NULL;

6
stm32f1xx_hal.h
View File

@ -66,10 +66,12 @@ GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState); void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState);
#define __HAL_TIM_SET_AUTORELOAD(__HANDLE__, __AUTORELOAD__) \ #define __HAL_TIM_SET_AUTORELOAD(__HANDLE__, __AUTORELOAD__) \
printf("setting autoreload to %d\n", __AUTORELOAD__); __HANDLE__->period = __AUTORELOAD__; \
printf("setting period %d\n", __AUTORELOAD__);
#define __HAL_TIM_SET_PRESCALER(__HANDLE__, __PRESC__) \ #define __HAL_TIM_SET_PRESCALER(__HANDLE__, __PRESC__) \
printf("setting prescaler to %d\n", __PRESC__); __HANDLE__->presc = __PRESC__; \
printf("setting presc %d\n", __PRESC__);
HAL_StatusTypeDef HAL_TIM_Base_Start_IT(TIM_HandleTypeDef *htim); HAL_StatusTypeDef HAL_TIM_Base_Start_IT(TIM_HandleTypeDef *htim);
HAL_StatusTypeDef HAL_TIM_Base_Stop_IT(TIM_HandleTypeDef *htim); HAL_StatusTypeDef HAL_TIM_Base_Stop_IT(TIM_HandleTypeDef *htim);