Mercurial > public > ostc4

comparison Discovery/Src/t3.c @ 969:81049905d829 Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Zusammenf?hren
author heinrichsweikamp
date Sun, 19 Jan 2025 12:02:59 +0100
parents 4e4fbd73e329
children 7149f372b0ba
comparison
equal deleted inserted replaced
968:b9a1710522b1 969:81049905d829
533 GFX_draw_thick_line(12,tXscreen, start, stop, color); 533 GFX_draw_thick_line(12,tXscreen, start, stop, color);
534 } 534 }
535 } 535 }
536 else 536 else
537 { 537 {
538 color = 0xff;
538 if((pSettings->slowExitTime != 0) && (nextstopDepthMeter == 0) && (stateUsed->lifeData.depth_meter < pSettings->last_stop_depth_meter)) 539 if((pSettings->slowExitTime != 0) && (nextstopDepthMeter == 0) && (stateUsed->lifeData.depth_meter < pSettings->last_stop_depth_meter))
539 { 540 {
540 color = t3_drawSlowExitGraph(tXscreen, tXl1, tXr1); 541 color = t3_drawSlowExitGraph(tXscreen, tXl1, tXr1);
541 } 542 }
542 else 543 if(color == 0xff) /* no slow exit => continue with common ascent graph */
543 { 544 {
544 if(stateUsed->lifeData.ascent_rate_meter_per_min > 0) /* ascentrate graph -standard mode */ 545 if(stateUsed->lifeData.ascent_rate_meter_per_min > 0) /* ascentrate graph -standard mode */
545 { 546 {
546 if(!pSettings->FlipDisplay) 547 if(!pSettings->FlipDisplay)
547 { 548 {
760 // customview 761 // customview
761 if(stateUsed->warnings.numWarnings) 762 if(stateUsed->warnings.numWarnings)
762 customview_warnings = t3_test_customview_warnings(); 763 customview_warnings = t3_test_customview_warnings();
763 764
764 if(customview_warnings && warning_count_high_time) 765 if(customview_warnings && warning_count_high_time)
766 {
765 t3_basics_show_customview_warnings(&t3c1); 767 t3_basics_show_customview_warnings(&t3c1);
768 }
766 else 769 else
770 {
767 t3_refresh_customview(depth_meter); 771 t3_refresh_customview(depth_meter);
768 772 requestBuzzerActivation(0);
773 }
769 if(stateUsed->warnings.lowBattery) 774 if(stateUsed->warnings.lowBattery)
770 t3_basics_battery_low_customview_extra(&t3r1); //t3c1); 775 t3_basics_battery_low_customview_extra(&t3r1); //t3c1);
771 } 776 }
772 777
773 778
1532 //void t3_show_customview_warnings(GFX_DrawCfgScreen *tXscreen, GFX_DrawCfgWindow* tXl1, GFX_DrawCfgWindow* tXr1, uint8_t mode) 1537 //void t3_show_customview_warnings(GFX_DrawCfgScreen *tXscreen, GFX_DrawCfgWindow* tXl1, GFX_DrawCfgWindow* tXr1, uint8_t mode)
1533 void t3_basics_show_customview_warnings(GFX_DrawCfgWindow* tXc1) 1538 void t3_basics_show_customview_warnings(GFX_DrawCfgWindow* tXc1)
1534 { 1539 {
1535 char text[256], textMain[256]; 1540 char text[256], textMain[256];
1536 uint8_t textpointer, textpointerMain, lineFree, more; 1541 uint8_t textpointer, textpointerMain, lineFree, more;
1542 #ifdef HAVE_DEBUG_WARNINGS
1537 uint8_t index = 0; 1543 uint8_t index = 0;
1544 #endif
1538 1545
1539 snprintf(text,TEXTSIZE,"\025\f%c",TXT_Warning); 1546 snprintf(text,TEXTSIZE,"\025\f%c",TXT_Warning);
1540 GFX_write_string(&FontT42,&t3c1,text,0); 1547 GFX_write_string(&FontT42,&t3c1,text,0);
1541 1548
1542 lineFree = 1; 1549 lineFree = 1;
1678 } 1685 }
1679 if(more) 1686 if(more)
1680 { 1687 {
1681 GFX_write_string(&FontT48,&t3c2,text,0); 1688 GFX_write_string(&FontT48,&t3c2,text,0);
1682 } 1689 }
1690 requestBuzzerActivation(1);
1683 } 1691 }
1684 1692
1685 uint8_t t3_customview_disabled(uint8_t view) 1693 uint8_t t3_customview_disabled(uint8_t view)
1686 { 1694 {
1687 uint8_t i = 0; 1695 uint8_t i = 0;
2225 2233
2226 start.y = start.y - (stateUsed->lifeData.depth_meter * (ASCENT_GRAPH_YPIXEL) / pSettings->last_stop_depth_meter); 2234 start.y = start.y - (stateUsed->lifeData.depth_meter * (ASCENT_GRAPH_YPIXEL) / pSettings->last_stop_depth_meter);
2227 stop.y = start.y; 2235 stop.y = start.y;
2228 GFX_draw_thick_line(10,tXscreen, start, stop, 9); 2236 GFX_draw_thick_line(10,tXscreen, start, stop, 9);
2229 } 2237 }
2238 else
2239 {
2240 color = 0xff;
2241 }
2230 return color; 2242 return color;
2231 } 2243 }