diff --git a/main.go b/main.go index 783e0ad..241fbe8 100644 --- a/main.go +++ b/main.go @@ -30,7 +30,7 @@ import ( var ( flash_led1_counter = 0 - last_brt = 0 + last_brt = -1 passout_time_stage = 0 led1_proc_file = "/proc/driver/led1" @@ -146,6 +146,10 @@ func InspectionTeam(main_screen *UI.MainScreen) { if elapsed > gotime.Duration(time1) *gotime.Second && passout_time_stage == 0 { fmt.Println("timeout, dim screen ",elapsed) + if main_screen.TitleBar.InLowBackLight >= 0 { + return + } + if UI.FileExists(sysgo.BackLight) { lines,err := UI.ReadLines(sysgo.BackLight) @@ -156,7 +160,7 @@ func InspectionTeam(main_screen *UI.MainScreen) { if last_brt < 0 { last_brt = brt } - d := []byte(fmt.Sprintf("%d",1)) + d := []byte(fmt.Sprintf("%d",1)) // lowest backlight ioutil.WriteFile(sysgo.BackLight,d,0644) } } @@ -171,6 +175,9 @@ func InspectionTeam(main_screen *UI.MainScreen) { }else if elapsed > gotime.Duration(time2) *gotime.Second && passout_time_stage == 1 { fmt.Println("timeout, close screen ", elapsed) + if main_screen.Closed == true { + return + } if UI.FileExists(sysgo.BackLight) { d := []byte(fmt.Sprintf("%d",0)) ioutil.WriteFile(sysgo.BackLight,d,0644) diff --git a/sysgo/UI/main_screen.go b/sysgo/UI/main_screen.go index 2fc5067..609db51 100644 --- a/sysgo/UI/main_screen.go +++ b/sysgo/UI/main_screen.go @@ -172,6 +172,7 @@ func NewMainScreen() *MainScreen { m.MsgBoxFont = Fonts["veramono20"] m.IconFont = Fonts["varela15"] + m.Closed = false return m } diff --git a/sysgo/UI/title_bar.go b/sysgo/UI/title_bar.go index e91ccb3..beec5ef 100644 --- a/sysgo/UI/title_bar.go +++ b/sysgo/UI/title_bar.go @@ -139,6 +139,8 @@ func NewTitleBar() *TitleBar { t.TitleFont = Fonts["varela16"] t.TimeFont = Fonts["varela12"] + + t.InLowBackLight = -1 return t }