petites améliorations
This commit is contained in:
parent
c19ddc685c
commit
abd9645df0
4
.vscode/settings.json
vendored
4
.vscode/settings.json
vendored
@ -2,6 +2,8 @@
|
||||
"files.associations": {
|
||||
"vl53l1x_calibration.h": "c",
|
||||
"vl53l1x_api.h": "c",
|
||||
"i2c.h": "c"
|
||||
"i2c.h": "c",
|
||||
"vl53l1_platform.h": "c",
|
||||
"vl53l1_types.h": "c"
|
||||
}
|
||||
}
|
17
Tests.c
17
Tests.c
@ -1,4 +1,5 @@
|
||||
#include "pico/stdlib.h"
|
||||
#include "pico/multicore.h"
|
||||
#include <stdio.h>
|
||||
#include "ws2812.h"
|
||||
#include "VL53L1X_Fonctions.h"
|
||||
@ -8,6 +9,19 @@ void test_couleur_led();
|
||||
|
||||
#define TEST_TIMEOUT_US 10000000
|
||||
|
||||
|
||||
void blink_test(void){
|
||||
const uint LED_PIN = PICO_DEFAULT_LED_PIN;
|
||||
while(1){
|
||||
for(uint8_t capteur=0; capteur<12; capteur++){
|
||||
printf(">distance%x:%d\n", capteur, distance_capteur_cm[capteur]);
|
||||
}
|
||||
sleep_ms(50);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Tests(void){
|
||||
int answer_at_least_once=0;
|
||||
uint8_t VL53L1X_device = 0x31;
|
||||
@ -49,6 +63,7 @@ void Tests(void){
|
||||
case 'j':
|
||||
case 'J':
|
||||
printf("Lecture continue des capteurs inutilisés.\nAppuyer sur une touche pour quitter");
|
||||
multicore_launch_core1(blink_test);
|
||||
do{
|
||||
keycode = getchar_timeout_us(0);
|
||||
continuous_multiple_reading();
|
||||
@ -60,7 +75,7 @@ void Tests(void){
|
||||
break;
|
||||
case 'l':
|
||||
case 'L':
|
||||
while(continuous_reading(0x31));
|
||||
while(continuous_reading(0x38));
|
||||
break;
|
||||
case 'o':
|
||||
case 'O':
|
||||
|
@ -9,7 +9,7 @@
|
||||
#define DISTANCE_TROP_LOIN_CM 200 /* Distance de saturation */
|
||||
#define DISTANCE_TRES_LOIN_CM 120 /* Seuil min. pour la couleur bleu*/
|
||||
#define DISTANCE_LOIN_CM 80 /* Seuil min. pour la couleur verte*/
|
||||
#define DISTANCE_PROCHE_CM 14 /* Seuil entre violet et jaune*/
|
||||
#define DISTANCE_PROCHE_CM 15 /* Seuil entre violet et jaune*/
|
||||
|
||||
#define NB_CAPTEURS 12
|
||||
|
||||
@ -121,7 +121,7 @@ int continuous_multiple_reading(){
|
||||
printf("GetDistance KO, error %d, capteur:%x\n", status, device);
|
||||
return 0;
|
||||
}else{
|
||||
if(distance_mm < DISTANCE_TROP_LOIN_CM * 10){
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user