Author: agrundman
Date: Tue Feb 21 08:15:38 2012
New Revision: 9613
URL: http://svn.slimdevices.com/jive?rev=9613&view=rev
Log:
Support for LiteOn light sensor in new Baby rev 7
Added:
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/logitech/baby-mp-hw-v007.patch
(with props)
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/redboot-baby-0007.bin
(with props)
Modified:
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/build-all-revs.sh
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/series
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
Modified: 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/build-all-revs.sh
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/bootloaders/redboot/imx25/build-all-revs.sh?rev=9613&r1=9612&r2=9613&view=diff
==============================================================================
--- 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/build-all-revs.sh
(original)
+++ 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/build-all-revs.sh Tue
Feb 21 08:15:38 2012
@@ -52,3 +52,6 @@
# 2G flash (rev 0006)
do_build "logitech/baby-2g-flash.patch" "redboot-baby-0006.bin"
+# MP HW Reversion 07 for new light sensor
+do_build "logitech/baby-mp-hw-v007.patch" "redboot-baby-0007.bin"
+
Added:
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/logitech/baby-mp-hw-v007.patch
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/logitech/baby-mp-hw-v007.patch?rev=9613&view=auto
==============================================================================
---
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/logitech/baby-mp-hw-v007.patch
(added)
+++
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/logitech/baby-mp-hw-v007.patch
Tue Feb 21 08:15:38 2012
@@ -1,0 +1,13 @@
+Index: ecos/packages/hal/arm/mx25/baby/current/cdl/hal_arm_board.cdl
+===================================================================
+--- ecos.orig/packages/hal/arm/mx25/baby/current/cdl/hal_arm_board.cdl
2009-08-11 14:37:24.000000000 +0100
++++ ecos/packages/hal/arm/mx25/baby/current/cdl/hal_arm_board.cdl
2009-08-11 14:37:29.000000000 +0100
+@@ -64,7 +64,7 @@
+ puts $::cdl_header "#define HAL_PLATFORM_CPU \"i.MX25 \""
+ puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Logitech Baby\""
+ puts $::cdl_header "#define HAL_PLATFORM_MACHINE_TYPE 2070"
+- puts $::cdl_header "#define HAL_PLATFORM_MACHINE_REVISION 6"
++ puts $::cdl_header "#define HAL_PLATFORM_MACHINE_REVISION 7"
+ puts $::cdl_header "#define HAL_ARCH_PROGRAM_NEW_STACK
board_program_new_stack"
+ }
+
Propchange:
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/logitech/baby-mp-hw-v007.patch
------------------------------------------------------------------------------
svn:keywords = Id
Modified: 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/series
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/series?rev=9613&r1=9612&r2=9613&view=diff
==============================================================================
--- 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/series
(original)
+++ 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/patches/series Tue Feb
21 08:15:38 2012
@@ -23,5 +23,5 @@
logitech/baby-mpq.patch
logitech/baby-mp.patch
logitech/baby-mp-realtek.patch
-
logitech/baby-2g-flash.patch
+logitech/baby-mp-hw-v007.patch
Added: 7.7/branches/7.7.1-update/bootloaders/redboot/imx25/redboot-baby-0007.bin
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/bootloaders/redboot/imx25/redboot-baby-0007.bin?rev=9613&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/redboot-baby-0007.bin
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
7.7/branches/7.7.1-update/bootloaders/redboot/imx25/redboot-baby-0007.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf?rev=9613&r1=9612&r2=9613&view=diff
==============================================================================
---
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf
(original)
+++
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf
Tue Feb 21 08:15:38 2012
@@ -69,6 +69,7 @@
baby:0004\\n\
baby:0005\\n\
baby:0006\\n\
+baby:0007\\n\
baby:25000\\n\
"
Modified:
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb?rev=9613&r1=9612&r2=9613&view=diff
==============================================================================
---
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
(original)
+++
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
Tue Feb 21 08:15:38 2012
@@ -1,7 +1,7 @@
DESCRIPTION = "baby msp430 firmware"
LICENSE = "Confidential"
-PR="r43"
+PR="r44"
PROVIDES = "baby-msp430"
@@ -20,6 +20,7 @@
install -m 0644 ${WORKDIR}/msp430-0003.txt
${INSTALL_DIR}/msp430-0004.txt
install -m 0644 ${WORKDIR}/msp430-0003.txt
${INSTALL_DIR}/msp430-0005.txt
install -m 0644 ${WORKDIR}/msp430-0003.txt
${INSTALL_DIR}/msp430-0006.txt
+ install -m 0644 ${WORKDIR}/msp430-0003.txt
${INSTALL_DIR}/msp430-0007.txt
}
PACKAGES = "baby-msp430"
Modified:
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb?rev=9613&r1=9612&r2=9613&view=diff
==============================================================================
---
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
(original)
+++
7.7/branches/7.7.1-update/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
Tue Feb 21 08:15:38 2012
@@ -2,7 +2,7 @@
LICENSE = "Confidential"
PV = "svnr${SRCREV}"
-PR="r14"
+PR="r15"
PROVIDES = "baby-msp430"
@@ -24,6 +24,7 @@
install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0004.txt
install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0005.txt
install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0006.txt
+ install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0007.txt
}
PACKAGES = "baby-msp430"
Modified:
7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
URL:
http://svn.slimdevices.com/jive/7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua?rev=9613&r1=9612&r2=9613&view=diff
==============================================================================
---
7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
(original)
+++
7.7/branches/7.7.1-update/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
Tue Feb 21 08:15:38 2012
@@ -120,11 +120,14 @@
-- Maximum number of brightness levels up/down per run of the timer
local AMBIENT_RAMPSTEPS = 4
-local STATIC_AMBIENT_MIN = 90000
+local STATIC_AMBIENT_MIN_TOSHIBA = 90000
+local STATIC_AMBIENT_MIN_LITEON = 5000
+local staticAmbientMin = -1
local brightCur = -1
local brightTarget = -1
local brightMin = MIN_BRIGHTNESS_LEVEL_INIT
+local brightLast = -1
local brightReadRateDivider = 1
@@ -325,6 +328,16 @@
brightCur = MAX_BRIGHTNESS_LEVEL
brightTarget = MAX_BRIGHTNESS_LEVEL
brightMin = settings.brightnessMinimal
+
+ if self._revision >= 7 then
+ -- LiteOn ambient light sensor
+ staticAmbientMin = STATIC_AMBIENT_MIN_LITEON
+ else
+ -- Toshiba ambient light sensor
+ staticAmbientMin = STATIC_AMBIENT_MIN_TOSHIBA
+ end
+
+ brightLast = MAX_BRIGHTNESS_LEVEL
brightReadRateDivider = 1
self.brightPrev = self:getBrightness()
@@ -432,9 +445,11 @@
if( MAX_SMOOTHING_VALUES < #luxSmooth ) then
table.remove(luxSmooth, 1)
end
- end
-
- local ambient = self:getSmoothedLux(luxSmooth)
+
+ brightLast = self:getSmoothedLux(luxSmooth)
+ end
+
+ local ambient = brightLast
--[[
log:info("Ambient: " .. tostring(ambient))
@@ -443,13 +458,13 @@
]]--
-- switch around ambient value (darker is higher)
- ambient = STATIC_AMBIENT_MIN - ambient
+ ambient = staticAmbientMin - ambient
if ambient < 0 then
ambient = 0
end
--log:info("AmbientFixed: " .. tostring(ambient))
- brightTarget = (MAX_BRIGHTNESS_LEVEL / STATIC_AMBIENT_MIN) * ambient
+ brightTarget = (MAX_BRIGHTNESS_LEVEL / staticAmbientMin) * ambient
self:doBrightnessRamping(brightTarget);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
