Menu
▾
▴
can-svn
|
From: <ak...@us...> - 2008-02-17 21:26:26
|
Revision: 854
http://can.svn.sourceforge.net/can/?rev=854&view=rev
Author: akhe
Date: 2008-02-17 13:26:25 -0800 (Sun, 17 Feb 2008)
Log Message:
-----------
Added some missing libs fro IAR cantest build
Added Paths:
-----------
trunk/firmware/arm/str/cantest_str73x_iar/settings/
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_adc.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_bspi.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_can.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cfg.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cmu.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_dma.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_eic.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_flash.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_gpio.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_i2c.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_lib.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_map.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_prccu.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_pwm.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_rtc.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_tb.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_tim.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_type.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_uart.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_wdg.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_wiu.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_wut.h
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_adc.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_bspi.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_can.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_cfg.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_cmu.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_dma.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_eic.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_flash.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_gpio.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_i2c.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_lib.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_prccu.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_pwm.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_rtc.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_tb.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_tim.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_uart.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_wdg.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_wiu.c
trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/source/73x_wut.c
Added: trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_adc.h
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_adc.h (rev 0)
+++ trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_adc.h 2008-02-17 21:26:25 UTC (rev 854)
@@ -0,0 +1,188 @@
+/******************** (C) COPYRIGHT 2005 STMicroelectronics ********************
+* File Name : 73x_adc.h
+* Author : MCD Application Team
+* Date First Issued : 09/27/2005 : V1.0
+* Description : This file contains all the functions prototypes for the
+* ADC software library.
+**********************************************************************************
+* History:
+* 09/27/2005 : V1.0
+**********************************************************************************
+* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS WITH
+* CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT
+* OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
+* OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
+* CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+*********************************************************************************/
+
+
+/* Define to prevent recursive inclusion ---------------------------------------*/
+#ifndef __73x_ADC_H
+#define __73x_ADC_H
+
+/* Includes --------------------------------------------------------------------*/
+#include "73x_map.h"
+#include "73x_cfg.h"
+
+
+/* Exported types --------------------------------------------------------------*/
+
+/* ADC Init structure definition */
+typedef struct
+{
+ u8 ADC_Calibration;
+ u8 ADC_SamplingPrescaler;
+ u8 ADC_ConversionPrescaler;
+ u8 ADC_FirstChannel;
+ u8 ADC_ChannelNumber;
+ u16 ADC_CalibAverage;
+ u16 ADC_AutoClockOff;
+ u16 ADC_ConversionMode;
+ }ADC_InitTypeDef;
+
+/* ADC control status flags */
+#define ADC_FLAG_ECH 0x0001
+#define ADC_FLAG_EOC 0x0002
+#define ADC_FLAG_JECH 0x0004
+#define ADC_FLAG_JEOC 0x0008
+#define ADC_FLAG_AnalogWatchdog0_LowThresold 0x0010
+#define ADC_FLAG_AnalogWatchdog0_HighThresold 0x0020
+#define ADC_FLAG_AnalogWatchdog1_LowThresold 0x0040
+#define ADC_FLAG_AnalogWatchdog1_HighThresold 0x0080
+#define ADC_FLAG_AnalogWatchdog2_LowThresold 0x0100
+#define ADC_FLAG_AnalogWatchdog2_HighThresold 0x0200
+#define ADC_FLAG_AnalogWatchdog3_LowThresold 0x0400
+#define ADC_FLAG_AnalogWatchdog3_HighThresold 0x0800
+
+/* ADC Interrupt sources */
+#define ADC_IT_None 0x0000
+#define ADC_IT_ECH 0x0001
+#define ADC_IT_EOC 0x0002
+#define ADC_IT_JECH 0x0004
+#define ADC_IT_JEOC 0x0008
+#define ADC_IT_AnalogWatchdog0_LowThresold 0x0010
+#define ADC_IT_AnalogWatchdog0_HighThresold 0x0020
+#define ADC_IT_AnalogWatchdog1_LowThresold 0x0040
+#define ADC_IT_AnalogWatchdog1_HighThresold 0x0080
+#define ADC_IT_AnalogWatchdog2_LowThresold 0x0100
+#define ADC_IT_AnalogWatchdog2_HighThresold 0x0200
+#define ADC_IT_AnalogWatchdog3_LowThresold 0x0400
+#define ADC_IT_AnalogWatchdog3_HighThresold 0x0800
+
+/* ADC Watchdogs Thresholds */
+#define ADC_AnalogWatchdog0 0x0030
+#define ADC_AnalogWatchdog1 0x00C0
+#define ADC_AnalogWatchdog2 0x0300
+#define ADC_AnalogWatchdog3 0x0C00
+
+/* ADC Channels */
+#define ADC_CHANNEL0 0x0
+#define ADC_CHANNEL1 0x1
+#define ADC_CHANNEL2 0x2
+#define ADC_CHANNEL3 0x3
+#define ADC_CHANNEL4 0x4
+#define ADC_CHANNEL5 0x5
+#define ADC_CHANNEL6 0x6
+#define ADC_CHANNEL7 0x7
+#define ADC_CHANNEL8 0x8
+#define ADC_CHANNEL9 0x9
+#define ADC_CHANNEL10 0xA
+#define ADC_CHANNEL11 0xB
+#define ADC_CHANNEL12 0xC
+#define ADC_CHANNEL13 0xD
+#define ADC_CHANNEL14 0xE
+#define ADC_CHANNEL15 0xF
+
+/* ADC DMA Channels */
+#define ADC_DMA_CHANNEL0 0x0001
+#define ADC_DMA_CHANNEL1 0x0002
+#define ADC_DMA_CHANNEL2 0x0004
+#define ADC_DMA_CHANNEL3 0x0008
+#define ADC_DMA_CHANNEL4 0x0010
+#define ADC_DMA_CHANNEL5 0x0020
+#define ADC_DMA_CHANNEL6 0x0040
+#define ADC_DMA_CHANNEL7 0x0080
+#define ADC_DMA_CHANNEL8 0x0100
+#define ADC_DMA_CHANNEL9 0x0200
+#define ADC_DMA_CHANNEL10 0x0400
+#define ADC_DMA_CHANNEL11 0x0800
+#define ADC_DMA_CHANNEL12 0x1000
+#define ADC_DMA_CHANNEL13 0x2000
+#define ADC_DMA_CHANNEL14 0x4000
+#define ADC_DMA_CHANNEL15 0x8000
+
+/* Mask for DMA enable*/
+#define ADC_DMA_Enable 0x8000
+#define ADC_DMA_Disable 0x000F
+
+/* Mask for Injected conversion start */
+#define ADC_Injec_ConversionStart 0x8000
+
+/* Mask for Watchdog Thresholds Enable */
+#define ADC_AnalogWatchdog_Enable 0x8000
+#define ADC_AnalogWatchdog_Disable 0x7FFF
+
+/* Mask for Power Down Mode */
+#define ADC_PowerDown_Enable 0x8000
+#define ADC_PowerDown_Disable 0x7FFF
+
+/* Mask for Start Conversion */
+#define ADC_ConversionStart 0x0001
+#define ADC_ConversionStop 0xFFFE
+
+/* Mask for Prescaler selection */
+#define ADC_Sampling_Prescaler 0x1
+#define ADC_Conversion_Prescaler 0x2
+#define ADC_Both_Prescalers 0x3
+
+/* ADC Conversion Modes */
+#define ADC_ConversionMode_Scan 0x8000
+#define ADC_ConversionMode_OneShot 0x0000
+
+/* Mask for Auto Clock Off */
+#define ADC_AutoClockOff_Enable 0x4000
+#define ADC_AutoClockOff_Disable 0x0000
+
+/* Mask for Calibration */
+#define ADC_Calibration_ON 0x0002
+#define ADC_Calibration_OFF 0x0000
+#define ADC_CalibAverage_Disable 0x0020
+#define ADC_CalibAverage_Enable 0x0000
+
+/* ADC Init Mask */
+#define ADC_CLR4_Mask 0x8000
+
+/* Module private variables ----------------------------------------------------*/
+
+/* Exported macro --------------------------------------------------------------*/
+
+/* Private functions -----------------------------------------------------------*/
+
+/* Exported functions ----------------------------------------------------------*/
+
+void ADC_DeInit (void);
+void ADC_StructInit (ADC_InitTypeDef *ADC_InitStruct);
+void ADC_Init (ADC_InitTypeDef *ADC_InitStruct);
+void ADC_CalibrationStart (u16 ADC_Calib);
+void ADC_ConversionCmd (u16 ADC_Cmd);
+void ADC_Cmd (FunctionalState NewState);
+void ADC_AutoClockOffConfig (FunctionalState NewState);
+void ADC_ChannelsSelect (u8 FirstChannel,u8 ChannelNumber );
+void ADC_PrescalersConfig (u8 ADC_Selection, u8 ADC_Prescaler);
+void ADC_AnalogWatchdogConfig(u16 ADC_Watchdog, u8 ADC_Channel,
+ u16 LowThreshold, u16 HighThreshold);
+void ADC_AnalogWatchdogCmd(u16 ADC_Watchdog, FunctionalState NewState);
+u16 ADC_GetAnalogWatchdogResult (u16 ADC_Watchdog);
+void ADC_InjectedConversionStart (void);
+void ADC_InjectedChannelsSelect (u8 FirstChannel,u8 ChannelNumber );
+u16 ADC_GetConversionValue( u16 ADC_Channel);
+void ADC_ITConfig (u16 ADC_IT, FunctionalState NewState );
+void ADC_FlagClear (u16 ADC_Flag);
+FlagStatus ADC_FlagStatus (u8 ADC_Flag);
+void ADC_DMAConfig(u16 ADC_DMAChannel, FunctionalState NewState);
+void ADC_DMACmd (FunctionalState NewState);
+u16 ADC_DMAFirstEnabledChannel (void);
+#endif /*__73x_ADC_H */
+
+/******************* (C) COPYRIGHT 2005 STMicroelectronics *****END OF FILE******/
Added: trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_bspi.h
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_bspi.h (rev 0)
+++ trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_bspi.h 2008-02-17 21:26:25 UTC (rev 854)
@@ -0,0 +1,150 @@
+/******************** (C) COPYRIGHT 2005 STMicroelectronics ********************
+* File Name : 73x_bspi.h
+* Author : MCD Application Team
+* Date First Issued : 09/27/2005 : V1.0
+* Description : This file contains all the functions prototypes for the
+* BSPI software library.
+**********************************************************************************
+* History:
+* 09/27/2005 : V1.0
+**********************************************************************************
+* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS WITH
+* CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT
+* OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
+* OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
+* CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+*********************************************************************************/
+
+/* Define to prevent recursive inclusion ---------------------------------------*/
+#ifndef __73x_BSPI_H
+#define __73x_BSPI_H
+
+/* Includes --------------------------------------------------------------------*/
+#include "73x_map.h"
+
+/* Exported types --------------------------------------------------------------*/
+/* BSPI Init structure definition */
+typedef struct
+{
+ u8 BSPI_RxFifoSize ;
+ u8 BSPI_TxFifoSize ;
+ u8 BSPI_SSPin ;
+ u8 BSPI_CLKDivider ;
+ u16 BSPI_CPOL ;
+ u16 BSPI_CPHA ;
+ u16 BSPI_WordLength ;
+ u16 BSPI_Mode ;
+}BSPI_InitTypeDef;
+
+/* Exported constants ---------------------------------------------------------*/
+/* BSPI System Enable */
+#define BSPI_Enable 0x0001
+#define BSPI_Disable 0xFFFE
+
+/* BSPI Master/Slave Select */
+#define BSPI_Mode_Master 0x0002
+#define BSPI_Mode_Slave 0x0000
+
+/* BSPI Receive Interrupt */
+#define BSPI_RxIT_NONE 0x0000
+#define BSPI_RxIT_RFNE 0x0004
+#define BSPI_RxIT_RFF 0x000C
+#define BSPI_RxIT_Mask 0xFFF3
+
+/* BSPI Interrupts */
+#define BSPI_IT_REI 0x0010
+#define BSPI_IT_BEI 0x0080
+
+/* BSPI Clock Polarity */
+#define BSPI_CPOL_Low 0x0100
+#define BSPI_CPOL_High 0x0000
+
+/* BSPI Clock Phase */
+#define BSPI_CPHA_1Edge 0x0000
+#define BSPI_CPHA_2Edge 0x0200
+
+/* BSPI Word Length */
+#define BSPI_WordLength_16b 0x0400
+#define BSPI_WordLength_8b 0x0000
+
+/* BSPI Transmit Interrupt */
+#define BSPI_TxIT_NONE 0x0000
+#define BSPI_TxIT_TFE 0x4000
+#define BSPI_TxIT_TUFL 0x8000
+#define BSPI_TxIT_TFF 0xC000
+#define BSPI_TxIT_Mask 0x3FFF
+
+/* BSPI Flags */
+#define BSPI_FLAG_BERR 0x004
+#define BSPI_FLAG_RFNE 0x008
+#define BSPI_FLAG_RFF 0x010
+#define BSPI_FLAG_ROFL 0x020
+#define BSPI_FLAG_TFE 0x040
+#define BSPI_FLAG_TUFL 0x080
+#define BSPI_FLAG_TFF 0x100
+#define BSPI_FLAG_TFNE 0x200
+
+/* BSPI DMA Interface Enable */
+#define BSPI_DMA_Enable 0x02
+#define BSPI_DMA_Disable 0xFD
+
+/* BSPI DMA Transmit Request */
+#define BSPI_DMAReq_Tx 0x40
+
+/* BSPI DMA Receive Request */
+#define BSPI_DMAReq_Rx 0x80
+
+/* BSPI DMA Transmit Burst Length */
+#define BSPI_DMA_TxBurst_1Word 0x00
+#define BSPI_DMA_TxBurst_4Word 0x04
+#define BSPI_DMA_TxBurst_8Word 0x08
+#define BSPI_DMA_TxBurst_16Word 0x0C
+#define BSPI_DMA_TxBurst_Mask 0xF3
+
+/* BSPI DMA Receive Burst Length */
+#define BSPI_DMA_RxBurst_1Word 0x00
+#define BSPI_DMA_RxBurst_4Word 0x10
+#define BSPI_DMA_RxBurst_8Word 0x20
+#define BSPI_DMA_RxBurst_16Word 0x30
+#define BSPI_DMA_RxBurst_Mask 0xCF
+
+/* BSPI Mask Slave Select */
+#define BSPI_SSPin_Masked 0x01
+#define BSPI_SSPin_Used 0x00
+
+/* BSPI receive FIFO disable */
+#define BSPI_DFIFO 0x01
+
+#define BSPI_RxFifoSize_Mask 0x0FFF
+#define BSPI_TxFifoSize_Mask 0xC3FF
+
+#define BSPI_CSR1_Mask 0x00FD
+#define BSPI_CSR2_Mask 0xC3FF
+#define BSPI_CSR3_Mask 0xFFFE
+
+/* Module private variables --------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+void BSPI_DeInit(BSPI_TypeDef* BSPIx);
+void BSPI_StructInit(BSPI_InitTypeDef* BSPI_InitStruct);
+void BSPI_Init(BSPI_TypeDef* BSPIx, BSPI_InitTypeDef* BSPI_InitStruct);
+void BSPI_Cmd(BSPI_TypeDef* BSPIx, FunctionalState NewState);
+void BSPI_ITConfig(BSPI_TypeDef* BSPIx, u16 BSPI_IT, FunctionalState NewState);
+void BSPI_TxITConfig(BSPI_TypeDef* BSPIx, u16 BSPI_TxIT);
+void BSPI_RxITConfig(BSPI_TypeDef* BSPIx, u16 BSPI_RxIT);
+void BSPI_DMAConfig(BSPI_TypeDef* BSPIx, u8 BSPI_DMAReq, FunctionalState NewState);
+void BSPI_DMATxBurstConfig(BSPI_TypeDef* BSPIx, u8 BSPI_DMA_TxBurst);
+void BSPI_DMARxBurstConfig(BSPI_TypeDef* BSPIx, u8 BSPI_DMA_RxBurst);
+void BSPI_DMACmd(BSPI_TypeDef* BSPIx, FunctionalState NewState);
+void BSPI_WordSend(BSPI_TypeDef* BSPIx, u16 Data);
+u16 BSPI_WordReceive(BSPI_TypeDef* BSPIx);
+ErrorStatus BSPI_BufferReceive(BSPI_TypeDef* BSPIx, u8* PtrToBuffer, u8 NbOfBytes);
+ErrorStatus BSPI_BufferSend(BSPI_TypeDef* BSPIx, u8* PtrToBuffer, u8 NbOfBytes);
+void BSPI_RxFifoDisable(BSPI_TypeDef* BSPIx);
+FlagStatus BSPI_FlagStatus(BSPI_TypeDef* BSPIx, u16 BSPI_Flag);
+
+#endif /* __73x_BSPI_H */
+
+/******************* (C) COPYRIGHT 2005 STMicroelectronics *****END OF FILE****/
Added: trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_can.h
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_can.h (rev 0)
+++ trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_can.h 2008-02-17 21:26:25 UTC (rev 854)
@@ -0,0 +1,166 @@
+/******************** (C) COPYRIGHT 2005 STMicroelectronics ********************
+* File Name : 73x_can.h
+* Author : MCD Application Team
+* Date First Issued : 09/27/2005 : V1.0
+* Description : This file contains all the functions prototypes for the
+* CAN bus software library.
+**********************************************************************************
+* History:
+* 09/27/2005 : V1.0
+**********************************************************************************
+* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS WITH
+* CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT
+* OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
+* OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
+* CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+*********************************************************************************/
+
+/* Define to prevent recursive inclusion ---------------------------------------*/
+
+#ifndef __73x_CAN_H
+#define __73x_CAN_H
+
+/* Includes --------------------------------------------------------------------*/
+#include "73x_map.h"
+
+/* Exported types --------------------------------------------------------------*/
+
+/* CAN Init structure define */
+typedef struct
+{
+ u8 CAN_Mask;
+ u32 CAN_Bitrate;
+}CAN_InitTypeDef;
+
+/* Exported constants ----------------------------------------------------------*/
+/* Standard bitrates available*/
+enum
+{
+ CAN_BITRATE_100K,
+ CAN_BITRATE_125K,
+ CAN_BITRATE_250K,
+ CAN_BITRATE_500K,
+ CAN_BITRATE_1M
+};
+
+/* Control register*/
+#define CAN_CR_TEST 0x0080
+#define CAN_CR_CCE 0x0040
+#define CAN_CR_DAR 0x0020
+#define CAN_CR_EIE 0x0008
+#define CAN_CR_SIE 0x0004
+#define CAN_CR_IE 0x0002
+#define CAN_CR_INIT 0x0001
+
+/* Status register */
+#define CAN_SR_BOFF 0x0080
+#define CAN_SR_EWARN 0x0040
+#define CAN_SR_EPASS 0x0020
+#define CAN_SR_RXOK 0x0010
+#define CAN_SR_TXOK 0x0008
+#define CAN_SR_LEC 0x0007
+
+/* Test register*/
+#define CAN_TESTR_RX 0x0080
+#define CAN_TESTR_TX1 0x0040
+#define CAN_TESTR_TX0 0x0020
+#define CAN_TESTR_LBACK 0x0010
+#define CAN_TESTR_SILENT 0x0008
+#define CAN_TESTR_BASIC 0x0004
+
+/* IFn / Command Request register*/
+#define CAN_CRR_BUSY 0x8000
+
+/* IFn / Command Mask register*/
+#define CAN_CMR_WRRD 0x0080
+#define CAN_CMR_MASK 0x0040
+#define CAN_CMR_ARB 0x0020
+#define CAN_CMR_CONTROL 0x0010
+#define CAN_CMR_CLRINTPND 0x0008
+#define CAN_CMR_TXRQSTNEWDAT 0x0004
+#define CAN_CMR_DATAA 0x0002
+#define CAN_CMR_DATAB 0x0001
+
+/* IFn / Mask 2 register*/
+#define CAN_M2R_MXTD 0x8000
+#define CAN_M2R_MDIR 0x4000
+
+/* IFn / Arbitration 2 register*/
+#define CAN_A2R_MSGVAL 0x8000
+#define CAN_A2R_XTD 0x4000
+#define CAN_A2R_DIR 0x2000
+
+/* IFn / Message Control register*/
+#define CAN_MCR_NEWDAT 0x8000
+#define CAN_MCR_MSGLST 0x4000
+#define CAN_MCR_INTPND 0x2000
+#define CAN_MCR_UMASK 0x1000
+#define CAN_MCR_TXIE 0x0800
+#define CAN_MCR_RXIE 0x0400
+#define CAN_MCR_RMTEN 0x0200
+#define CAN_MCR_TXRQST 0x0100
+#define CAN_MCR_EOB 0x0080
+
+
+/* Wake-up modes*/
+enum
+{
+ CAN_WAKEUP_ON_EXT,
+ CAN_WAKEUP_ON_CAN
+};
+
+
+/* CAN message structure*/
+typedef struct
+{
+ u32 IdType;
+ u32 Id;
+ u8 Dlc;
+ u8 Data[8];
+} canmsg;
+
+/* Message ID types*/
+enum
+{
+ CAN_STD_ID,
+ CAN_EXT_ID
+};
+
+/* Message ID limits*/
+
+#define CAN_LAST_STD_ID ((1<<11) - 1)
+#define CAN_LAST_EXT_ID ((1L<<29) - 1)
+
+/* Exported functions ------------------------------------------------------- */
+
+void CAN_Init (CAN_TypeDef *CANx, CAN_InitTypeDef *CAN_InitStruct);
+void CAN_DeInit (CAN_TypeDef *CANx);
+void CAN_StructInit(CAN_InitTypeDef *CAN_InitStruct);
+void CAN_SetBitrate(CAN_TypeDef *CANx, u32 bitrate);
+void CAN_SetTiming(CAN_TypeDef *CANx, u32 tseg1, u32 tseg2, u32 sjw, u32 brp);
+void CAN_SetUnusedMsgObj(CAN_TypeDef *CANx, u32 msgobj);
+void CAN_SetTxMsgObj(CAN_TypeDef *CANx, u32 msgobj, u32 idType);
+void CAN_SetRxMsgObj(CAN_TypeDef *CANx, u32 msgobj, u32 idType, u32 idLow, u32 idHigh, bool singleOrFifoLast);
+void CAN_InvalidateAllMsgObj(CAN_TypeDef *CANx);
+void CAN_ReleaseMessage(CAN_TypeDef *CANx, u32 msgobj);
+u32 CAN_SendMessage(CAN_TypeDef *CANx, u32 msgobj, canmsg* pCanMsg);
+u32 CAN_ReceiveMessage(CAN_TypeDef *CANx, u32 msgobj, bool release, canmsg* pCanMsg);
+void CAN_WaitEndOfTx(CAN_TypeDef *CANx);
+u32 CAN_BasicSendMessage(CAN_TypeDef *CANx, canmsg* pCanMsg);
+u32 CAN_BasicReceiveMessage(CAN_TypeDef *CANx, canmsg* pCanMsg);
+void CAN_EnterTestMode(CAN_TypeDef *CANx, u8 mask);
+void CAN_EnterInitMode(CAN_TypeDef *CANx, u8 mask);
+void CAN_LeaveInitMode(CAN_TypeDef *CANx);
+void CAN_LeaveTestMode(CAN_TypeDef *CANx);
+void CAN_ReleaseTxMessage(CAN_TypeDef *CANx, u32 msgobj);
+void CAN_ReleaseRxMessage(CAN_TypeDef *CANx, u32 msgobj);
+u32 CAN_IsMessageWaiting(CAN_TypeDef *CANx, u32 msgobj);
+u32 CAN_IsTransmitRequested(CAN_TypeDef *CANx, u32 msgobj);
+u32 CAN_IsInterruptPending(CAN_TypeDef *CANx, u32 msgobj);
+u32 CAN_IsObjectValid(CAN_TypeDef *CANx, u32 msgobj);
+
+
+#endif /* __73x_CAN_H */
+
+/******************* (C) COPYRIGHT 2005 STMicroelectronics *****END OF FILE****/
Added: trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cfg.h
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cfg.h (rev 0)
+++ trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cfg.h 2008-02-17 21:26:25 UTC (rev 854)
@@ -0,0 +1,109 @@
+/******************** (C) COPYRIGHT 2005 STMicroelectronics ********************
+* File Name : 73x_cfg.h
+* Author : MCD Application Team
+* Date First Issued : 09/27/2005 : V1.0
+* Description : This file contains all the functions prototypes for the
+* CFG software library.
+**********************************************************************************
+* History:
+* 09/27/2005 : V1.0
+**********************************************************************************
+* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS WITH
+* CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT
+* OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
+* OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
+* CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+*********************************************************************************/
+
+/* Define to prevent recursive inclusion ------------------------------------ */
+#ifndef __73x_CFG_H
+#define __73x_CFG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "73x_map.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* The memory to be remapped */
+typedef enum
+{
+ CFG_MEM_RAM = 0x01,
+ CFG_MEM_FLASH
+} CFG_MEM_TypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define CFG_CLK_RAM 0
+#define CFG_CLK_I2C0 1
+#define CFG_CLK_WIU 2
+#define CFG_CLK_UART0 4
+#define CFG_CLK_UART1 5
+#define CFG_CLK_TIM0 6
+#define CFG_CLK_TIM1 7
+#define CFG_CLK_TB0 8
+#define CFG_CLK_CAN0 10
+#define CFG_CLK_CAN1 11
+#define CFG_CLK_PWM0 12
+#define CFG_CLK_PWM1 13
+#define CFG_CLK_PWM2 14
+#define CFG_CLK_PWM3 15
+#define CFG_CLK_PWM4 16
+#define CFG_CLK_PWM5 17
+#define CFG_CLK_GPIO0 18
+#define CFG_CLK_GPIO1 19
+#define CFG_CLK_GPIO2 20
+#define CFG_CLK_GPIO3 21
+#define CFG_CLK_GPIO4 22
+#define CFG_CLK_GPIO5 23
+#define CFG_CLK_GPIO6 24
+#define CFG_CLK_BSPI0 25
+#define CFG_CLK_BSPI1 26
+#define CFG_CLK_BSPI2 27
+#define CFG_CLK_ADC 28
+#define CFG_CLK_EIC 29
+#define CFG_CLK_WUT 30
+#define CFG_CLK_I2C1 32
+#define CFG_CLK_TIM5 35
+#define CFG_CLK_TIM6 36
+#define CFG_CLK_TIM7 37
+#define CFG_CLK_TIM8 38
+#define CFG_CLK_TIM9 39
+#define CFG_CLK_UART2 40
+#define CFG_CLK_UART3 41
+#define CFG_CLK_TB1 45
+#define CFG_CLK_TB2 46
+#define CFG_CLK_CAN2 47
+#define CFG_CLK_TIM2 48
+#define CFG_CLK_TIM3 49
+#define CFG_CLK_TIM4 50
+#define CFG_CLK_RTC 51
+#define CFG_CLK_DMA0 52
+#define CFG_CLK_DMA1 53
+#define CFG_CLK_DMA2 54
+#define CFG_CLK_DMA3 55
+#define CFG_CLK_ARB 61
+#define CFG_CLK_AHB 62
+
+/* CFG flags */
+#define CFG_FLAG_SYS 0x800
+#define CFG_FLAG_BOOT 0x400
+#define CFG_FLAG_USER1 0x200
+#define CFG_FLAG_USER2 0x100
+#define CFG_FLAG_JTBT 0x80
+
+/* Module private variables --------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+void CFG_RemapConfig(CFG_MEM_TypeDef CFG_Mem );
+void CFG_PeripheralClockConfig(u8 CFG_CLK_Periph, FunctionalState NewStatus);
+void CFG_EmulationPeripheralClockConfig(u8 CFG_CLK_Periph, FunctionalState NewStatus);
+void CFG_PeripheralClockStop(u8 CFG_CLK_Periph);
+void CFG_PeripheralClockStart(u8 CFG_CLK_Periph);
+u32 CFG_DeviceID(void);
+void CFG_FlashPowerOnDelay(u8 Delay);
+FlagStatus CFG_FlagStatus(u16 CFG_Flag);
+
+#endif /* __73x_CFG_H */
+
+/******************* (C) COPYRIGHT 2005 STMicroelectronics *****END OF FILE****/
Added: trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cmu.h
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cmu.h (rev 0)
+++ trunk/firmware/arm/str/cantest_str73x_iar/str73x_lib/include/73x_cmu.h 2008-02-17 21:26:25 UTC (rev 854)
@@ -0,0 +1,119 @@
+/******************** (C) COPYRIGHT 2005 STMicroelectronics ********************
+* File Name : 73x_cmu.h
+* Author : MCD Application Team
+* Date First Issued : 09/27/2005 : V1.0
+* Description : This file contains all the functions prototypes for the
+* CMU software library.
+**********************************************************************************
+* History:
+* 09/27/2005 : V1.0
+**********************************************************************************
+* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS WITH
+* CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT
+* OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
+* OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
+* CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+*********************************************************************************/
+
+/* Define to prevent recursive inclusion ------------------------------------ */
+#ifndef __73x_CMU_H
+#define __73x_CMU_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "73x_map.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef struct{
+ u8 CMU_RCOscControl; /*Adjusts the frequency of Rc oscillator */
+ u8 CMU_EndCountValue; /*End of count value */
+ u16 CMU_FreqRef_High; /*Frequency reference high bits */
+ u16 CMU_FreqRef_Low; /*Frequency reference low bits */
+ u16 CMU_CKSEL0; /*RC-Oscillator selector bit */
+ u16 CMU_CKSEL1; /*Oscillator-PLL selector bit */
+ u16 CMU_CKSEL2; /*CK selector bit */
+}CMU_InitTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/*CMU CKOUT = CKRC or CKOSC*/
+#define CMU_CKSEL0_CKOSC 0x0001
+#define CMU_CKSEL0_CKRC 0x0000
+
+/*CMU Frequency Meter clock = CKPLL or CKOSC*/
+#define CMU_CK...
[truncated message content] |
|
From: <ak...@us...> - 2008-02-25 16:04:05
|
Revision: 861
http://can.svn.sourceforge.net/can/?rev=861&view=rev
Author: akhe
Date: 2008-02-25 08:03:59 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
Fixed IAR 72x CAN sample so both polling and interrupt works even when other frames are present on the bus.
Modified Paths:
--------------
trunk/firmware/arm/str/cantest_str73x_iar/73x_it.c
trunk/firmware/arm/str/cantest_str73x_iar/cantest.dep
trunk/firmware/arm/str/cantest_str73x_iar/main.c
trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.dni
trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.wsdt
Modified: trunk/firmware/arm/str/cantest_str73x_iar/73x_it.c
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/73x_it.c 2008-02-25 14:25:56 UTC (rev 860)
+++ trunk/firmware/arm/str/cantest_str73x_iar/73x_it.c 2008-02-25 16:03:59 UTC (rev 861)
@@ -29,18 +29,18 @@
/* Private typedef -------------------------------------------------------------*/
/* Private define --------------------------------------------------------------*/
enum {
- CAN0_TX_MSGOBJ = 0,
- CAN0_RX_MSGOBJ = 1
+ CAN0_TX_MSGOBJ = 0,
+ CAN0_RX_MSGOBJ = 1
};
enum {
- CAN1_TX_MSGOBJ = 0,
- CAN1_RX_MSGOBJ = 1
+ CAN1_TX_MSGOBJ = 0,
+ CAN1_RX_MSGOBJ = 1
};
enum {
- CAN2_TX_MSGOBJ = 0,
- CAN2_RX_MSGOBJ = 1
+ CAN2_TX_MSGOBJ = 0,
+ CAN2_RX_MSGOBJ = 1
};
/* Private macro ---------------------------------------------------------------*/
@@ -654,30 +654,27 @@
*******************************************************************************/
void CAN0_IRQHandler (void)
{
- u32 msgobj;
+ u32 msgobj;
+ if ( CAN0->IDR == 0x8000 ) // status interrupt
+ (void)CAN0->SR; // read the status register to clear
+ else if ( ( CAN0->IDR >= 1 ) && ( CAN0->IDR <= 32 ) ) {
+ // Get the message object number that caused the interrupt to occur
+ switch ( msgobj = CAN0->IDR - 1 ) {
+ case CAN0_TX_MSGOBJ:
+ GPIO_BitWrite( GPIO0, GPIO_PIN_7 , Bit_SET );
+ CAN_ReleaseTxMessage(CAN0, msgobj);
+ break;
- if (CAN0->IDR == 0x8000) /* status interrupt */
- (void)CAN0->SR; /* read the status register to clear */
- else if ((CAN0->IDR >= 1) && (CAN0->IDR <= 32))
- {
- /* Get the message object number that caused the interrupt to occur*/
- switch (msgobj = CAN0->IDR - 1)
- {
- case CAN0_TX_MSGOBJ:
- GPIO_BitWrite(GPIO0, GPIO_PIN_7 , Bit_SET);
- CAN_ReleaseTxMessage(CAN0, msgobj);
- break;
+ case CAN0_RX_MSGOBJ:
+ CAN_ReceiveMessage( CAN0, msgobj, FALSE, &RxCan0Msg );
+ CAN_ReleaseRxMessage( CAN0, msgobj );
+ break;
- case CAN0_RX_MSGOBJ:
- CAN_ReceiveMessage(CAN0, msgobj, FALSE, &RxCan0Msg);
- CAN_ReleaseRxMessage(CAN0, msgobj);
- break;
-
- default:
- CAN_ReleaseMessage(CAN0, msgobj);
- }
- }
+ default:
+ CAN_ReleaseMessage( CAN0, msgobj );
+ }
+ }
}
/*******************************************************************************
@@ -689,29 +686,27 @@
*******************************************************************************/
void CAN1_IRQHandler (void)
{
- u32 msgobj;
+ u32 msgobj;
- if (CAN1->IDR == 0x8000) /*status interrupt*/
- (void)CAN1->SR; /* read the status register to clear*/
- else if ((CAN1->IDR >= 1) && (CAN1->IDR <= 32))
- {
- /* get the message object number that caused the interrupt to occur*/
- switch (msgobj = CAN1->IDR - 1)
- {
- case CAN1_TX_MSGOBJ:
- GPIO_BitWrite(GPIO0, GPIO_PIN_9 , Bit_SET);
- CAN_ReleaseTxMessage(CAN1, msgobj);
- break;
+ if (CAN1->IDR == 0x8000) /*status interrupt*/
+ (void)CAN1->SR; /* read the status register to clear*/
+ else if ( ( CAN1->IDR >= 1 ) && ( CAN1->IDR <= 32 ) ) {
+ /* get the message object number that caused the interrupt to occur*/
+ switch ( msgobj = CAN1->IDR - 1 ) {
+ case CAN1_TX_MSGOBJ:
+ GPIO_BitWrite(GPIO0, GPIO_PIN_9 , Bit_SET);
+ CAN_ReleaseTxMessage(CAN1, msgobj);
+ break;
- case CAN1_RX_MSGOBJ:
- CAN_ReceiveMessage(CAN1, msgobj, FALSE, &RxCan1Msg);
- CAN_ReleaseRxMessage(CAN1, msgobj);
- break;
+ case CAN1_RX_MSGOBJ:
+ CAN_ReceiveMessage(CAN1, msgobj, FALSE, &RxCan1Msg);
+ CAN_ReleaseRxMessage(CAN1, msgobj);
+ break;
- default:
- CAN_ReleaseMessage(CAN1, msgobj);
- }
- }
+ default:
+ CAN_ReleaseMessage(CAN1, msgobj);
+ }
+ }
}
@@ -724,30 +719,27 @@
*******************************************************************************/
void CAN2_IRQHandler (void)
{
- u32 msgobj;
+ u32 msgobj;
+
+ if (CAN2->IDR == 0x8000) /* status interrupt*/
+ (void)CAN2->SR; /* read the status register to clear*/
+ else if ( CAN2->IDR >= 1 && CAN2->IDR <= 32 ) {
+ /* get the message object number that caused the interrupt to occur*/
+ switch ( msgobj = CAN2->IDR - 1 ) {
+ case CAN2_TX_MSGOBJ:
+ GPIO_BitWrite(GPIO0, GPIO_PIN_11 , Bit_SET);
+ CAN_ReleaseTxMessage(CAN2, msgobj);
+ break;
+ case CAN2_RX_MSGOBJ:
+ CAN_ReceiveMessage(CAN2, msgobj, FALSE, &RxCan2Msg);
+ CAN_ReleaseRxMessage(CAN2, msgobj);
+ break;
- if (CAN2->IDR == 0x8000) /* status interrupt*/
- (void)CAN2->SR; /* read the status register to clear*/
- else if (CAN2->IDR >= 1 && CAN2->IDR <= 32)
- {
- /* get the message object number that caused the interrupt to occur*/
- switch (msgobj = CAN2->IDR - 1)
- {
- case CAN2_TX_MSGOBJ:
- GPIO_BitWrite(GPIO0, GPIO_PIN_11 , Bit_SET);
- CAN_ReleaseTxMessage(CAN2, msgobj);
- break;
-
- case CAN2_RX_MSGOBJ:
- CAN_ReceiveMessage(CAN2, msgobj, FALSE, &RxCan2Msg);
- CAN_ReleaseRxMessage(CAN2, msgobj);
- break;
-
- default:
- CAN_ReleaseMessage(CAN2, msgobj);
- }
- }
+ default:
+ CAN_ReleaseMessage(CAN2, msgobj);
+ }
+ }
}
/*******************************************************************************
Modified: trunk/firmware/arm/str/cantest_str73x_iar/cantest.dep
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/cantest.dep 2008-02-25 14:25:56 UTC (rev 860)
+++ trunk/firmware/arm/str/cantest_str73x_iar/cantest.dep 2008-02-25 16:03:59 UTC (rev 861)
@@ -6,397 +6,397 @@
<configuration>
<name>Debug</name>
<outputs>
- <file>$PROJ_DIR$\str73x_lib\source\73x_cfg.c</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_gpio.h</file>
- <file>$TOOLKIT_DIR$\inc\DLib_Product_string.h</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_prccu.c</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_rtc.o</file>
- <file>$PROJ_DIR$\Debug\Obj\main.o</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_cmu.pbi</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_can.pbi</file>
- <file>$PROJ_DIR$\Startup\73x_init.s</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_adc.c</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_lib.c</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_cmu.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_prccu.o</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_type.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_cfg.pbi</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_can.h</file>
- <file>$TOOLKIT_DIR$\inc\DLib_Defaults.h</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_adc.h</file>
<file>$PROJ_DIR$\Debug\Obj\73x_can.o</file>
<file>$PROJ_DIR$\str73x_lib\include\73x_lib.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_it.o</file>
- <file>$PROJ_DIR$\main.c</file>
- <file>$PROJ_DIR$\73x_lcd.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_eic.o</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_eic.h</file>
- <file>$TOOLKIT_DIR$\lib\rt4t_al.a</file>
- <file>$TOOLKIT_DIR$\inc\xencoding_limits.h</file>
- <file>$PROJ_DIR$\73x_it.c</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_cmu.c</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_vect.o</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_gpio.c</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_rtc.pbi</file>
+ <file>$TOOLKIT_DIR$\inc\ycheck.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\cantest.pbd</file>
<file>$PROJ_DIR$\Debug\Obj\73x_lcd.pbi</file>
<file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
- <file>$TOOLKIT_DIR$\inc\ycheck.h</file>
- <file>$PROJ_DIR$\Debug\Obj\cantest.pbd</file>
<file>$TOOLKIT_DIR$\lib\shs_l.a</file>
<file>$PROJ_DIR$\Debug\Obj\73x_adc.pbi</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_eic.c</file>
+ <file>$TOOLKIT_DIR$\inc\DLib_Config_Normal.h</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_map.h</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_prccu.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_adc.o</file>
<file>$TOOLKIT_DIR$\lib\dl4t_tl_in.a</file>
<file>$TOOLKIT_DIR$\inc\DLib_Product.h</file>
- <file>$TOOLKIT_DIR$\inc\DLib_Config_Normal.h</file>
- <file>$PROJ_DIR$\Startup\73x_vect.s</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_cmu.o</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_gpio.pbi</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_cfg.o</file>
- <file>$PROJ_DIR$\linker\STR73x_FLASH.icf</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_it.pbi</file>
+ <file>$PROJ_DIR$\Debug\Exe\cantest.out</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_cfg.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_it.o</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_adc.c</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_gpio.o</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_cfg.c</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_lib.pbi</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_eic.pbi</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_lib.o</file>
+ <file>$TOOLKIT_DIR$\inc\xencoding_limits.h</file>
+ <file>$TOOLKIT_DIR$\lib\rt4t_al.a</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_rtc.pbi</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_rtc.o</file>
+ <file>$PROJ_DIR$\Debug\Obj\main.o</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_adc.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_cmu.pbi</file>
+ <file>$TOOLKIT_DIR$\inc\DLib_Defaults.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_can.pbi</file>
+ <file>$TOOLKIT_DIR$\inc\yvals.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_init.o</file>
<file>$TOOLKIT_DIR$\inc\string.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_init.o</file>
- <file>$TOOLKIT_DIR$\inc\yvals.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_lib.o</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_map.h</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_prccu.h</file>
- <file>$PROJ_DIR$\str73x_lib\source\73x_can.c</file>
<file>$PROJ_DIR$\Debug\Obj\73x_lcd.o</file>
<file>$TOOLKIT_DIR$\inc\ysizet.h</file>
<file>$PROJ_DIR$\str73x_lib\include\73x_rtc.h</file>
<file>$TOOLKIT_DIR$\inc\DLib_Threads.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_prccu.pbi</file>
+ <file>$PROJ_DIR$\linker\STR73x_FLASH.icf</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_cmu.o</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_cfg.o</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_gpio.pbi</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_cmu.h</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_type.h</file>
+ <file>$TOOLKIT_DIR$\inc\DLib_Product_string.h</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_gpio.h</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_vect.o</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_eic.o</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_eic.h</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_lib.c</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_prccu.c</file>
<file>$PROJ_DIR$\str73x_lib\source\73x_rtc.c</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_prccu.pbi</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_gpio.o</file>
- <file>$PROJ_DIR$\str73x_lib\include\73x_cfg.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_adc.o</file>
+ <file>$PROJ_DIR$\Startup\73x_init.s</file>
+ <file>$PROJ_DIR$\73x_it.c</file>
+ <file>$PROJ_DIR$\Startup\73x_vect.s</file>
+ <file>$PROJ_DIR$\73x_conf.h</file>
<file>$PROJ_DIR$\73x_lcd.c</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_it.pbi</file>
- <file>$PROJ_DIR$\Debug\Exe\cantest.out</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_lib.pbi</file>
- <file>$PROJ_DIR$\73x_conf.h</file>
- <file>$PROJ_DIR$\Debug\Obj\73x_eic.pbi</file>
+ <file>$PROJ_DIR$\73x_lcd.h</file>
+ <file>$PROJ_DIR$\main.c</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_prccu.o</file>
+ <file>$PROJ_DIR$\Debug\Obj\73x_cfg.pbi</file>
+ <file>$PROJ_DIR$\str73x_lib\include\73x_can.h</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_eic.c</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_gpio.c</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_can.c</file>
+ <file>$PROJ_DIR$\str73x_lib\source\73x_cmu.c</file>
</outputs>
<file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_cfg.c</name>
+ <name>$PROJ_DIR$\Debug\Obj\cantest.pbd</name>
+ <inputs>
+ <tool>
+ <name>BILINK</name>
+ <file> 7 32 63 30 22 44 14 4 21 40 26 5</file>
+ </tool>
+ </inputs>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\Debug\Exe\cantest.out</name>
+ <inputs>
+ <tool>
+ <name>ILINK</name>
+ <file> 41 11 0 43 42 50 19 34 17 36 23 62 27 49 28 6 25 12</file>
+ </tool>
+ </inputs>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_adc.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 14</file>
+ <file> 7</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 45</file>
+ <file> 11</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 61 51 67 13</file>
+ <file> 29 9 58 46 16</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 61 51 67 13</file>
+ <file> 29 9 58 46 16</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_prccu.c</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_cfg.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 59</file>
+ <file> 63</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 12</file>
+ <file> 43</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 52 51 67 13 11</file>
+ <file> 16 9 58 46</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 52 51 67 13 11</file>
+ <file> 16 9 58 46</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\Startup\73x_init.s</name>
+ <name>[ROOT_NODE]</name>
<outputs>
<tool>
- <name>AARM</name>
- <file> 48</file>
+ <name>ILINK</name>
+ <file> 15</file>
</tool>
</outputs>
</file>
<file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_adc.c</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_lib.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 37</file>
+ <file> 21</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 62</file>
+ <file> 23</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 17 51 67 13 61</file>
+ <file> 1 9 58 46 10 16 64 48 45 51</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 17 51 67 13 61</file>
+ <file> 1 9 58 46 10 16 64 48 45 51</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_lib.c</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_prccu.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 66</file>
+ <file> 40</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 50</file>
+ <file> 62</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 19 51 67 13 52 61 15 1 11 24</file>
+ <file> 10 9 58 46 45</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 19 51 67 13 52 61 15 1 11 24</file>
+ <file> 10 9 58 46 45</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\main.c</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_rtc.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 33</file>
+ <file> 26</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 5</file>
+ <file> 27</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 19 51 67 13 52 61 15 1 11 24</file>
+ <file> 38 9 58 46 16</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 19 51 67 13 52 61 15 1 11 24</file>
+ <file> 38 9 58 46 16</file>
</tool>
</inputs>
</file>
<file>
+ <name>$PROJ_DIR$\Startup\73x_init.s</name>
+ <outputs>
+ <tool>
+ <name>AARM</name>
+ <file> 34</file>
+ </tool>
+ </outputs>
+ </file>
+ <file>
<name>$PROJ_DIR$\73x_it.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 64</file>
+ <file> 14</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 20</file>
+ <file> 17</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 19 51 67 13 52 61 15 1 11 24</file>
+ <file> 1 9 58 46 10 16 64 48 45 51</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 19 51 67 13 52 61 15 1 11 24</file>
+ <file> 1 9 58 46 10 16 64 48 45 51</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_cmu.c</name>
+ <name>$PROJ_DIR$\Startup\73x_vect.s</name>
<outputs>
<tool>
+ <name>AARM</name>
+ <file> 49</file>
+ </tool>
+ </outputs>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\73x_lcd.c</name>
+ <outputs>
+ <tool>
<name>BICOMP</name>
- <file> 6</file>
+ <file> 4</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 43</file>
+ <file> 36</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 11 51 67 13</file>
+ <file> 60 1 9 58 46 10 16 64 48 45 51 35 2 33 31 13 24 39 37 47</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 11 51 67 13</file>
+ <file> 60 1 9 58 46 10 16 64 48 45 51 35 2 33 31 8 13 24 39 37 47</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_gpio.c</name>
+ <name>$PROJ_DIR$\main.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 44</file>
+ <file> 5</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 60</file>
+ <file> 28</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 1 51 67 13 61</file>
+ <file> 1 9 58 46 10 16 64 48 45 51</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 1 51 67 13 61</file>
+ <file> 1 9 58 46 10 16 64 48 45 51</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\Debug\Obj\cantest.pbd</name>
- <inputs>
- <tool>
- <name>BILINK</name>
- <file> 37 7 14 6 68 44 64 32 66 59 31 33</file>
- </tool>
- </inputs>
- </file>
- <file>
<name>$PROJ_DIR$\str73x_lib\source\73x_eic.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 68</file>
+ <file> 22</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 23</file>
+ <file> 50</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 24 51 67 13 61</file>
+ <file> 51 9 58 46 16</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 24 51 67 13 61</file>
+ <file> 51 9 58 46 16</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\Startup\73x_vect.s</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_gpio.c</name>
<outputs>
<tool>
- <name>AARM</name>
- <file> 29</file>
- </tool>
- </outputs>
- </file>
- <file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_can.c</name>
- <outputs>
- <tool>
<name>BICOMP</name>
- <file> 7</file>
+ <file> 44</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 18</file>
+ <file> 19</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 15 51 67 13 61</file>
+ <file> 48 9 58 46 16</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 15 51 67 13 61</file>
+ <file> 48 9 58 46 16</file>
</tool>
</inputs>
</file>
<file>
- <name>[ROOT_NODE]</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_can.c</name>
<outputs>
<tool>
- <name>ILINK</name>
- <file> 65</file>
- </tool>
- </outputs>
- </file>
- <file>
- <name>$PROJ_DIR$\str73x_lib\source\73x_rtc.c</name>
- <outputs>
- <tool>
<name>BICOMP</name>
- <file> 31</file>
+ <file> 32</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 4</file>
+ <file> 0</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 56 51 67 13 61</file>
+ <file> 64 9 58 46 16</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 56 51 67 13 61</file>
+ <file> 64 9 58 46 16</file>
</tool>
</inputs>
</file>
<file>
- <name>$PROJ_DIR$\73x_lcd.c</name>
+ <name>$PROJ_DIR$\str73x_lib\source\73x_cmu.c</name>
<outputs>
<tool>
<name>BICOMP</name>
- <file> 32</file>
+ <file> 30</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 54</file>
+ <file> 42</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
- <file> 22 19 51 67 13 52 61 15 1 11 24 47 34 49 16 40 26 57 55 2</file>
+ <file> 45 9 58 46</file>
</tool>
<tool>
<name>ICCARM</name>
- <file> 22 19 51 67 13 52 61 15 1 11 24 47 34 49 16 41 40 26 57 55 2</file>
+ <file> 45 9 58 46</file>
</tool>
</inputs>
</file>
- <file>
- <name>$PROJ_DIR$\Debug\Exe\cantest.out</name>
- <inputs>
- <tool>
- <name>ILINK</name>
- <file> 46 62 18 45 43 23 60 48 20 54 50 12 4 29 5 36 25 39</file>
- </tool>
- </inputs>
- </file>
</configuration>
<configuration>
<name>Release</name>
Modified: trunk/firmware/arm/str/cantest_str73x_iar/main.c
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/main.c 2008-02-25 14:25:56 UTC (rev 860)
+++ trunk/firmware/arm/str/cantest_str73x_iar/main.c 2008-02-25 16:03:59 UTC (rev 861)
@@ -100,8 +100,8 @@
void wait(void)
{
- u32 i;
- for (i=100000L; i!=0 ; i-- ) {}
+ u32 i;
+ for ( i=100000L; i!=0 ; i-- ) {}
}
////////////////////////////////////////////////////////////////////////////////
@@ -150,6 +150,7 @@
CAN_Init( CAN0, &CANInit );
// configure the message objects
+ CAN_EnterInitMode( CAN0, CAN_CR_CCE );
CAN_InvalidateAllMsgObj( CAN0 );
CAN_SetTxMsgObj( CAN0, CAN0_TX_MSGOBJ, CAN_STD_ID );
CAN_SetRxMsgObj( CAN0,
@@ -158,7 +159,8 @@
0,
CAN_LAST_STD_ID,
TRUE );
-
+ CAN_LeaveInitMode( CAN0 );
+
// send a pre-defined data frame
CAN_SendMessage(CAN0, CAN0_TX_MSGOBJ, &TxCan0Msg[0] );
@@ -207,15 +209,16 @@
CAN0Init.CAN_Bitrate = CAN_BITRATE_500K;
// initialize the interrupt controller
- EIC_IRQChannelConfig(CAN0_IRQChannel, ENABLE);
- EIC_IRQChannelPriorityConfig(CAN0_IRQChannel, 1);
- EIC_IRQCmd(ENABLE);
+ EIC_IRQChannelConfig( CAN0_IRQChannel, ENABLE );
+ EIC_IRQChannelPriorityConfig( CAN0_IRQChannel, 1 );
+ EIC_IRQCmd( ENABLE );
// initialize the CAN at a standard bitrate, interrupts enabled
- CAN_Init(CAN0, &CAN0Init);
+ CAN_Init( CAN0, &CAN0Init );
// configure the message objects
- CAN_InvalidateAllMsgObj(CAN0);
+ CAN_EnterInitMode( CAN0, CAN_CR_CCE );
+ CAN_InvalidateAllMsgObj( CAN0 );
CAN_SetTxMsgObj( CAN0, CAN0_TX_MSGOBJ, CAN_EXT_ID );
CAN_SetRxMsgObj( CAN0,
CAN0_RX_MSGOBJ,
@@ -223,7 +226,8 @@
0,
CAN_LAST_EXT_ID,
TRUE );
-
+ CAN_LeaveInitMode( CAN0 );
+
// send a pre-defined data frame
CAN_SendMessage( CAN0, CAN0_TX_MSGOBJ, &TxCan0Msg[1] );
@@ -232,9 +236,6 @@
GPIO_BitWrite( GPIO0, LD7, Bit_SET ); // LED7
- // switch back into Normal mode
- CAN_LeaveTestMode( CAN0 );
-
// disable interrupts globally
EIC_IRQCmd( DISABLE );
}
@@ -292,7 +293,7 @@
while ( 1 ) {
CAN0_Demo_Polling();
- //CAN0_Demo_Interrupt();
+ CAN0_Demo_Interrupt();
}
}//main
Modified: trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.dni
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.dni 2008-02-25 14:25:56 UTC (rev 860)
+++ trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.dni 2008-02-25 16:03:59 UTC (rev 861)
@@ -2,8 +2,8 @@
Enabled=_ 0
[JLinkDriver]
WatchCond=_ 0
-Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
-Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
+Watch0=_ 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 0 0 0
+Watch1=_ 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 0 0 0
[DisAssemblyWindow]
NumStates=_ 1
State 1=_ 1
@@ -28,6 +28,10 @@
TypeViolation=1
UnspecRange=1
ActionState=1
+[Disassemble mode]
+mode=0
+[Breakpoints]
+Count=0
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""
@@ -35,10 +39,6 @@
[TermIOLog]
LoggingEnabled=_ 0
LogFile=_ ""
-[Disassemble mode]
-mode=0
-[Breakpoints]
-Count=0
[TraceHelper]
Enabled=0
ShowSource=1
Modified: trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.wsdt
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.wsdt 2008-02-25 14:25:56 UTC (rev 860)
+++ trunk/firmware/arm/str/cantest_str73x_iar/settings/cantest.wsdt 2008-02-25 16:03:59 UTC (rev 861)
@@ -25,7 +25,7 @@
<Windows>
- <Wnd1>
+ <Wnd0>
<Tabs>
<Tab>
<Identity>TabID-32711-27921</Identity>
@@ -37,7 +37,7 @@
</Tab>
</Tabs>
- <SelectedTab>0</SelectedTab></Wnd1><Wnd3>
+ <SelectedTab>0</SelectedTab></Wnd0><Wnd2>
<Tabs>
<Tab>
<Identity>TabID-18303-27987</Identity>
@@ -47,20 +47,20 @@
</Tab>
<Tab><Identity>TabID-7248-23799</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
- <SelectedTab>0</SelectedTab></Wnd3></Windows>
+ <SelectedTab>0</SelectedTab></Wnd2></Windows>
<Editor>
- <Pane><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\main.c</Filename><XPos>0</XPos><YPos>235</YPos><SelStart>7293</SelStart><SelEnd>7293</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\str73x_lib\source\73x_rtc.c</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>3569</SelStart><SelEnd>3569</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\str73x_lib\source\73x_can.c</Filename><XPos>0</XPos><YPos>455</YPos><SelStart>22501</SelStart><SelEnd>22501</SelEnd></Tab><ActiveTab>2</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\Startup\73x_vect.s</Filename><XPos>0</XPos><YPos>315</YPos><SelStart>13061</SelStart><SelEnd>13061</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+ <Pane><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\main.c</Filename><XPos>0</XPos><YPos>208</YPos><SelStart>7003</SelStart><SelEnd>7003</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\str73x_lib\source\73x_rtc.c</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>3569</SelStart><SelEnd>3569</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\str73x_lib\source\73x_can.c</Filename><XPos>0</XPos><YPos>42</YPos><SelStart>3302</SelStart><SelEnd>3312</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\Startup\73x_vect.s</Filename><XPos>0</XPos><YPos>315</YPos><SelStart>13197</SelStart><SelEnd>13197</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str7...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X