Mercurial > public > ostc4

comparison Discovery/Src/data_exchange_main.c @ 446:f1257a32f2d4 minor_improvments

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduced configuration header for variant managment: At the moment several defines are distributed across the code allowing special SW builds (e.g. logging simulated dives). To make these options more transparent and easier to configurate a separate header has been added. With this header an new option for an optical pressure sensor was introduced.
author ideenmodellierer
date Thu, 05 Mar 2020 22:31:50 +0100
parents 079f32a8e68c
children c2e02b87774f
comparison
equal deleted inserted replaced
445:ee1434824c3f 446:f1257a32f2d4
762 } 762 }
763 pStateReal->lifeData.HUD_battery_voltage_V = get_HUD_battery_voltage_V(); 763 pStateReal->lifeData.HUD_battery_voltage_V = get_HUD_battery_voltage_V();
764 764
765 765
766 // wireless - �ltere daten aufr�umen 766 // wireless - �ltere daten aufr�umen
767 #if 0
767 for(int i=0;i<(2*NUM_GASES+1);i++) 768 for(int i=0;i<(2*NUM_GASES+1);i++)
768 { 769 {
769 if(pStateReal->lifeData.bottle_bar[i]) 770 if(pStateReal->lifeData.bottle_bar[i])
770 { 771 {
771 if((pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] == 0) || (pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] > 60000)) 772 if((pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] == 0) || (pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] > 60000))
775 } 776 }
776 else 777 else
777 pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] += 100; 778 pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] += 100;
778 } 779 }
779 } 780 }
780 781 #else
782 if(stateRealGetPointer()->lifeData.bottle_bar_age_MilliSeconds[1] < 6000) /* max age after ten minutes */
783 {
784 stateRealGetPointerWrite()->lifeData.bottle_bar_age_MilliSeconds[1]++;
785 }
786 #endif
781 if(!DataEX_check_header_and_footer_ok()) 787 if(!DataEX_check_header_and_footer_ok())
782 { 788 {
783 if(DataEX_check_header_and_footer_devicedata()) 789 if(DataEX_check_header_and_footer_devicedata())
784 { 790 {
785 DataEX_copy_to_DeviceData(); 791 DataEX_copy_to_DeviceData();