@@ -12,12 +12,14 @@ import (
1212var  currentScreen  =  "ui_Boot_Screen" 
1313var  backlightState  =  0  // 0 - NORMAL, 1 - DIMMED, 2 - OFF 
1414
15- var  dim_ticker  * time.Ticker 
16- var  off_ticker  * time.Ticker 
15+ var  (
16+ 	dimTicker  * time.Ticker 
17+ 	offTicker  * time.Ticker 
18+ )
1719
1820const  (
19- 	TOUCHSCREEN_DEVICE        string  =  "/dev/input/event1" 
20- 	BACKLIGHT_CONTROL_CLASS  string  =  "/sys/class/backlight/backlight/brightness" 
21+ 	touchscreenDevice      string  =  "/dev/input/event1" 
22+ 	backlightControlClass  string  =  "/sys/class/backlight/backlight/brightness" 
2123)
2224
2325func  switchToScreen (screen  string ) {
@@ -106,13 +108,13 @@ func setDisplayBrightness(brightness int) error {
106108	}
107109
108110	// Check the display backlight class is available 
109- 	if  _ , err  :=  os .Stat (BACKLIGHT_CONTROL_CLASS ); errors .Is (err , os .ErrNotExist ) {
111+ 	if  _ , err  :=  os .Stat (backlightControlClass ); errors .Is (err , os .ErrNotExist ) {
110112		return  errors .New ("brightness value cannot be set, possibly not running on JetKVM hardware" )
111113	}
112114
113115	// Set the value 
114116	bs  :=  []byte (strconv .Itoa (brightness ))
115- 	err  :=  os .WriteFile (BACKLIGHT_CONTROL_CLASS , bs , 0644 )
117+ 	err  :=  os .WriteFile (backlightControlClass , bs , 0644 )
116118	if  err  !=  nil  {
117119		return  err 
118120	}
@@ -129,7 +131,7 @@ func tick_displayDim() {
129131		fmt .Printf ("display: failed to dim display: %s\n " , err )
130132	}
131133
132- 	dim_ticker .Stop ()
134+ 	dimTicker .Stop ()
133135
134136	backlightState  =  1 
135137}
@@ -142,7 +144,7 @@ func tick_displayOff() {
142144		fmt .Printf ("display: failed to turn off display: %s\n " , err )
143145	}
144146
145- 	off_ticker .Stop ()
147+ 	offTicker .Stop ()
146148
147149	backlightState  =  2 
148150}
@@ -161,15 +163,15 @@ func wakeDisplay(force bool) {
161163	}
162164
163165	if  config .DisplayDimAfterSec  ==  0  {
164- 		dim_ticker .Stop ()
166+ 		dimTicker .Stop ()
165167	} else  {
166- 		dim_ticker .Reset (time .Duration (config .DisplayDimAfterSec ) *  time .Second )
168+ 		dimTicker .Reset (time .Duration (config .DisplayDimAfterSec ) *  time .Second )
167169	}
168170
169171	if  config .DisplayOffAfterSec  ==  0  {
170- 		off_ticker .Stop ()
172+ 		offTicker .Stop ()
171173	} else  {
172- 		off_ticker .Reset (time .Duration (config .DisplayOffAfterSec ) *  time .Second )
174+ 		offTicker .Reset (time .Duration (config .DisplayOffAfterSec ) *  time .Second )
173175	}
174176	backlightState  =  0 
175177}
@@ -179,7 +181,7 @@ func wakeDisplay(force bool) {
179181// TODO: This is quite a hack, really we should be getting an event from jetkvm_native, or the whole display backlight 
180182// control should be hoisted up to jetkvm_native. 
181183func  watchTsEvents () {
182- 	ts , err  :=  os .OpenFile (TOUCHSCREEN_DEVICE , os .O_RDONLY , 0666 )
184+ 	ts , err  :=  os .OpenFile (touchscreenDevice , os .O_RDONLY , 0666 )
183185	if  err  !=  nil  {
184186		fmt .Printf ("display: failed to open touchscreen device: %s\n " , err )
185187		return 
@@ -207,30 +209,30 @@ func watchTsEvents() {
207209// option has the value set to zero, but time.NewTicker only accept positive values. 
208210func  startBacklightTickers () {
209211	LoadConfig ()
210- 	if  dim_ticker  ==  nil  &&  config .DisplayDimAfterSec  !=  0  {
212+ 	if  dimTicker  ==  nil  &&  config .DisplayDimAfterSec  !=  0  {
211213		fmt .Printf ("display: dim_ticker has started." )
212- 		dim_ticker  =  time .NewTicker (time .Duration (config .DisplayDimAfterSec ) *  time .Second )
213- 		defer  dim_ticker .Stop ()
214+ 		dimTicker  =  time .NewTicker (time .Duration (config .DisplayDimAfterSec ) *  time .Second )
215+ 		defer  dimTicker .Stop ()
214216
215217		go  func () {
216218			for  {
217219				select  {
218- 				case  <- dim_ticker .C :
220+ 				case  <- dimTicker .C :
219221					tick_displayDim ()
220222				}
221223			}
222224		}()
223225	}
224226
225- 	if  off_ticker  ==  nil  &&  config .DisplayOffAfterSec  !=  0  {
227+ 	if  offTicker  ==  nil  &&  config .DisplayOffAfterSec  !=  0  {
226228		fmt .Printf ("display: off_ticker has started." )
227- 		off_ticker  =  time .NewTicker (time .Duration (config .DisplayOffAfterSec ) *  time .Second )
228- 		defer  off_ticker .Stop ()
229+ 		offTicker  =  time .NewTicker (time .Duration (config .DisplayOffAfterSec ) *  time .Second )
230+ 		defer  offTicker .Stop ()
229231
230232		go  func () {
231233			for  {
232234				select  {
233- 				case  <- off_ticker .C :
235+ 				case  <- offTicker .C :
234236					tick_displayOff ()
235237				}
236238			}
0 commit comments