sundp
/
STS_RR_R125
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

*********** good with low power and good range result ---

This commit is contained in:
Yunhorn 2024-05-29 13:48:46 +08:00
parent de8886488c
commit de2e2b96c6
6 changed files with 4821 additions and 4845 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LoRaWAN/App/lora_app.c
View File

@ -856,16 +856,19 @@ static void SendTxData(void)
#ifdef ROCTEC_R5
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm >>8)&0xff; //#05
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm)&0xff; //#06
#elif defined(STS_O5)
#endif
#ifdef STS_O5
AppData.Buffer[i++] = (uint8_t)(oo_data.state_sensor1_on_off)&0xff;
#elif defined(YUNHORN_STS_R0_ENABLED) // TOF_1 & TOF_2 for STS_R1D
AppData.Buffer[i++] = (uint8_t)(0x04)&0xff; //#length of following bytes
#endif
#ifdef STS_R1D // TOF_1 & TOF_2 for STS_R1D
AppData.Buffer[i++] = (uint8_t)(0x06)&0xff; //#length of following bytes
AppData.Buffer[i++] = (uint8_t)(r0_data.distance_mm >>8)&0xff; //#05
AppData.Buffer[i++] = (uint8_t)(r0_data.distance_mm)&0xff; //#06
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm >>8)&0xff; //#07
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm)&0xff; //#08
AppData.Buffer[i++] = (uint8_t)(r0_data.distance2_mm >>8)&0xff; //#07
AppData.Buffer[i++] = (uint8_t)(r0_data.distance2_mm)&0xff; //#08
#endif
#ifdef TOF_3
AppData.Buffer[i++] = (uint8_t)(r0_data.distance2_mm >>8)&0xff; //#09
AppData.Buffer[i++] = (uint8_t)(r0_data.distance2_mm)&0xff; //#10
@ -875,7 +878,7 @@ static void SendTxData(void)
#endif
// AppData.Buffer[i++] = (uint8_t)(r0_data.battery_mV >>8)&0xff; //#12
// AppData.Buffer[i++] = (uint8_t)(r0_data.battery_mV)&0xff; //#13
#endif
}

BIN
STM32CubeIDE/Release/STS_RR_R125.bin
View File

Binary file not shown.

9575
STM32CubeIDE/Release/STS_RR_R125.hex
View File

File diff suppressed because it is too large Load Diff

3
TOF/App/app_tof.c
View File

@ -129,9 +129,10 @@ void STS_R0_SENSOR_Read(STS_R0_SensorDataTypeDef *r0_data)
{
r0_data->distance_mm =0;
r0_data->distance1_mm =0;
r0_data->distance2_mm =0;
r0_data->distance_mm = (uint16_t)sts_tof_distance_data[0];
r0_data->distance1_mm = (uint16_t)sts_tof_distance_data[1];
// r0_data->distance2_mm = (uint16_t)sts_tof_distance_data[2];
r0_data->distance2_mm = (uint16_t)sts_tof_distance_data[2];
#ifdef ROCTEC_R5
r0_data->distance1_mm = sts_tof_distance_data[0]+sts_tof_distance_data[1]+sts_tof_distance_data[2];
#endif

2
TOF/App/app_tof.h
View File

@ -48,8 +48,6 @@ void sts_vl53lx_ranging(vl53lx_model, range_mode, i_distance_threshold_mm, i_int
#endif
#if defined(YUNHORN_STS_R5_ENABLED) || defined(YUNHORN_STS_R0_ENABLED)
void STS_R0_SENSOR_Read(STS_R0_SensorDataTypeDef *r0_data);
void STS_TOF250_Range_Process(void);
void STS_TOF_VL53L0X_Range_Process(void);
void STS_R0_SENSOR_Read(STS_R0_SensorDataTypeDef *r0_data);

71
TOF/App/app_tof_vl53l0x_range.c
View File

@ -92,7 +92,7 @@ int nDevMask=0;
int nSensorPresent;
volatile int sts_tof_distance_data[MAX_TOF_COUNT]={0x0,0x0};
volatile int sts_tof_distance_data[MAX_TOF_COUNT]={0x0};
extern volatile uint8_t sensor_data_ready;
VL53L0X_Dev_t VL53L0XDevs[]={
@ -236,32 +236,17 @@ void sts_tof_vl53l0x_SetupSingleShot(RangingConfig_e rangingConfig)
APP_LOG(TS_OFF, VLEVEL_H, "\r\n ###### Starting Range #%u sensor \r\n",i);
status=VL53L0X_StaticInit(&VL53L0XDevs[i]);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_StaticInit failed\n");
}
status = VL53L0X_PerformRefCalibration(&VL53L0XDevs[i], &VhvSettings, &PhaseCal);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_PerformRefCalibration failed\n");
}
status = VL53L0X_PerformRefSpadManagement(&VL53L0XDevs[i], &refSpadCount, &isApertureSpads);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_PerformRefSpadManagement failed\n");
}
status = VL53L0X_SetDeviceMode(&VL53L0XDevs[i], VL53L0X_DEVICEMODE_SINGLE_RANGING); // Setup in single ranging mode
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetDeviceMode failed\n");
}
status = VL53L0X_SetLimitCheckEnable(&VL53L0XDevs[i], VL53L0X_CHECKENABLE_SIGMA_FINAL_RANGE, 1); // Enable Sigma limit
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetLimitCheckEnable failed\n");
}
status = VL53L0X_SetLimitCheckEnable(&VL53L0XDevs[i], VL53L0X_CHECKENABLE_SIGNAL_RATE_FINAL_RANGE, 1); // Enable Signa limit
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetLimitCheckEnable failed\n");
}
/* Ranging configuration */
switch(rangingConfig) {
case LONG_RANGE:
@ -291,34 +276,16 @@ void sts_tof_vl53l0x_SetupSingleShot(RangingConfig_e rangingConfig)
}
status = VL53L0X_SetLimitCheckValue(&VL53L0XDevs[i], VL53L0X_CHECKENABLE_SIGNAL_RATE_FINAL_RANGE, signalLimit);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetLimitCheckValue failed\n");
}
status = VL53L0X_SetLimitCheckValue(&VL53L0XDevs[i], VL53L0X_CHECKENABLE_SIGMA_FINAL_RANGE, sigmaLimit);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetLimitCheckValue failed\n");
}
status = VL53L0X_SetMeasurementTimingBudgetMicroSeconds(&VL53L0XDevs[i], timingBudget);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetMeasurementTimingBudgetMicroSeconds failed\n");
}
status = VL53L0X_SetVcselPulsePeriod(&VL53L0XDevs[i], VL53L0X_VCSEL_PERIOD_PRE_RANGE, preRangeVcselPeriod);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetVcselPulsePeriod failed\n");
}
status = VL53L0X_SetVcselPulsePeriod(&VL53L0XDevs[i], VL53L0X_VCSEL_PERIOD_FINAL_RANGE, finalRangeVcselPeriod);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_SetVcselPulsePeriod failed\n");
}
status = VL53L0X_PerformRefCalibration(&VL53L0XDevs[i], &VhvSettings, &PhaseCal);
if( status ){
APP_LOG(TS_OFF, VLEVEL_H, "VL53L0X_PerformRefCalibration failed\n");
}
VL53L0XDevs[i].LeakyFirst =1;
@ -387,9 +354,10 @@ void STS_TOF_VL53L0X_Range_Process(void)
nSensorPresent = sts_tof_vl53l0x_DetectSensors(); // confirm sensor online
APP_LOG(TS_OFF, VLEVEL_H, "\r\n %u pcs sensor(s) online \r\n", nSensorPresent);
}
sts_tof_distance_data[0] = 0;
sts_tof_distance_data[1] = 0;
sts_tof_distance_data[0] = 666;
sts_tof_distance_data[1] = 666;
//sts_tof_distance_data[2] = nSensorPresent|(nDevMask<<4);
sts_tof_distance_data[2] = nDevMask<<4;
#ifdef TOF_3
sts_tof_distance_data[2] = 0;
#endif
@ -405,8 +373,8 @@ void STS_TOF_VL53L0X_Range_Process(void)
if (VL53L0XDevs[i].Present ==1)
{
uint8_t rep=0;
do {
rep++;
//do {
// rep++;
status = VL53L0X_PerformSingleRangingMeasurement(&VL53L0XDevs[i], &RangingMeasurementData);
if (status ==0)
{
@ -426,12 +394,12 @@ void STS_TOF_VL53L0X_Range_Process(void)
// ########## 1) return status ==0,
// ########## 2) and ranging status for valid ranging value !!!!!!!!!!!!!!!!!
}
HAL_Delay(1);
} while ((RangingMeasurementData.RangeStatus != 0)&&(rep <10));
sts_tof_distance_data[i] = (RangingMeasurementData.RangeStatus!=0)?STS_MAX_L0_RANGE:VL53L0XDevs[i].LeakyRange;
// HAL_Delay(1);
//} while ((RangingMeasurementData.RangeStatus != 0)&&(rep <10));
//sts_tof_distance_data[i] = (RangingMeasurementData.RangeStatus!=0)?STS_MAX_L0_RANGE:VL53L0XDevs[i].LeakyRange;
}
HAL_Delay(1);
HAL_Delay(30);
} // for i < MAX_TOF_COUNT
if (sensor_data_ready != 0) {
@ -439,11 +407,16 @@ void STS_TOF_VL53L0X_Range_Process(void)
(int)sts_tof_distance_data[0],(int)sts_tof_distance_data[1],(int)sts_tof_distance_data[2]);
}
} // nSensorPresent >0
} else {
// nSensorPresent >0
sts_tof_distance_data[0] = 888;
sts_tof_distance_data[1] = 888;
sts_tof_distance_data[2] = 888;
}
// reset for next ranging
//nDevMask = 0;
//nSensorPresent = 0;
nDevMask = 0;
nSensorPresent = 0;
}