From ce790d74b19c5f08fbc684c0037b7f59d11a47fa Mon Sep 17 00:00:00 2001
From: Rakshitavecmocon <rakshita@vecmocon.com>
Date: Wed, 23 Oct 2024 17:34:45 +0530
Subject: [PATCH] feat:: changed UART pins to PA8 and PA9, switched to UART1 in
 new branch, removed some comments

---
 Core/Source/ivec_mcal_uart.c               |  10 -
 ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c |  28 +-
 main.c                                     | 288 +--------------------
 utils/utils.c                              |   4 -
 4 files changed, 3 insertions(+), 327 deletions(-)

diff --git a/Core/Source/ivec_mcal_uart.c b/Core/Source/ivec_mcal_uart.c
index 103ee89..bf082d5 100644
--- a/Core/Source/ivec_mcal_uart.c
+++ b/Core/Source/ivec_mcal_uart.c
@@ -481,16 +481,6 @@ exit:
 /////////////////////////////////////////////////////////////////////////////////////
 static xCoreStatus_t uart_init(McalUartHandle_s* pxUartHandle, McalUartBaudRate_e xBaud)
 {
-//    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM21, IOMUX_PINCM21_PF_UART0_TX);
-//    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM22, IOMUX_PINCM22_PF_UART0_RX);
-
-//    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM20, IOMUX_PINCM20_PF_UART1_RX);
-//    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM19, IOMUX_PINCM19_PF_UART1_TX);
-//    assert(uart_inst == UART1 || uart_inst == UART3);IOMUX_PINCM16
-//    assert(xBaud == BAUD_115200 || xBaud == BAUD_9600);
-//    assert(!(b_UART1_init_flag == 1 && b_UART3_init_flag == 1));
-    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM32, IOMUX_PINCM32_PF_UART2_TX);
-    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM33, IOMUX_PINCM33_PF_UART2_RX);
 
     // Get the UART instance based on the port number in the handle
     UART_Regs* uart_inst = GetUartInstance(pxUartHandle->eUartPortNumber);
diff --git a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
index 8c8b8c9..f52d68b 100644
--- a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
+++ b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
@@ -87,7 +87,7 @@ IVEC_EcuCommonErr_e xECU_UARTInit(McalUartHandle_s* prvUartHandle, uint32_t spee
         }
 
         IVEC_ECU_LOG(LOG_STRING, "Initilising UART");
-        prvUartHandle->eUartPortNumber = mcalUART_PORT3;
+        prvUartHandle->eUartPortNumber = mcalUART_PORT2;
         prvUartHandle->pvUartRecvCallback = __prv_vEcu_CANOverUartMsgCallback;
         prvUartHandle->xUartConfig.eUartBaudrate = speed;
         prvUartHandle->xUartConfig.eUartFlowCtrl = mcalUART_FC_NONE;
@@ -107,32 +107,6 @@ IVEC_EcuCommonErr_e xECU_UARTInit(McalUartHandle_s* prvUartHandle, uint32_t spee
         IVEC_ECU_FUNC_EXIT(LOG_STRING, 0);
         return l_xFuncStatus;
 
-//        while(1)
-//        {
-////            uint8_t SIZE = 12;
-////            uint8_t u8txdata[SIZE]="Hello World";
-//            xMCAL_UartWrite(&prvUartHandle,u8txdata,SIZE);
-//            delay(10000000); //1 sec delay
-////            //IVEC_McalCommonErr_e status;
-//        xMCAL_UartRead(&prvUartHandle, &u8rxdata,1);
-////    //        delay(1000000); // delay
-////    //        if(status == commonMCAL_SUCCESS){
-////    //            xMCAL_UartWrite(&prvUartHandle,&pucData,1);
-////    //            delay(1000000); // delay
-////    //            pucData = 0x01;
-////            ///DL_UART_Main_enableInterrupt(UART1,DL_UART_MAIN_INTERRUPT_RX);
-////            uint16_t len = 2;
-////            uint8_t ijk = 0;
-////            while((!u8CMPLX_FifoQueueEmpty(&__gprv_MyEcuUARTResponseQueue)))
-////            {
-////                   if( u8CMPLX_FifoDequeue(&__gprv_MyEcuUARTResponseQueue, &u8rxdata[ijk], &len, 0) == 1 )
-////                   ijk++;
-////            }
-//            }
-//        exit:
-//                IVEC_ECU_FUNC_EXIT(LOG_STRING, 0);
-//                return l_xFuncStatus;
-
 }
 
 
diff --git a/main.c b/main.c
index f7a30a0..c1363bd 100644
--- a/main.c
+++ b/main.c
@@ -23,114 +23,16 @@
 #include "../ivec_ECU/ivec_ecu_uart/inc/ivec_ecu_uart.h"
 #include "../ivec_ECU/ivec_ecu_can/inc/ivec_ecu_can.h"
 
-#define DMA_CHANNEL  1
-#define ADC_CHANNEL  2
-#define SAMPLE_TIME  500
-
-#ifdef ADC_DMA_CONFIG /*!< ADC with DMA _PA15  */
-
-#endif
-//#ifdef ADC_CONFIG  /*!<ADC without DMA _PA25  */
-//#define ADC_DMA_CONFIG
-//#define  TIMER_CONFIG
-//#define  TIMER_PWM_CONFIG
-uint8_t c_sum[8]={0x60,0x00,0x00,0x05,0x00};
-unsigned char Checksum(unsigned char *ptr, unsigned char len)
-{
-    unsigned char i;
-    unsigned char checksum = 0;
-
-    for(i=0; i<len; i++)
-        checksum += ptr[i];
-
-    checksum = 0xff & ~checksum;
-
-    return(checksum);
-}
-
-const uint8_t crc_table[] = {
- 0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, 0x38, 0x3f, 0x36, 0x31,
- 0x24, 0x23, 0x2a, 0x2d, 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65,
- 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, 0xe0, 0xe7, 0xee, 0xe9,
- 0xfc, 0xfb, 0xf2, 0xf5, 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd,
- 0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, 0xa8, 0xaf, 0xa6, 0xa1,
- 0xb4, 0xb3, 0xba, 0xbd, 0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2,
- 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, 0xb7, 0xb0, 0xb9, 0xbe,
- 0xab, 0xac, 0xa5, 0xa2, 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a,
- 0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, 0x1f, 0x18, 0x11, 0x16,
- 0x03, 0x04, 0x0d, 0x0a, 0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42,
- 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a, 0x89, 0x8e, 0x87, 0x80,
- 0x95, 0x92, 0x9b, 0x9c, 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4,
- 0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, 0xc1, 0xc6, 0xcf, 0xc8,
- 0xdd, 0xda, 0xd3, 0xd4, 0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c,
- 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, 0x19, 0x1e, 0x17, 0x10,
- 0x05, 0x02, 0x0b, 0x0c, 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34,
- 0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, 0x76, 0x71, 0x78, 0x7f,
- 0x6a, 0x6d, 0x64, 0x63, 0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b,
- 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, 0xae, 0xa9, 0xa0, 0xa7,
- 0xb2, 0xb5, 0xbc, 0xbb, 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83,
- 0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, 0xe6, 0xe1, 0xe8, 0xef,
- 0xfa, 0xfd, 0xf4, 0xf3
-};
-
-uint8_t crc8fromTable(uint8_t *data, uint8_t length)
-{
-  uint8_t crc = 0; // Initialize 8-bit CRC
-  for(int ijk = 0; ijk< length; ijk++)
-  {
-    crc = crc_table[crc ^ data[ijk]];
-  }
-  return crc;
-}
-
-uint8_t crc1[]={0x10,0x3E,0x90};
-uint8_t crc2[]={0x10,0x3E,0x36};
-uint8_t r12crc[]={0x92,0xFD};
 
 
-uint8_t crc3[]={0x10,0x3E,0x92};
-uint8_t crc4[]={0x10,0x60,0x00};
-uint8_t crc5[]={0x10,0x3F,0x92};
-
-
-
-/********************** Some Global variable ****************/
-uint16_t gAdcResult;   /*!< Use to get the raw ADC data of PA15 for ADC_DMA and PA25 for stand alone ADC  */
-volatile float InputVoltage;
-uint32_t timerCount;
-volatile uint32_t getperiod;
-volatile uint32_t flag;
-uint32_t Interrupt_Status;
-char ErrorStatus[50];
-uint8_t RxData;
-uint8_t u8TxPacket[8]={0x14};
-uint8_t u8cfg_upd[8]={0x3E,0x90,0x00,0X00,0X00};//,0x00};
-uint8_t u8cfg_upd2[8]={0x3F,0x00};
-uint8_t u8REG12_CFG[8]={0x3E,0x36,0x00,0x92,0x00,0xFD,0x00};//,0x92,0xFD};
-uint8_t u8REG12_CFG2[8]={0x3F,0x92};
-uint8_t u8cfg_exit[8]={0x3E,0x92,0x00,0x00,0x00};//,0x00};
-uint8_t u8cfg_exit2[8]={0x3F,0x00};
 #define BUFFER_SIZE 100U
-//#define SIZE 12U
-//,0x01,0x02};
-uint8_t u8RxData[I2C_PACKETSIZE];
-uint8_t u8SPI_TxDum[SPI_PKT_SIZE]={0x9F};//,0xFF,0xFF,0x00};
-uint8_t u8SPI_RxDum[SPI_PKT_SIZE];
-uint8_t u8SPI_MID[SPI_PKT_SIZE];
-uint8_t u8SPI_DID[SPI_PKT_SIZE];
-uint8_t u8SPI_ID1[SPI_PKT_SIZE];
-uint16_t u16SPI_ID2[SPI_PKT_SIZE];
-//uint8_t u8txdata[SIZE]="Hello World";
-//uint8_t u8rxdata;
-unsigned char pucData;
-//uint32_t u32rxbuffer_size=sizeof(u8rxdata);;
-//uint32_t u32data_size=sizeof(u8txdata);
-uint8_t u8REG12_CFG_CS[]={0x36,0x92,0xFD};
 
+unsigned char pucData;
 xCoreStatus_t xStatus1;
 DL_MCAN_RxBufElement RxMsg;
 flashStatus_t ret_UID,ret_MID;
 
+uint8_t RxData;
 McalUartHandle_s prvUartHandle;
 static volatile int count = 0;
 uint32_t g_uartSpeed = 0;
@@ -182,8 +84,6 @@ void CANDataProcess()
 }
 
 
-
-
 int main(void)
 {
     xMCAL_McuInit();
@@ -200,189 +100,5 @@ int main(void)
         UARTDataProcess();
         CANDataProcess();
     }
-//
-//    //u8SPI_TxDum[];
-//    xMCAL_McuInit();
-//    xMCAL_SYSCTL_INIT(SYSOSC,STANDBY0);
-//    xMCAL_SYSTICK_INIT(Period_1ms);
-//
-
-////    //SYSCFG_DL_init();
-////
-////
-//////   xMCAL_SPI_init(SPI0,CS_1Mhz);
-//////   // SYSCFG_DL_MCAN0_init();
-//  xMCAL_MCANInit(CANFD0,BAUD_500);
-////////   xMCAL_I2C_init(I2C0, BAUD_100Khz);
-//   xStatus1=xMCAL_uart_init(UART1,BAUD_115200);
-////////    DL_UART_Main_reset(UART0);
-////////    DL_UART_Main_enablePower(UART0);
-//////
-//     DL_MCAN_TxBufElement txMsg; // Added by Akshat
-//
-//     txMsg.id = ((uint32_t)(0x9)) << 18U;//Added by Akshat
-//     /* Transmit data frame. */
-//     txMsg.rtr = 0U;
-//     /* 11-bit standard identifier. */
-//     txMsg.xtd = 0U;
-//     /* ESI bit in CAN FD format depends only on error passive flag. */
-//     txMsg.esi = 0U;
-//     /* Transmitting 4 bytes. */
-//     txMsg.dlc = 1U;
-//     /* CAN FD frames transmitted with bit rate switching. */
-//     txMsg.brs = 0U;
-//     /* Frame transmitted in CAN FD format. */
-//     txMsg.fdf = 0U;
-//     /* Store Tx events. */
-//     txMsg.efc = 1U;
-//     /* Message Marker. */
-//     txMsg.mm = 0xAAU;
-////
-//#ifdef ADC_DMA_CONFIG
-//  xMCAL_DmaInit();
-//  flag = xMCAL_AdcInit(ADC1);  /*!< Configure ADC with DMA */
-//
-//  xMCAL_AdcStart(ADC1);
-//#endif
-//
-//#ifdef TIMER_CONFIG
-//    xMCAL_TimerInit(TIMG0);
-//    xMCAL_TimerstartCounter();
-//#endif
-//
-//
-//
-//#ifdef  TIMER_PWM_CONFIG
-//    xMCAL_PwmInit(TIMG0);
-//    xMCAL_PwmStart();
-//#endif
-//
-//
-//
-//
-//#ifdef TIMER_INPUTCAPTURE_CONFIG
-//    xMCAL_InputCaptureInit(TIMA0);
-//     xMCAL_InputCaptureStart();
-//#endif
-//
-//
-//           //ret_UID=flash_getUID(u8SPI_TxDum);
-//           //ret_MID=flash_getMID(u8SPI_MID,u8SPI_DID);
-////     xStatus1 = xMCU_i2cDevReadyMcal(I2C0,0x08);
-////        while(1)
-////         {
-////         //vMCAL_DelayTicks(500);
-////
-////
-////
-////         if(STATUS_SUCCESS==xStatus1)
-////         {
-////           //vMCAL_DelayTicks(500);
-////           xMCU_i2cWriteMcal(I2C0 ,0x08 ,u8TxPacket, 1);
-////           //vMCAL_DelayTicks( 500);
-////
-////           xMCU_i2cReadMcal(I2C0, 0x08, 4);
-////           xMcal_I2C_getData(I2C0,u8RxData,4);
-////         }
-////         }
-////           ret_UID=flash_getUID(u8SPI_TxDum);
-//     //DL_GPIO_setPins(GPIOA,DL_GPIO_PIN_13);
-//     //xMCAL_uart_transmit(UART1,u8txdata,u32data_size);
-////     while(1)
-////     {
-//////      //xStatus1=xMCAL_SPI_TxData(SPI0, u8SPI_TxDum, u8SPI_RxDum,21);
-//////        //ret_UID=flash_getUID(u8SPI_RxDum);
-////////         xMCU_i2cWriteMcal(I2C0 ,0x08 ,u8TxPacket, 1);
-////////         xMCU_i2cReadMcal(I2C0, 0x08, 4);
-////////         xMcal_I2C_getData(I2C0,u8RxData,4);
-//////        // vMCAL_DelayTicks(100);
-//////         //ret_MID=flash_getMID(u8SPI_MID,u8SPI_DID);
-//////         //DL_UART_Main_disableInterrupt(UART3,DL_UART_MAIN_INTERRUPT_RX);
-////         xMCAL_uart_transmit(UART1,u8txdata,u32data_size);
-//////         //DL_UART_Main_enableInterrupt(UART3,DL_UART_MAIN_INTERRUPT_RX);
-////         delay(10000000);
-//////
-////         //xMCAL_uart_getdata(UART1,u8rxdata,u32rxbuffer_size);
-//////         //vMCAL_DelayTicks(1000);
-////     }
-//         //}
-//         //}
-//     /*u8cfg_upd[2]=crc8fromTable(crc1,3);                                                             //LDO 5V Enable begins
-//     u8REG12_CFG[2]=crc8fromTable(crc2,3);
-//     u8REG12_CFG[4]=crc8fromTable(&r12crc[0],1);
-//     u8REG12_CFG[6]=crc8fromTable(&r12crc[1],1);
-//     u8cfg_exit[2]=crc8fromTable(crc3,3);
-//
-//     xMCU_i2cWriteMcal(I2C0 ,0x08 ,u8cfg_upd, 5);//write set_CFG_UPD
-//
-//     vMCAL_DelayTicks(2);//wait for CFG_UPD mode
-//
-//     xMCU_i2cWriteMcal(I2C0,0x08,u8REG12_CFG,7);//write REG12_CFG
-//
-//     vMCAL_DelayTicks(2);
-//
-//     c_sum[1]=Checksum(u8REG12_CFG_CS, 3);//crc8fromTable(crc4,2);
-//     crc4[2]=c_sum[1];
-//     c_sum[2]=crc8fromTable(crc4,3);
-//     c_sum[4]=crc8fromTable(&c_sum[3],1);
-//
-//     vMCAL_DelayTicks(1);
-//
-//     xMCU_i2cWriteMcal(I2C0,0x08,c_sum,5);
-//
-//     vMCAL_DelayTicks(1);
-//
-//     xMCU_i2cWriteMcal(I2C0,0x08,u8cfg_exit,5);//write CFG_exit
-//
-//     vMCAL_DelayTicks(1);//wait for CFG_exit*/                                            //LDO 5V Enable Ends
-////
-//
-// while(1)
-// {
-////     xMCAL_getMCAN_ErrorStatus(ErrorStatus);
-////      xMCAL_getMCAN_InterruptLine1Status(&Interrupt_Status);
-//     xMCAL_MCANTx(CANFD0, &txMsg ,&idx, 0, 1);
-//     vMCAL_DelayTicks(500);
-//     xMCAL_uart_transmit(UART1,u8txdata,u32data_size);
-//     delay(1000000);
-//     xMCAL_MCANRx(CANFD0,&RxMsg ,0, &RxData,1);
-////
-//     vMCAL_DelayTicks(500);
-////
-////     ret_UID=flash_getUID(u8SPI_TxDum);
-////     ret_MID=flash_getMID(u8SPI_MID,u8SPI_DID);
-////
-////     vMCAL_DelayTicks(500);
-////
-////     xMCU_i2cWriteMcal(I2C0 ,0x08 ,u8TxPacket, 1);
-////     xMCU_i2cReadMcal(I2C0, 0x08, 4);
-////     xMcal_I2C_getData(I2C0,u8RxData,4);
-////
-////     vMCAL_DelayTicks(500);
-////     vMCAL_DelayTicks(400);
-////
-////     if(RxData[0]!=0)
-////      break;
-////     __asm("nop");
-////
-////
-////#ifdef TIMER_CONFIG
-////    xMCAL_TimergetCount(&timerCount);
-////#endif
-////
-////#ifdef ADC_DMA_CONFIG
-////    xMCAL_DmaStart(DMA_CHANNEL,&gAdcResult);
-////    InputVoltage = (gAdcResult) * (3.3/4096);
-////#endif
-//
-//}
-
 }
 
-//void vPacketRun(void)
-//{
-//    PacketRetCode_t retCode = PACKET_FAIL;
-//    uint8_t pucBuf[MAX_PACKET_LENGTH] = {0};
-//    uint32_t ulId = 0xffffffff;
-//    retCode = xGetPkt(&xHandle, pucBuf, &ulId);
-//}
diff --git a/utils/utils.c b/utils/utils.c
index 13c5ce9..e835d51 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -245,10 +245,6 @@ void xMCAL_McuInit()
 //    DL_SYSCTL_init();
 //    xMCAL_VrefInit();
     SYSCFG_DL_initPower();
-//    DL_MCAN_reset(CANFD0);
-//    DL_MCAN_enablePower(CANFD0);
-    DL_UART_Main_reset(UART2);
-    DL_UART_Main_enablePower(UART2);
     SYSCFG_DL_GPIO_init();
    }