Merge pull request #185 from thooge/master
Fix OBP40-Logo for WhitePage, use xbm image format
This commit is contained in:
commit
9953165dfe
|
@ -2,8 +2,14 @@
|
|||
|
||||
#include "Pagedata.h"
|
||||
#include "OBP60Extensions.h"
|
||||
#include "MFD_OBP60_400x300_sw.h" // MFD with logo
|
||||
#include "Logo_OBP_400x300_sw.h" // OBP Logo
|
||||
|
||||
#include "images/OBP_400x300.xbm" // OBP Logo
|
||||
#ifdef BOARD_OBP60S3
|
||||
#include "images/OBP60_400x300.xbm" // MFD with logo
|
||||
#endif
|
||||
#ifdef BOARD_OBP40S3
|
||||
#include "images/OBP40_400x300.xbm" // MFD with logo
|
||||
#endif
|
||||
|
||||
class PageWhite : public Page
|
||||
{
|
||||
|
@ -61,20 +67,21 @@ public:
|
|||
}
|
||||
|
||||
if (mode == 'L') {
|
||||
getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData->fgcolor);
|
||||
getdisplay().drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
|
||||
} else if (mode == 'M') {
|
||||
getdisplay().drawBitmap(0, 0, gImage_MFD_OBP60_400x300_sw, getdisplay().width(), getdisplay().height(), commonData->fgcolor);
|
||||
#ifdef BOARD_OBP60S3
|
||||
getdisplay().drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
|
||||
#endif
|
||||
#ifdef BOARD_OBP40S3
|
||||
getdisplay().drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Update display
|
||||
// getdisplay().nextPage();
|
||||
int ret = PAGE_UPDATE;
|
||||
if (mode == 'W') {
|
||||
//getdisplay().hibernate();
|
||||
ret |= PAGE_HIBERNATE;
|
||||
}
|
||||
return ret;
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -726,7 +726,7 @@
|
|||
"condition": [
|
||||
{ "calInstance1": "AWA" },
|
||||
{ "calInstance1": "AWS" },
|
||||
{ "calInstance2": "COG" },
|
||||
{ "calInstance1": "COG" },
|
||||
{ "calInstance1": "DBT" },
|
||||
{ "calInstance1": "HDM" },
|
||||
{ "calInstance1": "PRPOS" },
|
||||
|
@ -751,7 +751,7 @@
|
|||
"condition": [
|
||||
{ "calInstance1": "AWA" },
|
||||
{ "calInstance1": "AWS" },
|
||||
{ "calInstance2": "COG" },
|
||||
{ "calInstance1": "COG" },
|
||||
{ "calInstance1": "DBT" },
|
||||
{ "calInstance1": "HDM" },
|
||||
{ "calInstance1": "PRPOS" },
|
||||
|
@ -779,7 +779,7 @@
|
|||
"condition": [
|
||||
{ "calInstance1": "AWA" },
|
||||
{ "calInstance1": "AWS" },
|
||||
{ "calInstance2": "COG" },
|
||||
{ "calInstance1": "COG" },
|
||||
{ "calInstance1": "DBT" },
|
||||
{ "calInstance1": "HDM" },
|
||||
{ "calInstance1": "PRPOS" },
|
||||
|
@ -1285,8 +1285,6 @@
|
|||
"obp60":"true"
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "page1type",
|
||||
"label": "Type",
|
||||
|
|
|
@ -707,10 +707,12 @@
|
|||
"---",
|
||||
"AWA",
|
||||
"AWS",
|
||||
"COG",
|
||||
"DBT",
|
||||
"HDM",
|
||||
"PRPOS",
|
||||
"RPOS",
|
||||
"SOG",
|
||||
"STW",
|
||||
"TWA",
|
||||
"TWS",
|
||||
|
@ -731,7 +733,21 @@
|
|||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance1": "AWA" },
|
||||
{ "calInstance1": "AWS" },
|
||||
{ "calInstance1": "COG" },
|
||||
{ "calInstance1": "DBT" },
|
||||
{ "calInstance1": "HDM" },
|
||||
{ "calInstance1": "PRPOS" },
|
||||
{ "calInstance1": "RPOS" },
|
||||
{ "calInstance1": "SOG" },
|
||||
{ "calInstance1": "STW" },
|
||||
{ "calInstance1": "TWA" },
|
||||
{ "calInstance1": "TWS" },
|
||||
{ "calInstance1": "TWD" },
|
||||
{ "calInstance1": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calSlope1",
|
||||
|
@ -742,7 +758,21 @@
|
|||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance1": "AWA" },
|
||||
{ "calInstance1": "AWS" },
|
||||
{ "calInstance1": "COG" },
|
||||
{ "calInstance1": "DBT" },
|
||||
{ "calInstance1": "HDM" },
|
||||
{ "calInstance1": "PRPOS" },
|
||||
{ "calInstance1": "RPOS" },
|
||||
{ "calInstance1": "SOG" },
|
||||
{ "calInstance1": "STW" },
|
||||
{ "calInstance1": "TWA" },
|
||||
{ "calInstance1": "TWS" },
|
||||
{ "calInstance1": "TWD" },
|
||||
{ "calInstance1": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calSmooth1",
|
||||
|
@ -752,11 +782,25 @@
|
|||
"check": "checkMinMax",
|
||||
"min": 0,
|
||||
"max": 10,
|
||||
"description": "Smoothing factor for data instance 1",
|
||||
"description": "Smoothing factor [0..10]; 0 = no smoothing",
|
||||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance1": "AWA" },
|
||||
{ "calInstance1": "AWS" },
|
||||
{ "calInstance1": "COG" },
|
||||
{ "calInstance1": "DBT" },
|
||||
{ "calInstance1": "HDM" },
|
||||
{ "calInstance1": "PRPOS" },
|
||||
{ "calInstance1": "RPOS" },
|
||||
{ "calInstance1": "SOG" },
|
||||
{ "calInstance1": "STW" },
|
||||
{ "calInstance1": "TWA" },
|
||||
{ "calInstance1": "TWS" },
|
||||
{ "calInstance1": "TWD" },
|
||||
{ "calInstance1": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calInstance2",
|
||||
|
@ -768,10 +812,12 @@
|
|||
"---",
|
||||
"AWA",
|
||||
"AWS",
|
||||
"COG",
|
||||
"DBT",
|
||||
"HDM",
|
||||
"PRPOS",
|
||||
"RPOS",
|
||||
"SOG",
|
||||
"STW",
|
||||
"TWA",
|
||||
"TWS",
|
||||
|
@ -792,7 +838,21 @@
|
|||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance2": "AWA" },
|
||||
{ "calInstance2": "AWS" },
|
||||
{ "calInstance2": "COG" },
|
||||
{ "calInstance2": "DBT" },
|
||||
{ "calInstance2": "HDM" },
|
||||
{ "calInstance2": "PRPOS" },
|
||||
{ "calInstance2": "RPOS" },
|
||||
{ "calInstance2": "SOG" },
|
||||
{ "calInstance2": "STW" },
|
||||
{ "calInstance2": "TWA" },
|
||||
{ "calInstance2": "TWS" },
|
||||
{ "calInstance2": "TWD" },
|
||||
{ "calInstance2": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calSlope2",
|
||||
|
@ -803,7 +863,21 @@
|
|||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance2": "AWA" },
|
||||
{ "calInstance2": "AWS" },
|
||||
{ "calInstance2": "COG" },
|
||||
{ "calInstance2": "DBT" },
|
||||
{ "calInstance2": "HDM" },
|
||||
{ "calInstance2": "PRPOS" },
|
||||
{ "calInstance2": "RPOS" },
|
||||
{ "calInstance2": "SOG" },
|
||||
{ "calInstance2": "STW" },
|
||||
{ "calInstance2": "TWA" },
|
||||
{ "calInstance2": "TWS" },
|
||||
{ "calInstance2": "TWD" },
|
||||
{ "calInstance2": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calSmooth2",
|
||||
|
@ -813,11 +887,25 @@
|
|||
"check": "checkMinMax",
|
||||
"min": 0,
|
||||
"max": 10,
|
||||
"description": "Smoothing factor for data instance 2",
|
||||
"description": "Smoothing factor [0..10]; 0 = no smoothing",
|
||||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance2": "AWA" },
|
||||
{ "calInstance2": "AWS" },
|
||||
{ "calInstance2": "COG" },
|
||||
{ "calInstance2": "DBT" },
|
||||
{ "calInstance2": "HDM" },
|
||||
{ "calInstance2": "PRPOS" },
|
||||
{ "calInstance2": "RPOS" },
|
||||
{ "calInstance2": "SOG" },
|
||||
{ "calInstance2": "STW" },
|
||||
{ "calInstance2": "TWA" },
|
||||
{ "calInstance2": "TWS" },
|
||||
{ "calInstance2": "TWD" },
|
||||
{ "calInstance2": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calInstance3",
|
||||
|
@ -829,10 +917,12 @@
|
|||
"---",
|
||||
"AWA",
|
||||
"AWS",
|
||||
"COG",
|
||||
"DBT",
|
||||
"HDM",
|
||||
"PRPOS",
|
||||
"RPOS",
|
||||
"SOG",
|
||||
"STW",
|
||||
"TWA",
|
||||
"TWS",
|
||||
|
@ -853,7 +943,21 @@
|
|||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance3": "AWA" },
|
||||
{ "calInstance3": "AWS" },
|
||||
{ "calInstance3": "COG" },
|
||||
{ "calInstance3": "DBT" },
|
||||
{ "calInstance3": "HDM" },
|
||||
{ "calInstance3": "PRPOS" },
|
||||
{ "calInstance3": "RPOS" },
|
||||
{ "calInstance3": "SOG" },
|
||||
{ "calInstance3": "STW" },
|
||||
{ "calInstance3": "TWA" },
|
||||
{ "calInstance3": "TWS" },
|
||||
{ "calInstance3": "TWD" },
|
||||
{ "calInstance3": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calSlope3",
|
||||
|
@ -864,7 +968,21 @@
|
|||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance3": "AWA" },
|
||||
{ "calInstance3": "AWS" },
|
||||
{ "calInstance3": "COG" },
|
||||
{ "calInstance3": "DBT" },
|
||||
{ "calInstance3": "HDM" },
|
||||
{ "calInstance3": "PRPOS" },
|
||||
{ "calInstance3": "RPOS" },
|
||||
{ "calInstance3": "SOG" },
|
||||
{ "calInstance3": "STW" },
|
||||
{ "calInstance3": "TWA" },
|
||||
{ "calInstance3": "TWS" },
|
||||
{ "calInstance3": "TWD" },
|
||||
{ "calInstance3": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "calSmooth3",
|
||||
|
@ -874,11 +992,25 @@
|
|||
"check": "checkMinMax",
|
||||
"min": 0,
|
||||
"max": 10,
|
||||
"description": "Smoothing factor for data instance 3",
|
||||
"description": "Smoothing factor [0..10]; 0 = no smoothing",
|
||||
"category": "OBP40 Calibrations",
|
||||
"capabilities": {
|
||||
"obp40":"true"
|
||||
}
|
||||
},
|
||||
"condition": [
|
||||
{ "calInstance3": "AWA" },
|
||||
{ "calInstance3": "AWS" },
|
||||
{ "calInstance3": "COG" },
|
||||
{ "calInstance3": "DBT" },
|
||||
{ "calInstance3": "HDM" },
|
||||
{ "calInstance3": "PRPOS" },
|
||||
{ "calInstance3": "RPOS" },
|
||||
{ "calInstance3": "SOG" },
|
||||
{ "calInstance3": "STW" },
|
||||
{ "calInstance3": "TWA" },
|
||||
{ "calInstance3": "TWS" },
|
||||
{ "calInstance3": "TWD" },
|
||||
{ "calInstance3": "WTemp" } ]
|
||||
},
|
||||
{
|
||||
"name": "display",
|
||||
|
@ -3842,3 +3974,4 @@
|
|||
]
|
||||
}
|
||||
]
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue