Mercurial > public > ostc4
diff Discovery/Src/tMenuGas.c @ 351:ba53ab77f059
Merge
author | heinrichsweikamp |
---|---|
date | Sun, 06 Oct 2019 14:12:41 +0200 |
parents | 3f09b283d993 |
children | a9c195be907e |
line wrap: on
line diff
--- a/Discovery/Src/tMenuGas.c Sun Oct 06 14:07:51 2019 +0200 +++ b/Discovery/Src/tMenuGas.c Sun Oct 06 14:12:41 2019 +0200 @@ -74,7 +74,7 @@ { const SGasLine * pGasLine; - uint8_t gasId, oxygen, helium, depthUp, active, first, typeDeco, wirelessId; + uint8_t gasId, oxygen, helium, depthUp, active, first, typeDeco; float fPpO2limitHigh = 0; float fPpO2ofGasAtThisDepth = 0; //uint8_t senderCode, depthDown,; @@ -142,7 +142,6 @@ typeDeco = pGasLine[gasId].note.ub.deco; mod = calc_MOD(gasId); ltr = pGasLine[gasId].bottle_size_liter; - wirelessId = pGasLine[gasId].bottle_wireless_id; //bar = stateUsed->lifeData.bottle_bar[gasId]; if(active) @@ -224,12 +223,6 @@ if(ltr) color[2] = '\020'; /* bar */ - if(wirelessId) - color[3] = '\020'; - /* wireless */ - if(wirelessId) - color[4] = '\020'; - /* ltr, bar */ if(mod < depthUp) { @@ -302,18 +295,6 @@ color[3], bar ); */ - /* wireless */ -/* - if(wirelessId) - { - textPointer += snprintf(&text[textPointer], 8,\ - "%c" - " *" - "%u", - color[4], (wirelessId%0x0F) - ); - } -*/ text[textPointer++] = '\035'; text[textPointer++] = '\n'; text[textPointer++] = '\r';