comparison Discovery/Src/t7.c @ 188:ddc21166d25b

Merged in janlmulder/ostc4/cleanup-2 (pull request #5) Trivial cleanup
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Fri, 15 Mar 2019 12:55:58 +0000
parents 485c5135cf7f
children 8b8074080d7b
comparison
equal deleted inserted replaced
185:1bb24fd3fc92 188:ddc21166d25b
72 extern uint8_t write_gas(char *text, uint8_t oxygen, uint8_t helium); 72 extern uint8_t write_gas(char *text, uint8_t oxygen, uint8_t helium);
73 73
74 /* Exported variables --------------------------------------------------------*/ 74 /* Exported variables --------------------------------------------------------*/
75 75
76 /* Private variables ---------------------------------------------------------*/ 76 /* Private variables ---------------------------------------------------------*/
77 float depthLastCall[9] = { 0,0,0,0,0,0,0,0,0};
78 uint8_t idDepthLastCall = 0;
79 float temperatureLastCall[3] = { 0,0,0}; 77 float temperatureLastCall[3] = { 0,0,0};
80 uint8_t idTemperatureLastCall = 0; 78 uint8_t idTemperatureLastCall = 0;
81 79
82 GFX_DrawCfgScreen t7screen; 80 GFX_DrawCfgScreen t7screen;
83 GFX_DrawCfgScreen t7screenCompass; 81 GFX_DrawCfgScreen t7screenCompass;
2051 snprintf(TextL2,TEXTSIZE,"\020%01.0f",unit_depth_float(stateUsed->lifeData.max_depth_meter)); 2049 snprintf(TextL2,TEXTSIZE,"\020%01.0f",unit_depth_float(stateUsed->lifeData.max_depth_meter));
2052 2050
2053 t7_colorscheme_mod(TextL2); 2051 t7_colorscheme_mod(TextL2);
2054 GFX_write_string(&FontT105,&t7l2,TextL2,1); 2052 GFX_write_string(&FontT105,&t7l2,TextL2,1);
2055 2053
2056 /* ascentrate graph */ 2054 /* ascent rate graph */
2057 if(stateUsed->lifeData.ascent_rate_meter_per_min > 0) 2055 if(stateUsed->lifeData.ascent_rate_meter_per_min > 0)
2058 { 2056 {
2059 if(!pSettings->FlipDisplay) 2057 if(!pSettings->FlipDisplay)
2060 { 2058 {
2061 start.y = t7l1.WindowY0 - 1; 2059 start.y = t7l1.WindowY0 - 1;