diff --git a/Core/Src/main.c b/Core/Src/main.c index 8707634..79998a7 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -110,6 +110,17 @@ int main(void) sts_aq_o3_init(); int i=0; + if (sts_aq_o3_start_pooling_mode() ==0) + { + do { + sts_aq_o3_query(&o3_data); + printf("\r\n cycle %d: o3 =%4d %s : %.2f mg/m3 \r\n", i, o3_data.o3_ppb, (o3_data.o3_unit==0x04)?"ppb":"non", o3_data.o3_mg_per_m3); + HAL_Delay(4000); + } while (i++ <20); + + } + +#if 1 if (sts_aq_o3_start_autony_mode() ==0) { do { @@ -117,16 +128,10 @@ int main(void) printf("\r\n o3 =%4d %s : %.2f mg/m3 \r\n", o3_data.o3_ppb, (o3_data.o3_unit==0x04)?"ppb":"non", o3_data.o3_mg_per_m3); } while (i++ <100); } +#endif - if (sts_aq_o3_start_pooling_mode() ==0) - { - do { - sts_aq_o3_autony_run_mode(&o3_data); - printf("\r\n o3 =%4d %s : %.2f mg/m3 \r\n", o3_data.o3_ppb, (o3_data.o3_unit==0x04)?"ppb":"non", o3_data.o3_mg_per_m3); - } while (i++ <100); - - } +#if 0 sts_aq_sgp30_init(); do { @@ -134,7 +139,7 @@ int main(void) printf("\r\n sgp30_CO2 =%4d ppm, sgp_30_TVOC=%4d mg/m3 \r\n", sgp30_data.co2, sgp30_data.tvoc); } while(i++ <100); - +#endif /* Infinite loop */ /* USER CODE BEGIN WHILE */ diff --git a/Core/Src/sht3x.c b/Core/Src/sht3x.c index 321c5bc..d43bf00 100644 --- a/Core/Src/sht3x.c +++ b/Core/Src/sht3x.c @@ -39,7 +39,7 @@ int uut_sht3x_main(void) { uint16_t a_status_register = 0u; error = sht3x_read_status_register(&a_status_register); if (error != NO_ERROR) { - printf("error executing read_status_register(): %i\n", error); + printf("error executing read_status_register(): %d\n", error); return error; } printf("a_status_register: %02x\n", a_status_register); @@ -50,11 +50,11 @@ int uut_sht3x_main(void) { error = sht3x_measure_single_shot(REPEATABILITY_MEDIUM, false, &a_temperature, &a_humidity); if (error != NO_ERROR) { - printf("error executing measure_single_shot(): %i\n", error); + printf("error executing measure_single_shot(): %d\n", error); continue; } - printf("a_temperature [milli degC]: %i ", a_temperature); - printf("a_humidity [milli RH]: %i\n", a_humidity); + printf("a_temperature [milli degC]: %li ", a_temperature); + printf("a_humidity [milli RH]: %li\n", a_humidity); } return NO_ERROR; @@ -98,6 +98,7 @@ int uut_sht3x_main(void) { * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#if 0 #include "sensirion_common.h" #include "sensirion_i2c_hal.h" #include "sht3x_i2c.h" @@ -136,8 +137,8 @@ int main(void) { printf("error executing blocking_read_measurement(): %i\n", error); continue; } - printf("a_temperature [milli degC]: %i ", a_temperature); - printf("a_humidity [milli RH]: %i\n", a_humidity); + printf("a_temperature [milli degC]: %li ", a_temperature); + printf("a_humidity [milli RH]: %li\n", a_humidity); } error = sht3x_stop_measurement(); @@ -147,7 +148,10 @@ int main(void) { return NO_ERROR; } +#endif + +#if 0 #include "sht3x.h" #include "usart.h" #include "stdio.h" @@ -313,3 +317,4 @@ uint8_t SHT3x_Get_Humiture_single(double *Tem_val,double *Hum_val) else return 1; } +#endif diff --git a/Core/Src/sts_aq_o3.c b/Core/Src/sts_aq_o3.c index 00c6aab..b55ae22 100644 --- a/Core/Src/sts_aq_o3.c +++ b/Core/Src/sts_aq_o3.c @@ -38,6 +38,7 @@ void sts_aq_o3_init(void) int sts_aq_o3_start_autony_mode(void) { + printf("change to autony mode\r\n"); if (HAL_UART_Transmit(&huart1, (uint8_t *)autonymode, 9, 5000) != HAL_OK) { printf("\r\n Transmit anony mode failure \r\n"); @@ -48,6 +49,7 @@ int sts_aq_o3_start_autony_mode(void) int sts_aq_o3_start_pooling_mode(void) { + printf("change to querymode\r\n"); if (HAL_UART_Transmit(&huart1, (uint8_t *)querymode, 9, 5000) != HAL_OK) { printf("\r\n Transmit pooling mode failure \r\n"); diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index 5beb26f..b5c521c 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -89,7 +89,7 @@ - + @@ -118,7 +118,7 @@