Mercurial > public > ostc4
diff Discovery/Src/t3.c @ 138:cc9c18075e00 FlipDisplay
Removed no longer supported scooter code
author | Ideenmodellierer |
---|---|
date | Sat, 23 Feb 2019 21:10:51 +0100 |
parents | cc8e24374b83 |
children | 255eedad4155 |
line wrap: on
line diff
--- a/Discovery/Src/t3.c Tue Feb 19 21:48:32 2019 +0100 +++ b/Discovery/Src/t3.c Sat Feb 23 21:10:51 2019 +0100 @@ -76,19 +76,6 @@ CVIEW_T3_END }; -const uint8_t t3_customviewsScooter[] = -{ - CVIEW_Scooter, - CVIEW_Compass, - - CVIEW_T3_Decostop, - CVIEW_T3_MaxDepth, - CVIEW_T3_StopWatch, - CVIEW_T3_TTS, - CVIEW_T3_ppO2andGas, - - CVIEW_T3_END -}; const uint8_t *t3_customviews = t3_customviewsStandard; @@ -106,11 +93,6 @@ SSettings* pSettings; pSettings = settingsGetPointer(); - if(getLicence() == LICENCEBONEX) - { - t3_customviews = t3_customviewsScooter; - } - t3_selection_customview = t3_customviews[0]; t3screen.FBStartAdress = 0; @@ -524,45 +506,6 @@ } -void t3_basics_battery_scooter_customview_extra(GFX_DrawCfgWindow* tXc1) -{ - char TextC1[256]; - - TextC1[0] = '\001'; - TextC1[1] = '\f'; - TextC1[2] = '\032'; - TextC1[3] = '3'; - TextC1[4] = '1'; - TextC1[5] = '1'; - TextC1[6] = '1'; - TextC1[7] = '1'; - TextC1[8] = '1'; - TextC1[9] = '1'; - TextC1[10] = '1'; - TextC1[11] = '1'; - TextC1[12] = '1'; - TextC1[13] = '1'; - TextC1[14] = '0'; - TextC1[15] = 0; - - for(int i=1;i<=10;i++) - { - if( stateUsed_scooterRemainingBattCapacity() > (9 * i)) - TextC1[i+3] += 1; - } - - if(stateUsed_scooterRemainingBattCapacity() < 10) - TextC1[2] = '\025'; - - if(!warning_count_high_time) - TextC1[4] = '2'; - - if(stateUsed->lifeData.scooterAgeInMilliSeconds > 1500) - TextC1[2] = '\031'; - - GFX_write_string(&Batt24,tXc1,TextC1,0); -} - void t3_refresh_customview(float depth) { @@ -683,7 +626,6 @@ // CVIEW_T3_ppO2andGas uint8_t oxygen_percentage = 0; - float scooterSpeed; // CVIEW_T3_Temperature float temperatureThisCall; @@ -714,21 +656,6 @@ switch(tX_selection_customview) { - case CVIEW_Scooter: - snprintf(text,TEXTSIZE,"\032\fScooter"); - GFX_write_string(&FontT42,tXc1,text,0); - - t3_basics_battery_scooter_customview_extra(tXc1); - - scooterSpeed = stateUsed->lifeData.scooterDrehzahl * 80 / 3300; - - snprintf(text,100,"\030\003%.1f",scooterSpeed); - if(stateUsed->lifeData.scooterAgeInMilliSeconds > 1500) - text[0] = '\031'; - GFX_write_string(&FontT105,tXc1,text,0); - break; - - case CVIEW_T3_ApnoeSurfaceInfo: snprintf(text,TEXTSIZE,"\032\f%c",TXT_MaxDepth); GFX_write_string(&FontT42,tXc1,text,0);