Change-Id: Ia58664efc1924e04a026ed0dd6c16c8a90e4c2e0
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
- "name": "pu",
- "layer": "on_screen",
- "areas": [
- {
- "name": "pop_up",
- "category": "pop_up"
- }
- ]
- },
- {
- "name": "sa",
- "layer": "on_screen",
+ "name": "homescreen",
+ "layer": "far_homescreen",
- "name": "system_alert",
- "category": "system_alert"
+ "name": "fullscreen",
+ "category": "homescreen"
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
+ "name": "map.fullscreen",
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
+ "name": "splitable.normal",
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
+ "name": "splitable.split",
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
+ "name": "general.normal",
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
+ "name": "system.normal",
"layer": "apps",
"areas": [
{
"layer": "apps",
"areas": [
{
- "name": "hs",
- "layer": "homescreen",
- "areas": [
- {
- "name": "fullscreen",
- "category": "homescreen"
- }
- ]
- },
- {
- "name": "system_alert",
- "layer": "on_screen",
+ "name": "software_keyboard",
+ "layer": "near_homescreen",
- "name": "system_alert",
- "category": "system_alert"
+ "name": "software_keyboard",
+ "category": "software_keyboard"
+ "name": "restriction.normal",
"layer": "restriction",
"areas": [
{
"layer": "restriction",
"areas": [
{
- "name": "software_keyboard",
- "layer": "near_homescreen",
- "areas": [
- {
- "name": "software_keyboard",
- "category": "software_keyboard"
- }
- ]
- },
- {
- "name": "applications.map",
- "layer": "apps",
- "areas": [
- {
- "name": "normal",
- "category": "map"
- }
- ]
- },
- {
- "name": "applications.map_split",
- "layer": "apps",
- "areas": [
- {
- "name": "split.main",
- "category": "map"
- },
- {
- "name": "split.sub",
- "category": "general"
- }
- ]
- },
- {
- "name": "general",
- "layer": "apps",
+ "name": "pop_up",
+ "layer": "on_screen",
- "name": "normal",
- "category": "general"
+ "name": "pop_up",
+ "category": "pop_up"
- "name": "far_homescreen",
- "layer": "far_homescreen",
+ "name": "system_alert",
+ "layer": "on_screen",
- "name": "fullscreen",
- "category": "homescreen"
+ "name": "system_alert",
+ "category": "system_alert"
const char* gStmLayoutName[] = {
"none",
const char* gStmLayoutName[] = {
"none",
- "pu",
- "sa",
- "m1",
- "m2",
- "mf",
- "s1",
- "s2",
- "g",
- "hs",
- "restriction",
+ "pop_up",
+ "system_alert",
+ "map.normal",
+ "map.split",
+ "map.fullscreen",
+ "splitable.normal",
+ "splitable.split",
+ "general.normal",
+ "homescreen",
+ "restriction.normal",
"restriction.split.main",
"restriction.split.sub",
"restriction.split.main",
"restriction.split.sub",
};
const char* gStmLayerName[] = {
};
const char* gStmLayerName[] = {
// Update apps layer
g_prv_apps_state_car_stop = apps_state;
if ((STM_TRUE == g_map_is_activated)
// Update apps layer
g_prv_apps_state_car_stop = apps_state;
if ((STM_TRUE == g_map_is_activated)
- && (gStmLayoutNoSystem != apps_state)) {
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM1;
+ && (gStmLayoutNoSysNml != apps_state)) {
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
}
}
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
}
}
switch (category_no) {
case STM_CTG_NO_HOMESCREEN:
// Homescreen layer
switch (category_no) {
case STM_CTG_NO_HOMESCREEN:
// Homescreen layer
- g_crr_state.layer[gStmLayerNoHomescreen].state = gStmLayoutNoHs;
+ g_crr_state.layer[gStmLayerNoHomescreen].state = gStmLayoutNoHms;
g_crr_state.layer[gStmLayerNoHomescreen].changed = STM_TRUE;
// Apps layer
g_crr_state.layer[gStmLayerNoHomescreen].changed = STM_TRUE;
// Apps layer
case STM_ARA_NO_FULL:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_FULL:
// Apps layer
switch (apps_state) {
+ case gStmLayoutNoMapFll:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMf;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapFll;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
+ case gStmLayoutNoMapNml:
- case gStmLayoutNoS1:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM2;
+ case gStmLayoutNoSplNml:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM1;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
}
break;
case STM_ARA_NO_SPLIT_MAIN:
// Apps layer
switch (apps_state) {
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
}
break;
case STM_ARA_NO_SPLIT_MAIN:
// Apps layer
switch (apps_state) {
- case gStmLayoutNoS1:
- case gStmLayoutNoS2:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoS2;
+ case gStmLayoutNoSplNml:
+ case gStmLayoutNoSplSpl:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSplSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
+ case gStmLayoutNoMapFll:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoG;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoGenNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
+ case gStmLayoutNoMapFll:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSystem;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSysNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
- case gStmLayoutNoM1:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM2;
+ case gStmLayoutNoMapNml:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
- case gStmLayoutNoMf:
- case gStmLayoutNoS1:
+ case gStmLayoutNoMapFll:
+ case gStmLayoutNoSplNml:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoS1;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSplNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
case STM_ARA_NO_SPLIT_MAIN:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_SPLIT_MAIN:
// Apps layer
switch (apps_state) {
- case gStmLayoutNoS1:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoS2;
+ case gStmLayoutNoSplNml:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSplSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
- case gStmLayoutNoS2:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoS2;
+ case gStmLayoutNoSplSpl:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSplSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
case STM_ARA_NO_SPLIT_SUB:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_SPLIT_SUB:
// Apps layer
switch (apps_state) {
- case gStmLayoutNoM1:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM2;
+ case gStmLayoutNoMapNml:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
- case gStmLayoutNoM2:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM2;
+ case gStmLayoutNoMapSpl:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
- case gStmLayoutNoS1:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoS2;
+ case gStmLayoutNoSplNml:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSplSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
- case gStmLayoutNoS2:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoS2;
+ case gStmLayoutNoSplSpl:
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSplSpl;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
default:
case STM_ARA_NO_SPLIT_MAIN:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_SPLIT_MAIN:
// Apps layer
switch (apps_state) {
+ case gStmLayoutNoMapNml:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoM1;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoMapNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
}
break;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
}
break;
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
case STM_ARA_NO_NORMAL:
// Apps layer
switch (apps_state) {
+ case gStmLayoutNoMapFll:
- g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSystem;
+ g_crr_state.layer[gStmLayerNoApps].state = gStmLayoutNoSysNml;
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
g_crr_state.layer[gStmLayerNoApps].changed = STM_TRUE;
break;
}
case STM_ARA_NO_RESTRICTION_NORMAL:
switch (restriction_state) {
case gStmLayoutNoNone:
case STM_ARA_NO_RESTRICTION_NORMAL:
switch (restriction_state) {
case gStmLayoutNoNone:
- if (g_crr_state.layer[gStmLayerNoApps].state == gStmLayoutNoS1) {
- g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRestriction;
+ if (g_crr_state.layer[gStmLayerNoApps].state == gStmLayoutNoSplNml) {
+ g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRstNml;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
break;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
break;
case STM_ARA_NO_RESTRICTION_SPLIT_MAIN:
switch (restriction_state) {
case gStmLayoutNoNone:
case STM_ARA_NO_RESTRICTION_SPLIT_MAIN:
switch (restriction_state) {
case gStmLayoutNoNone:
- g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRestrictionSplitMain;
+ g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRstSplMain;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
break;
default:
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
break;
default:
case STM_ARA_NO_RESTRICTION_SPLIT_SUB:
switch (restriction_state) {
case gStmLayoutNoNone:
case STM_ARA_NO_RESTRICTION_SPLIT_SUB:
switch (restriction_state) {
case gStmLayoutNoNone:
- if (g_crr_state.layer[gStmLayerNoApps].state == gStmLayoutNoM2) {
- g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRestrictionSplitSub;
+ if (g_crr_state.layer[gStmLayerNoApps].state == gStmLayoutNoMapSpl) {
+ g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRstSplSub;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
break;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
break;
}
else if (STM_EVT_NO_DEACTIVATE == event_no) {
switch (restriction_state) {
}
else if (STM_EVT_NO_DEACTIVATE == event_no) {
switch (restriction_state) {
- case gStmLayoutNoRestriction:
- case gStmLayoutNoRestrictionSplitMain:
- case gStmLayoutNoRestrictionSplitSub:
+ case gStmLayoutNoRstNml:
+ case gStmLayoutNoRstSplMain:
+ case gStmLayoutNoRstSplSub:
g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoNone;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoNone;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
break;
}
else if (g_crr_state.layer[gStmLayerNoApps].changed) {
if (gStmLightstatusBrakeStateNoOff == g_crr_state.car_element[gStmCarElementNoLightstatusBrake].state) {
}
else if (g_crr_state.layer[gStmLayerNoApps].changed) {
if (gStmLightstatusBrakeStateNoOff == g_crr_state.car_element[gStmCarElementNoLightstatusBrake].state) {
- if (gStmLayoutNoM2 == g_crr_state.layer[gStmLayerNoApps].state) {
- g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRestrictionSplitSub;
+ if (gStmLayoutNoMapSpl == g_crr_state.layer[gStmLayerNoApps].state) {
+ g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRstSplSub;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
- else if (gStmLayoutNoS1 == g_crr_state.layer[gStmLayerNoApps].state) {
- g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRestriction;
+ else if (gStmLayoutNoSplNml == g_crr_state.layer[gStmLayerNoApps].state) {
+ g_crr_state.layer[gStmLayerNoRestriction].state = gStmLayoutNoRstNml;
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
else {
g_crr_state.layer[gStmLayerNoRestriction].changed = STM_TRUE;
}
else {
if (STM_EVT_NO_ACTIVATE == event_no) {
switch (on_screen_state) {
case gStmLayoutNoNone:
if (STM_EVT_NO_ACTIVATE == event_no) {
switch (on_screen_state) {
case gStmLayoutNoNone:
- g_crr_state.layer[gStmLayerNoOnScreen].state = gStmLayoutNoPu;
+ g_crr_state.layer[gStmLayerNoOnScreen].state = gStmLayoutNoPopUp;
g_crr_state.layer[gStmLayerNoOnScreen].changed = STM_TRUE;
break;
default:
g_crr_state.layer[gStmLayerNoOnScreen].changed = STM_TRUE;
break;
default:
}
else if (STM_EVT_NO_DEACTIVATE == event_no) {
switch (on_screen_state) {
}
else if (STM_EVT_NO_DEACTIVATE == event_no) {
switch (on_screen_state) {
+ case gStmLayoutNoPopUp:
g_crr_state.layer[gStmLayerNoOnScreen].state = gStmLayoutNoNone;
g_crr_state.layer[gStmLayerNoOnScreen].changed = STM_TRUE;
break;
g_crr_state.layer[gStmLayerNoOnScreen].state = gStmLayoutNoNone;
g_crr_state.layer[gStmLayerNoOnScreen].changed = STM_TRUE;
break;
if ((STM_FALSE == g_map_is_activated)
&& (STM_TRUE == g_crr_state.layer[gStmLayerNoApps].changed)
if ((STM_FALSE == g_map_is_activated)
&& (STM_TRUE == g_crr_state.layer[gStmLayerNoApps].changed)
- && ((gStmLayoutNoM1 == g_crr_state.layer[gStmLayerNoApps].state)
- || (gStmLayoutNoM2 == g_crr_state.layer[gStmLayerNoApps].state)
- || (gStmLayoutNoMf == g_crr_state.layer[gStmLayerNoApps].state))) {
+ && ((gStmLayoutNoMapNml == g_crr_state.layer[gStmLayerNoApps].state)
+ || (gStmLayoutNoMapSpl == g_crr_state.layer[gStmLayerNoApps].state)
+ || (gStmLayoutNoMapFll == g_crr_state.layer[gStmLayerNoApps].state))) {
g_map_is_activated = STM_TRUE;
}
g_map_is_activated = STM_TRUE;
}
enum stm_layout_ {
gStmLayoutNoNone = 0,
enum stm_layout_ {
gStmLayoutNoNone = 0,
- gStmLayoutNoPu,
- gStmLayoutNoSa,
- gStmLayoutNoM1,
- gStmLayoutNoM2,
- gStmLayoutNoMf,
- gStmLayoutNoS1,
- gStmLayoutNoS2,
- gStmLayoutNoG,
- gStmLayoutNoHs,
- gStmLayoutNoRestriction,
- gStmLayoutNoRestrictionSplitMain,
- gStmLayoutNoRestrictionSplitSub,
- gStmLayoutNoSystem,
+ gStmLayoutNoPopUp,
+ gStmLayoutNoSysAlt,
+ gStmLayoutNoMapNml,
+ gStmLayoutNoMapSpl,
+ gStmLayoutNoMapFll,
+ gStmLayoutNoSplNml,
+ gStmLayoutNoSplSpl,
+ gStmLayoutNoGenNml,
+ gStmLayoutNoHms,
+ gStmLayoutNoRstNml,
+ gStmLayoutNoRstSplMain,
+ gStmLayoutNoRstSplSub,
+ gStmLayoutNoSysNml,
+
+ gStmLayoutNoNum,
+
+ gStmLayoutNoMin = gStmLayoutNoNone,
+ gStmLayoutNoMax = gStmLayoutNoNum - 1,