[Can-svn] SF.net SVN: can: [838] trunk/firmware/arm/str/common

[<ak...@us...>]

Revision: 838
          http://can.svn.sourceforge.net/can/?rev=838&view=rev
Author:   akhe
Date:     2008-02-12 09:34:09 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
Fixed bug in STR standard 73x library for sending extended identifier CAN messages.

Modified Paths:
--------------
    trunk/firmware/arm/str/common/73x_lcd.c
    trunk/firmware/arm/str/common/73x_lcd.h
    trunk/firmware/arm/str/common/str73x_lib/libSTR73x_lib.a
    trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c

Modified: trunk/firmware/arm/str/common/73x_lcd.c
===================================================================
--- trunk/firmware/arm/str/common/73x_lcd.c	2008-02-11 17:33:26 UTC (rev 837)
+++ trunk/firmware/arm/str/common/73x_lcd.c	2008-02-12 17:34:09 UTC (rev 838)
@@ -237,7 +237,7 @@
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void LCD_SendString( u8 *pBuffer, u8 Line, u8 Column )
+void LCD_SendString( char *pBuffer, u8 Line, u8 Column )
 {
   u8 len = 0, count = 0;
 
@@ -277,7 +277,7 @@
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void LCD_SendStringByStep( u8 *pBuffer, u8 Line, u8 Column )
+void LCD_SendStringByStep( char *pBuffer, u8 Line, u8 Column )
 {
   u8 len = 0, count = 0;
 
@@ -322,7 +322,7 @@
 * Output         :
 * Return         : None
 *******************************************************************************/
-void LCD_SendStringPinPong( u8 *pBuffer, u8 Line, u32 nTime )
+void LCD_SendStringPinPong( char *pBuffer, u8 Line, u32 nTime )
 {
   u8 len = 0;
 	u8 idx = 1;

Modified: trunk/firmware/arm/str/common/73x_lcd.h
===================================================================
--- trunk/firmware/arm/str/common/73x_lcd.h	2008-02-11 17:33:26 UTC (rev 837)
+++ trunk/firmware/arm/str/common/73x_lcd.h	2008-02-12 17:34:09 UTC (rev 838)
@@ -77,9 +77,9 @@
 void LCD_E_Low(void);
 void LCD_Send_Command_4bit(u8 Cmd);
 void LCD_SendData_4bit(u8 Data);
-void LCD_SendString(u8 *pBuffer, u8 Line, u8 Column);
-void LCD_SendStringByStep(u8 *pBuffer, u8 Line, u8 Column);
-void LCD_SendStringPinPong(u8 *pBuffer, u8 Line, u32 nTime);
+void LCD_SendString(char *pBuffer, u8 Line, u8 Column);
+void LCD_SendStringByStep(char *pBuffer, u8 Line, u8 Column);
+void LCD_SendStringPinPong(char *pBuffer, u8 Line, u32 nTime);
 void LCD_SetPosCur(u8 Line, u8 Column);
 void LCD_Clear(void);
 void LCD_LineClear(u8 Line);

Modified: trunk/firmware/arm/str/common/str73x_lib/libSTR73x_lib.a
===================================================================
(Binary files differ)

Modified: trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c
===================================================================
--- trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c	2008-02-11 17:33:26 UTC (rev 837)
+++ trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c	2008-02-12 17:34:09 UTC (rev 838)
@@ -384,9 +384,11 @@
   }
   else
   {
-  	/* extended ID*/
-	CANx->sMsgObj[0].A1R = EXT_FIXED_ID_ARB_L(pCanMsg->Id);
-	CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | EXT_FIXED_ID_ARB_H(pCanMsg->Id);
+  	/* extended ID      AKHE Fixed bug */    
+	//CANx->sMsgObj[0].A1R = EXT_FIXED_ID_ARB_L(pCanMsg->Id);
+	//CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | EXT_FIXED_ID_ARB_H(pCanMsg->Id);
+		CANx->sMsgObj[0].A1R = pCanMsg->Id & 0xffff;
+		CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | ( ( pCanMsg->Id >> 16 ) & 0xffff);
   }
 
   CANx->sMsgObj[0].MCR = (CANx->sMsgObj[0].MCR & 0xFEF0) | CAN_MCR_NEWDAT | CAN_MCR_TXRQST | pCanMsg->Dlc;
@@ -507,9 +509,11 @@
 	}
 	else
 	{
-  		/* extended ID*/
-		CANx->sMsgObj[0].A1R = EXT_FIXED_ID_ARB_L(pCanMsg->Id);
-		CANx->sMsgObj[0].A2R = ((CANx->sMsgObj[0].A2R) & 0xE000) | EXT_FIXED_ID_ARB_H(pCanMsg->Id);
+  		/* extended ID - AKHE Fixed bug */
+		//CANx->sMsgObj[0].A1R = EXT_FIXED_ID_ARB_L(pCanMsg->Id);
+		//CANx->sMsgObj[0].A2R = ((CANx->sMsgObj[0].A2R) & 0xE000) | EXT_FIXED_ID_ARB_H(pCanMsg->Id);
+		CANx->sMsgObj[0].A1R = pCanMsg->Id & 0xffff;
+		CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | ( ( pCanMsg->Id >> 16 ) & 0xffff);
 	}
 
 	CANx->sMsgObj[0].MCR = (CANx->sMsgObj[0].MCR & 0xFCF0) | pCanMsg->Dlc;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.