Skip to content

Commit e04cdac

Browse files
author
Wegmann Peter
committed
fixed pngintervall time and errror reporting to helium management
1 parent 9b2303e commit e04cdac

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

DispAdapter.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,10 @@ void displayTemPreVol(void){
498498

499499

500500

501+
502+
503+
504+
501505

502506

503507

@@ -506,6 +510,8 @@ void displayTemPreVol(void){
506510
activity_indicator++;
507511

508512

513+
514+
509515

510516

511517
#endif

Gascounter_main.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,9 @@ void Collect_Measurement_Data(void){
405405
if(BIT_CHECK(status_reset_on_send,I2C_BUS_ERROR)){BIT_SET(curr_Stat,status_bit_I2C_err_91);}
406406

407407

408+
// network error is not reset on send/store
409+
if(BIT_CHECK(get_status(),NETWORK_ERROR)){BIT_SET(curr_Stat,status_bit_Network_err_91);}
410+
408411

409412

410413
sendbuffer[22] = curr_Stat;
@@ -1514,7 +1517,7 @@ void Set_Options(uint8_t *optBuffer,uint8_t answer_code){
15141517
options.Temperature_norm = optholder.Temperature_norm;
15151518
options.p_Compensation_enable = optholder.p_Compensation_enable;
15161519
options.Pressure_norm = optholder.Pressure_norm;
1517-
1520+
options.Ping_Intervall = optholder.Ping_Intervall;
15181521

15191522
old.Value = options.Value;
15201523
old.Volume = options.Volume;
@@ -1558,6 +1561,7 @@ void Set_Options(uint8_t *optBuffer,uint8_t answer_code){
15581561
}else{
15591562
CLEAR_ERROR(TEMPPRESS_ERROR);;
15601563
}
1564+
15611565
return ;
15621566
}
15631567

@@ -1828,7 +1832,7 @@ int main(void)
18281832

18291833
if (CHECK_ERROR(NETWORK_ERROR))
18301834
{
1831-
sendbuffer[MEASUREMENT_MESSAGE_LENGTH-1]= 0; //delete Status byte
1835+
//sendbuffer[MEASUREMENT_MESSAGE_LENGTH-1]= 0; //delete Status byte
18321836
store_measurement();
18331837

18341838
}
@@ -1996,6 +2000,7 @@ int main(void)
19962000

19972001

19982002
Collect_Measurement_Data();
2003+
19992004
// reset cached error bits;
20002005
status_reset_on_send = 0;
20012006
if (CHECK_ERROR(NETWORK_ERROR))

Gascounter_main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ extern uint8_t position_volume_dot_point;
307307
#define status_bit_Temp_Press_Err_91 3 /**< @brief Bit that indicates a problem with the BMP085 Sensor */
308308
#define status_bit_volume_too_big_91 4 /**< @brief Bit that indicates that an overflow has occourred in Value (#optType), Volume (#optType) or CorrVolume (#optType) */
309309
#define status_bit_DS3231M_err_91 5 /**< @brief Bit that indicates a problem with the DS3231M Chip */
310-
310+
#define status_bit_Network_err_91 6 /**< @brief Bit that indicates a network error, (message was stored on device until connection was reestablished)*/
311311

312312

313313

avr-util-library

Submodule avr-util-library updated from 7123483 to 29a9164

timerUtil.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "Gascounter_main.h"
1111
#include "timerUtil.h"
1212

13+
1314
TimerArrType timers = {.t_elapsed = &count_t_elapsed,.TArr[RECONNECT].end = 0,.TArr[RECONNECT].start = 0};
1415

1516

0 commit comments

Comments
 (0)