From a9c915dc3073f45f76ab87fcda8a0dd097c3164b Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 6 Feb 2012 21:47:02 +0800 Subject: [PATCH 1/2] Make sure rotation mode is correctly read with assert --- filechooser.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filechooser.lua b/filechooser.lua index 2582a9b3d..95f5608d5 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -70,8 +70,8 @@ function FileChooser:rotationMode() 0 --]] - orie_fd = io.open("/sys/module/eink_fb_hal_broads/parameters/bs_orientation", "r") - updown_fd = io.open("/sys/module/eink_fb_hal_broads/parameters/bs_upside_down", "r") + orie_fd = assert(io.open("/sys/module/eink_fb_hal_broads/parameters/bs_orientation", "r")) + updown_fd = assert(io.open("/sys/module/eink_fb_hal_broads/parameters/bs_upside_down", "r")) mode = orie_fd:read() + (updown_fd:read() * 2) return mode end From 72f9c5690f0ae09b1226b588df4bfda230b1ade4 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Wed, 15 Feb 2012 17:27:26 +0800 Subject: [PATCH 2/2] fix: detect emu mode in rotationMode if in emu mode, simply return 0 --- filechooser.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/filechooser.lua b/filechooser.lua index 95f5608d5..52532c768 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -69,7 +69,9 @@ function FileChooser:rotationMode() --------- 0 --]] - + if KEY_FW_DOWN == 116 then + return 0 + end orie_fd = assert(io.open("/sys/module/eink_fb_hal_broads/parameters/bs_orientation", "r")) updown_fd = assert(io.open("/sys/module/eink_fb_hal_broads/parameters/bs_upside_down", "r")) mode = orie_fd:read() + (updown_fd:read() * 2)