Index: denali.pro.user =================================================================== diff -u -r73d6d02c19467735e92f7c451ca5d3b47a2a90e4 -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 --- denali.pro.user (.../denali.pro.user) (revision 73d6d02c19467735e92f7c451ca5d3b47a2a90e4) +++ denali.pro.user (.../denali.pro.user) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/run.sh =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 --- scripts/run.sh (.../run.sh) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ scripts/run.sh (.../run.sh) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) @@ -21,20 +21,20 @@ } +#DO NOT MODIFY VARIABLES +#unless the denali applicaiton is updated as well to match. HOME=/home/root SDCARD_DEV=/dev/mmcblk1p1 SDCARD_MNT=/media/sd-card USB_DEV=/dev/sda1 USB_MNT=/media/usb - -#DO NOT MODIFY POST VARIABLES -#unless the denali applicaiton is updated as well to match. POSTLOG=$HOME/post.log POSTMSG_CANBUS="CANBus passed" POSTMSG_SDCARD="SD-CARD passed" POSTMSG_TOUCH="Touch passed" POSTMSG_RTC="RTC passed" + # cleanup the POST log file echo "Start: $(currDate)" > $POSTLOG @@ -43,6 +43,7 @@ mkdir -p $SDCARD_MNT mkdir -p $USB_MNT + # ---------------------------------------- UPDATE #mounting usb mount $USB_DEV $USB_MNT @@ -62,6 +63,7 @@ fi fi + # ---------------------------------------- SETUP & POST #Here only passed is logged and if nothing added to the post.log means it failed. @@ -115,12 +117,24 @@ # stop the connection manager daemon killall connmand + +# setup bluetooth +/usr/share/silex-uart/silex-uart.sh start > $HOME/filesystem.out 2> $HOME/filesystem.err +hciconfig hci0 up + + # setup wifi killall wpa_supplicant >> $HOME/filesystem.out 2>> $HOME/filesystem.err + #launching denali application, disable keep-alive $HOME/denali -u & + +# setup wifi udhcpc -i eth0 -n & + +# tag the end time in the POST log file echo "End: $(date +"%d%m%Y%H%M%S")" >> $POSTLOG + Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -r1b24a85761c65a685fac98f396e244af97b94443 -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 1b24a85761c65a685fac98f396e244af97b94443) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) @@ -180,7 +180,7 @@ case eUI_Dialin: channelGroup = ChannelGroup::eChannel_Ignores; debugChannel = true; - ok = false; // it's still false since UI is not handling any messages coming form Debug Channels. + ok = false; // it's still false since UI is not handling any messages coming from Debug Channels. break; case eChlid_HD_DG : Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) @@ -305,9 +305,9 @@ eChlid_DG_UI = 0x070, ///< DG => UI eChlid_UI_DG = 0x110, ///< UI => DG [Out] - // Dialing channel has been requested by V&V team for can bus testing + // Dialing channel has been requested by V&V team for CANBus testing // and clarify the source of the unexpected channel message - // UI still doesn't do anything with the messages on these channels. + // UI still does not do anything with the messages on these channels. eDialin_HD = 0x400, ///< dialin => HD eHD_Dialin = 0x401, ///< HD => dialin eDialin_DG = 0x402, ///< dialin => DG