Переглянути джерело

Changes which were uncommitted in the earlier branch for Controller comm

namrota ghosh 7 місяців тому
батько
коміт
6a5c62f319
2 змінених файлів з 13 додано та 13 видалено
  1. 8 8
      src/config.h
  2. 5 5
      src/i2c_comm/i2c_hal.c

+ 8 - 8
src/config.h

@@ -1,5 +1,5 @@
 #include <stdint.h>
-
+#include <stdbool.h>
 #ifndef CONFIG_H_
 #define CONFIG_H_
 #define I2C_TX_MAX_PACKET_SIZE  (8)
@@ -7,24 +7,24 @@
 #define BATTERY_THRESHOLD (50)
 #define TEMPERATURE_MAX_C (60)
 #define MAX_CYCLES (2)
-#define TARGET_MCU_ADDRESS (0x47)
+#define TARGET_BASE_ADDRESS (0x48)
 #define MEASUREMENT_CHECK_INTERVAL 3200 //Do not know yet the exact timing
 
 typedef struct{
      uint8_t txBuffer[I2C_TX_MAX_PACKET_SIZE];
      uint8_t txLen;
      uint8_t txCount;
-
-}txPacket;
+     bool txComplete;
+}tx_Packet;
 
 typedef struct{
      uint8_t rxBuffer[I2C_RX_MAX_PACKET_SIZE];
      uint8_t rxLen;
      uint8_t rxCount;
-
-}rxPacket;
+     bool rxComplete;
+}rx_Packet;
 
 // Global variables declared in i2c_hal.c
-extern txPacket tx_packet;
-extern rxPacket rx_packet;
+extern tx_Packet txPacket;
+extern rx_Packet rxPacket;
 #endif

+ 5 - 5
src/i2c_comm/i2c_hal.c

@@ -4,8 +4,8 @@
 #include <stdio.h>
 
 // Global extern variable defined in config.h and declared here
-txPacket tx_packet;
-rxPacket rx_packet;
+tx_Packet txPacket;
+rx_Packet rxPacket;
 
 static bool i2c_write(uint8_t const TARGET_ADDRESS){
     // Write data to the target address
@@ -16,8 +16,8 @@ static bool i2c_write(uint8_t const TARGET_ADDRESS){
     }
     // **Wait for I2C Bus to be Free**
     while (DL_I2C_getControllerStatus(I2C_1_INST) & DL_I2C_CONTROLLER_STATUS_BUSY_BUS);
-    DL_I2C_startControllerTransfer(I2C_1_INST, TARGET_ADDRESS, DL_I2C_CONTROLLER_DIRECTION_TX, tx_packet.txLen);
-    DL_I2C_fillControllerTXFIFO(I2C_1_INST, tx_packet.txBuffer, tx_packet.txLen);
+    DL_I2C_startControllerTransfer(I2C_1_INST, TARGET_ADDRESS, DL_I2C_CONTROLLER_DIRECTION_TX, txPacket.txLen);
+    DL_I2C_fillControllerTXFIFO(I2C_1_INST, txPacket.txBuffer, txPacket.txLen);
     DL_I2C_flushTargetTXFIFO(I2C_1_INST);
     return true;
 }
@@ -26,7 +26,7 @@ static bool i2c_read(uint8_t const TARGET_ADDRESS){
     //Read data from the target address
     DL_I2C_flushControllerRXFIFO(I2C_1_INST);
     while (DL_I2C_getControllerStatus(I2C_1_INST) & DL_I2C_CONTROLLER_STATUS_BUSY_BUS);
-    DL_I2C_startControllerTransfer(I2C_1_INST, TARGET_ADDRESS, DL_I2C_CONTROLLER_DIRECTION_RX, rx_packet.rxLen);
+    DL_I2C_startControllerTransfer(I2C_1_INST, TARGET_ADDRESS, DL_I2C_CONTROLLER_DIRECTION_RX, rxPacket.rxLen);
     while (DL_I2C_getControllerStatus(I2C_1_INST) & DL_I2C_CONTROLLER_STATUS_BUSY_BUS);
     DL_I2C_enableInterrupt(I2C_1_INST, DL_I2C_INTERRUPT_CONTROLLER_RXFIFO_TRIGGER);
     return true;