Nettoyage
This commit is contained in:
parent
39fad9c743
commit
312a82ab24
@ -104,52 +104,6 @@ int change_address(uint8_t *device, uint8_t new_i2c_7bits_address){
|
||||
return status;
|
||||
}
|
||||
|
||||
/// @brief Interroge les capteurs les uns après les autres.
|
||||
/// Nécessite que les capteurs soient en mode lecture continue avec VL53L1X_StartRanging(device)
|
||||
/// @return 1
|
||||
int continuous_multiple_reading(){
|
||||
for(uint8_t device=0x31; device<0x31+12; device++){
|
||||
if(statu_capteurs[device-0x31+1]==0){
|
||||
continue;
|
||||
}
|
||||
int status;
|
||||
uint8_t data_ready = 0;
|
||||
uint16_t distance_mm;
|
||||
while(!data_ready){
|
||||
status=VL53L1X_CheckForDataReady(device, &data_ready);
|
||||
if(status){
|
||||
printf("CheckForDataReady KO, error %d, capteur:%x\n", status, device);
|
||||
}
|
||||
}
|
||||
|
||||
status=VL53L1X_GetDistance(device, &distance_mm);
|
||||
if(status){
|
||||
printf("GetDistance KO, error %d, capteur:%x\n", status, device);
|
||||
return 0;
|
||||
}else{
|
||||
if(distance_mm/10 < (uint16_t) DISTANCE_TROP_LOIN_CM){
|
||||
distance_capteur_cm[device-0x31] = distance_mm / 10;
|
||||
}else{
|
||||
distance_capteur_cm[device-0x31] = DISTANCE_TROP_LOIN_CM;
|
||||
}
|
||||
}
|
||||
|
||||
status=VL53L1X_ClearInterrupt(device);
|
||||
if(status){
|
||||
printf("ClearInterrupt KO, error %d, capteur:%x\n", status, device);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int lettre = getchar_timeout_us(0);
|
||||
if(lettre != PICO_ERROR_TIMEOUT && lettre != 0){
|
||||
//return 0;
|
||||
}
|
||||
}
|
||||
affiche_distance_sur_led(distance_capteur_cm);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/// @brief Renvoie 1 si capteur prêt
|
||||
/// @param capteur : capteur à interroger, entre 0 et 11
|
||||
/// @return 1 si prêt, 0 si pas prêt, -1 si erreur
|
||||
@ -196,50 +150,6 @@ int capteur_lire_distance_cm(uint8_t capteur, uint8_t * distance_cm){
|
||||
return 1;
|
||||
}
|
||||
|
||||
int continuous_special_reading(){
|
||||
for(uint8_t device=0x32; device<0x31+12; device+=6){
|
||||
if(statu_capteurs[device-0x31+1]==0){
|
||||
continue;
|
||||
}
|
||||
int status;
|
||||
uint8_t data_ready = 0;
|
||||
uint16_t distance_mm;
|
||||
while(!data_ready){
|
||||
status=VL53L1X_CheckForDataReady(device, &data_ready);
|
||||
if(status){
|
||||
printf("CheckForDataReady KO, error %d, capteur:%x\n", status, device);
|
||||
}
|
||||
}
|
||||
|
||||
status=VL53L1X_GetDistance(device, &distance_mm);
|
||||
if(status){
|
||||
printf("GetDistance KO, error %d, capteur:%x\n", status, device);
|
||||
return 0;
|
||||
}else{
|
||||
printf(">distance%x:%d\n", device, distance_mm);
|
||||
if(distance_mm < DISTANCE_TROP_LOIN_CM * 10){
|
||||
distance_capteur_cm[device-0x31] = distance_mm / 10;
|
||||
}else{
|
||||
distance_capteur_cm[device-0x31] = DISTANCE_TROP_LOIN_CM;
|
||||
}
|
||||
}
|
||||
|
||||
status=VL53L1X_ClearInterrupt(device);
|
||||
if(status){
|
||||
printf("ClearInterrupt KO, error %d, capteur:%x\n", status, device);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int lettre = getchar_timeout_us(0);
|
||||
if(lettre != PICO_ERROR_TIMEOUT && lettre != 0){
|
||||
//return 0;
|
||||
}
|
||||
}
|
||||
affiche_distance_sur_led(distance_capteur_cm);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void affiche_distance_sur_led(unsigned char * distance_capteur_cm){
|
||||
uint8_t distance_cm;
|
||||
uint32_t couleur;
|
||||
@ -317,7 +227,7 @@ int continuous_reading(uint8_t device){
|
||||
uint8_t data_ready, boot_state=0;
|
||||
uint16_t distance;
|
||||
|
||||
printf("Reading distance...\nSend any character to quit.");
|
||||
printf("Reading distance...\nSend any character to quit.\n");
|
||||
|
||||
while(!boot_state){
|
||||
VL53L1X_BootState(device, &boot_state);
|
||||
|
1
main.c
1
main.c
@ -26,7 +26,6 @@ int continuous_reading(uint8_t device);
|
||||
int calibration(uint8_t device);
|
||||
int change_address(uint8_t * device, uint8_t new_i2c_7bits_address);
|
||||
void initialise_adresses(void);
|
||||
int continuous_multiple_reading(void);
|
||||
void affiche_distance_sur_led();
|
||||
void init_sensors(void);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user