From 9f72d8ac2f4ad1c08403e48d2238a88eebea6f81 Mon Sep 17 00:00:00 2001
From: Aditya Naik
Date: Thu, 9 Apr 2020 01:00:55 -0400
Subject: Project refactor

---
 src/main.c | 715 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 521 insertions(+), 194 deletions(-)

(limited to 'src')

diff --git a/src/main.c b/src/main.c
index 9bfb22a..760e8eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,21 +1,21 @@
 /* USER CODE BEGIN Header */
 /**
-  ******************************************************************************
-  * @file           : main.c
-  * @brief          : Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
+******************************************************************************
+* @file           : main.c
+* @brief          : Main program body
+******************************************************************************
+* @attention
+*
+* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+* All rights reserved.</center></h2>
+*
+* This software component is licensed by ST under BSD 3-Clause license,
+* the "License"; You may not use this file except in compliance with the
+* License. You may obtain a copy of the License at:
+*                        opensource.org/licenses/BSD-3-Clause
+*
+******************************************************************************
+*/
 /* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
@@ -48,7 +48,10 @@
 #define SET_BIT_FROM_IDX(a, b) a[b>>5]|=(1<<(b%32))
 #define COUNTOF(__BUFFER__)   (sizeof(__BUFFER__) / sizeof(*(__BUFFER__)))
 
-#define MASTER
+#define I2C_ADDRESS 0x05
+
+/* Macro to toggle between master and slave firmware */
+/* #define MASTER */
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
@@ -57,7 +60,8 @@ I2C_HandleTypeDef hi2c1;
 UART_HandleTypeDef huart1;
 
 /* USER CODE BEGIN PV */
-
+_subscriptions gsubs[10];
+int subs_idx = 0;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -67,6 +71,7 @@ static void MX_I2C1_Init(void);
 static void MX_USART1_UART_Init(void);
 /* USER CODE BEGIN PFP */
 bool encode_subscription_callback(pb_ostream_t *ostream, const pb_field_t *field, void * const *arg);
+bool decode_subscriptions_callback(pb_istream_t *istream, const pb_field_t *field, void **args);
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/
@@ -75,211 +80,507 @@ bool encode_subscription_callback(pb_ostream_t *ostream, const pb_field_t *field
 /* USER CODE END 0 */
 
 /**
-  * @brief  The application entry point.
-  * @retval int
-  */
+ * @brief  The application entry point.
+ * @retval int
+ */
 int main(void)
 {
-  /* USER CODE BEGIN 1 */
+    /* USER CODE BEGIN 1 */
 
-  /* USER CODE END 1 */
+    /* USER CODE END 1 */
   
 
-  /* MCU Configuration--------------------------------------------------------*/
-
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
-
-  /* USER CODE BEGIN Init */
+    /* MCU Configuration--------------------------------------------------------*/
 
-  /* USER CODE END Init */
+    /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+    HAL_Init();
 
-  /* Configure the system clock */
-  SystemClock_Config();
+    /* USER CODE BEGIN Init */
 
-  /* USER CODE BEGIN SysInit */
+    /* USER CODE END Init */
 
-  /* USER CODE END SysInit */
+    /* Configure the system clock */
+    SystemClock_Config();
 
-  /* Initialize all configured peripherals */
-  MX_GPIO_Init();
-  MX_I2C1_Init();
-  MX_USART1_UART_Init();
-  /* USER CODE BEGIN 2 */
+    /* USER CODE BEGIN SysInit */
 
-  /* USER CODE END 2 */
+    /* USER CODE END SysInit */
 
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
+    /* Initialize all configured peripherals */
+    MX_GPIO_Init();
+    MX_I2C1_Init();
+    MX_USART1_UART_Init();
+    /* USER CODE BEGIN 2 */
+#ifdef TESTING_ENABLE
 #ifdef MASTER
-      
+    uint8_t reset_string[] = "\r\n\n==========MASTER RESET=========\r\n\n";
+    HAL_UART_Transmit(&huart1, reset_string, sizeof(reset_string), 100);
 #else
-      uint8_t buffer[128], debug_buf[128];
-      s2m_MDR_response res;
-      res.MDR_version=1.1;
-      res.module_id = 1;
-      res.module_class=1;
-      res.entity_id=32;
-
-      res.subscriptions.funcs.encode=encode_subscription_callback;
-      pb_ostream_t ostream = pb_ostream_from_buffer(buffer, sizeof(buffer));
-      if(!pb_encode(&ostream, s2m_MDR_response_fields, &res)){ 
-	  HAL_UART_Transmit(&huart1, "MDR encoding error\r\n", 20, 100);
-	  while(1) {
-	      HAL_GPIO_TogglePin(led_Pin, led_GPIO_Port);
-	  }
-      }
-      else {
-	  size_t enc_size = ostream.bytes_written;
-	  sprintf(debug_buf, "Encoded size: %ld\r\n", enc_size);
-	  HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
-	  memset(debug_buf, 0, 128);
-	  
-	  HAL_UART_Transmit(&huart1, "Buffer: ", 8, 100);
-	  for(int x=0; x<enc_size; x++) {
-	      sprintf(debug_buf+x, "%x", buffer[x]);
-	  }
-	  HAL_UART_Transmit(&huart1, debug_buf, 1, 100);
-	  
-      }
+    uint8_t reset_string[] = "\r\n\n==========SLAVE RESET=========\r\n\n";
+    HAL_UART_Transmit(&huart1, reset_string, sizeof(reset_string), 100);
+#endif /* MASTER */
+#endif /* TESTING_ENABLE */
+	
+#ifdef MASTER
+	uint8_t MDR_req_buf[64], debug_buf[128] = {0}, term[]="\r\n";
+	m2s_MDR_request MDR_req_message;
+	pb_ostream_t MDR_req_stream = pb_ostream_from_buffer(MDR_req_buf, sizeof(MDR_req_buf));
+	MDR_req_message.record_type = 7; /* Placeholder for default record type */
+	if(!pb_encode(&MDR_req_stream, m2s_MDR_request_fields, &MDR_req_message)) {
+#ifdef DEBUG_ENABLE
+	    uint8_t err_buf[] = "MDR reqest encoding error\r\n";
+	    HAL_UART_Transmit(&huart1, err_buf, sizeof(err_buf), 100);
+#endif /* DEBUG_ENABLE */
+	    Error_Handler();
+	}
+	uint16_t enc_size = MDR_req_stream.bytes_written;
+#ifdef TESTING_ENABLE
+	sprintf((char*)debug_buf, "Encoded length: %d\r\n", enc_size);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	memset(debug_buf, 0, 128);
+	uint8_t bufbuf[] = "MDR req buffer: ";	  
+	HAL_UART_Transmit(&huart1, bufbuf, sizeof(bufbuf), 100);
+	for(int x=0; x<enc_size; x++) {
+	    sprintf((char*)debug_buf+x, "%x", MDR_req_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, debug_buf, enc_size, 100);
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+
+	if (HAL_I2C_Master_Transmit(&hi2c1, (uint16_t)I2C_ADDRESS, (uint8_t*)MDR_req_buf, 2, 10000) != HAL_OK) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "Unable to send MDR request. I2C error: %ld\r\n", HAL_I2C_GetError(&hi2c1));
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+	}
+	HAL_GPIO_TogglePin(led_GPIO_Port, led_Pin);
+
+	uint8_t MDR_ACK_buf[8] = {0};
+	HAL_Delay(100);
+
+	uint32_t AF_error_counter = 0;
+	while (HAL_I2C_Master_Receive(&hi2c1, (uint8_t)I2C_ADDRESS, (uint8_t*)MDR_ACK_buf, s2m_MDR_req_ACK_size, 100) != HAL_OK) {
+	    if (HAL_I2C_GetError(&hi2c1) != HAL_I2C_ERROR_AF) {
+#ifdef DEBUG_ENABLE
+		sprintf((char*)debug_buf, "Unable to get MDR ACK. I2C error: %ld\r\n", HAL_I2C_GetError(&hi2c1));
+		HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+		memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+		break;
+	    }
+	    if (++AF_error_counter > 1000) {
+		break;
+	    }
+	}
+	
+#ifdef TESTING_ENABLE
+	uint8_t bufbuf2[] = "MDR ACK buffer: ";
+	HAL_UART_Transmit(&huart1, bufbuf2, sizeof(bufbuf2), 100);
+	for (int x=0; x<2; x++) {
+	    sprintf((char*)debug_buf+x, "%x|", MDR_ACK_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, debug_buf, 2, 100);  
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+
+	uint32_t MDR_len = 0;
+	pb_istream_t MDR_ACK_istream = pb_istream_from_buffer(MDR_ACK_buf, 2);
+	s2m_MDR_req_ACK MDR_ACK;
+	if (!pb_decode(&MDR_ACK_istream, s2m_MDR_req_ACK_fields, &MDR_ACK)) {
+#ifdef DEBUG_ENABLE
+	    uint8_t errbuf[] = "MDR ACK decoding error\r\n";
+	    HAL_UART_Transmit(&huart1, errbuf, sizeof(errbuf), 100);
+#endif /* DEBUG_ENABLE */
+	}
+	else {
+	    MDR_len = MDR_ACK.MDR_res_length;
+#ifdef TESTING_ENABLE
+	    sprintf((char*)debug_buf, "Got MDR message length: %ld\r\n", MDR_ACK.MDR_res_length);
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+	}
+
+	uint8_t MDR_CTS_buf[8] = {0};
+	m2s_MDR_res_CTS MDR_CTS;
+	pb_ostream_t MDR_CTS_ostream = pb_ostream_from_buffer(MDR_CTS_buf, sizeof(MDR_CTS_buf));
+	
+	MDR_CTS.timeout = 100;
+	if (!pb_encode(&MDR_CTS_ostream, m2s_MDR_res_CTS_fields, &MDR_CTS)) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "MDR encoding error\r\n");
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif
+	}
+#ifdef TESTING_ENABLE
+	sprintf((char*)debug_buf, "CTS size: %d\r\n", MDR_CTS_ostream.bytes_written);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	memset(debug_buf, 0, 128);
+	uint8_t ctsbuf[] = "\tCTS buffer: ";
+	for(int x=0; x<2; x++) {
+	    sprintf((char*)debug_buf+x, "%x", MDR_CTS_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, ctsbuf, sizeof(ctsbuf), 100);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+	
+	if (HAL_I2C_Master_Transmit(&hi2c1, (uint16_t)I2C_ADDRESS, (uint8_t*)MDR_CTS_buf, 2, 10000) != HAL_OK) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "Unable to send MDR CTS. I2C error: %ld\r\n", HAL_I2C_GetError(&hi2c1));
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+	}
+	HAL_GPIO_TogglePin(led_GPIO_Port, led_Pin);
+
+	uint8_t MDR_buf[256];
+	AF_error_counter = 0;
+	while (HAL_I2C_Master_Receive(&hi2c1, (uint8_t)I2C_ADDRESS, (uint8_t*)MDR_buf, MDR_len, 1000) != HAL_OK) {
+	    if (HAL_I2C_GetError(&hi2c1) != HAL_I2C_ERROR_AF) {
+#ifdef DEBUG_ENABLE
+		sprintf((char*)debug_buf, "Unable to get MDR. I2C error: %ld\r\n", HAL_I2C_GetError(&hi2c1));
+		HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+		memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+		break;
+	    }
+	    AF_error_counter++;
+	    /* if (++AF_error_counter > 1000) { */
+	    /* 	break; */
+	    /* } */
+	}
+	
+#ifdef TESTING_ENABLE
+	sprintf((char*)debug_buf, "MDR trials: %ld\r\n", AF_error_counter);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	memset(debug_buf, 0, 128);
+#endif
+	
+#ifdef TESTING_ENABLE
+	uint8_t mdrbuf[] = "Got MDR: ";
+	for (int x=0; x<MDR_len; x++) {
+	    sprintf((char*)debug_buf+x, "%x", MDR_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, mdrbuf, sizeof(mdrbuf), 100);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);  
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+
+	s2m_MDR_response MDR_res;
+	MDR_res.subscriptions.funcs.decode=decode_subscriptions_callback;
+	pb_istream_t MDR_istream = pb_istream_from_buffer(MDR_buf, MDR_len);
+	// Decode the mdr
+	if (!pb_decode(&MDR_istream, s2m_MDR_response_fields, &MDR_res)) {
+	    sprintf((char*)debug_buf, "MDR decode error\r\n");
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+	}
+	else {
+	    sprintf((char*)debug_buf, "MDR:\n\tVersion: %f\nID: %ld\nSub 1 ID: %ld\r\n", MDR_res.MDR_version, MDR_res.module_id, gsubs[1].module_id);
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+	}
+	
+#else /* MASTER */
+	uint8_t MDR_buf[128], debug_buf[128], term[]="\r\n";
+	size_t MDR_enc_size;
+	s2m_MDR_response res;
+	res.MDR_version=1.1;
+	res.module_id = 1;
+	res.module_class=1;
+	res.entity_id=32;
+
+	res.subscriptions.funcs.encode=encode_subscription_callback;
+	pb_ostream_t ostream = pb_ostream_from_buffer(MDR_buf, sizeof(MDR_buf));
+	if(!pb_encode(&ostream, s2m_MDR_response_fields, &res)){
+#ifdef DEBUG_ENABLE
+	    uint8_t err_buf[] = "MDR encoding error\r\n";
+	    HAL_UART_Transmit(&huart1, err_buf, sizeof(err_buf), 100);
+#endif
+	    while(1) {
+		HAL_GPIO_TogglePin(led_GPIO_Port, led_Pin);
+		HAL_Delay(500);
+	    }
+	}
+	MDR_enc_size = ostream.bytes_written;
+#ifdef TESTING_ENABLE	    
+	sprintf((char*)debug_buf, "MDR Encoded size: %d\r\n", MDR_enc_size);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	memset(debug_buf, 0, 128);
+	
+	uint8_t bufbuf[] = "MDR Buffer: ";	  
+	HAL_UART_Transmit(&huart1, bufbuf, sizeof(bufbuf), 100);
+	for(int x=0; x<MDR_enc_size; x++) {
+	    sprintf((char*)debug_buf+x, "%x", MDR_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, debug_buf, MDR_enc_size, 100);  
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
+#endif
+	    
+	uint8_t MDR_ACK_buf[8] = {0};
+	s2m_MDR_req_ACK ack;
+	ack.MDR_res_length = MDR_enc_size;
+	pb_ostream_t MDR_ack_ostream = pb_ostream_from_buffer(MDR_ACK_buf,
+							      sizeof(MDR_ACK_buf));
+	if(!pb_encode(&MDR_ack_ostream, s2m_MDR_req_ACK_fields, &ack)) {
+#ifdef DEBUG_ENABLE
+	    uint8_t errbuf[] = "MDR ACK encoding error\r\n";
+	    HAL_UART_Transmit(&huart1, errbuf, sizeof(errbuf), 100);
+#endif /* DEBUG_ENABLE */
+	    while(1) {
+		HAL_GPIO_TogglePin(led_GPIO_Port, led_Pin);
+		HAL_Delay(500);
+	    }
+	}
+	size_t MDR_ack_size = MDR_ack_ostream.bytes_written;
+#ifdef TESTING_ENABLE
+	sprintf((char*)debug_buf, "MDR ACK Encoded size: %d\r\n", MDR_ack_size);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+
+	uint8_t MDR_req_buf[8]; 
+	m2s_MDR_request MDR_req;
+	
+	if (HAL_I2C_Slave_Receive(&hi2c1, (uint8_t*)MDR_req_buf, 2, 10000) != HAL_OK) {
+#ifdef DEBUG_ENABLE
+	    uint8_t debug_buf[] = "Failed to get MDR req\r\n";
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+#endif /* DEBUG_ENABLE */
+	}
+
+#ifdef TESTING_ENABLE
+	uint8_t bufbuf2[] = "MDR ACK buffer: ";
+	HAL_UART_Transmit(&huart1, bufbuf2, sizeof(bufbuf2), 100);
+	for(int x=0; x<2; x++) {
+	    sprintf((char*)debug_buf+x, "%x", MDR_ACK_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, debug_buf, MDR_enc_size, 100);  
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
 #endif
-      /* USER CODE END WHILE */
-    /* USER CODE BEGIN 3 */
-  }
-  /* USER CODE END 3 */
+	
+	pb_istream_t MDR_req_istream = pb_istream_from_buffer(MDR_req_buf, 2);
+	if(!pb_decode(&MDR_req_istream, m2s_MDR_request_fields, &MDR_req)) {
+#ifdef DEBUG_ENABLE
+	    uint8_t errbuf[] = "MDR request decoding error\r\n";
+	    HAL_UART_Transmit(&huart1, errbuf, sizeof(errbuf), 100);
+#endif /* DEBUG_ENABLE */
+	}
+	
+#ifdef TESTING_ENABLE
+	sprintf((char*)debug_buf, "Got requested record type: %ld\r\n", MDR_req.record_type);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+
+	HAL_GPIO_TogglePin(led_GPIO_Port, led_Pin);
+
+	if (HAL_I2C_Slave_Transmit(&hi2c1, (uint8_t*)MDR_ACK_buf, s2m_MDR_req_ACK_size, 10000) != HAL_OK) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "Unable to send MDR ACK. I2C error: %ld\r\n", HAL_I2C_GetError(&hi2c1));
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+	}
+
+	uint8_t MDR_CTS_buf[8];
+	m2s_MDR_res_CTS MDR_CTS;
+	
+	if (HAL_I2C_Slave_Receive(&hi2c1, (uint8_t*)MDR_CTS_buf, 2, 10000) != HAL_OK) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "Failed to get MDR CTS\r\n");
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+	}
+#ifdef TESTING_ENABLE
+	uint8_t ctsbuf[] = "Got CTS buffer: ";
+	for(int x=0; x<2; x++) {
+	    sprintf((char*)debug_buf+x, "%x", MDR_CTS_buf[x]);
+	}
+	HAL_UART_Transmit(&huart1, ctsbuf, sizeof(ctsbuf), 100);
+	HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	HAL_UART_Transmit(&huart1, term, 2, 100);
+	memset(debug_buf, 0, 128);
+#endif /* TESTING_ENABLE */
+	
+	pb_istream_t MDR_CTS_istream = pb_istream_from_buffer(MDR_CTS_buf, 2);
+	if (!pb_decode(&MDR_CTS_istream, m2s_MDR_res_CTS_fields, &MDR_CTS)) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "Failed to decode MDR CTS\r\n");
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+	    Error_Handler();
+	}
+
+	uint32_t MDR_timeout = MDR_CTS.timeout;
+	if (HAL_I2C_Slave_Transmit(&hi2c1, (uint8_t*)MDR_buf, MDR_enc_size, 10000) !=
+	    HAL_OK) {
+#ifdef DEBUG_ENABLE
+	    sprintf((char*)debug_buf, "Unable to send MDR. I2C error: %ld\r\n",
+		    HAL_I2C_GetError(&hi2c1));
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+#endif /* DEBUG_ENABLE */
+	}
+	else {
+	    sprintf((char*)debug_buf, "Successfully sent MDR\r\n");
+	    HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100);
+	    memset(debug_buf, 0, 128);
+	}
+	
+#endif /* MASTER */
+	
+	/* USER CODE END 2 */
+	/* Infinite loop */
+	/* USER CODE BEGIN WHILE */
+	while (1)
+	{
+	    /* USER CODE END WHILE */
+	    /* USER CODE BEGIN 3 */
+	}
+	/* USER CODE END 3 */
 }
 
 /**
-  * @brief System Clock Configuration
-  * @retval None
-  */
+ * @brief System Clock Configuration
+ * @retval None
+ */
 void SystemClock_Config(void)
 {
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
-  /** Configure the main internal regulator output voltage 
-  */
-  __HAL_RCC_PWR_CLK_ENABLE();
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
-  /** Initializes the CPU, AHB and APB busses clocks 
-  */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /** Initializes the CPU, AHB and APB busses clocks 
-  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
-  {
-    Error_Handler();
-  }
+    RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+    RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+    /** Configure the main internal regulator output voltage 
+     */
+    __HAL_RCC_PWR_CLK_ENABLE();
+    __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
+    /** Initializes the CPU, AHB and APB busses clocks 
+     */
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
+    RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+    RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+    RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+    if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+    {
+	Error_Handler();
+    }
+    /** Initializes the CPU, AHB and APB busses clocks 
+     */
+    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+	|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+    RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
+    RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+
+    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
+    {
+	Error_Handler();
+    }
 }
 
 /**
-  * @brief I2C1 Initialization Function
-  * @param None
-  * @retval None
-  */
+ * @brief I2C1 Initialization Function
+ * @param None
+ * @retval None
+ */
 static void MX_I2C1_Init(void)
 {
 
-  /* USER CODE BEGIN I2C1_Init 0 */
-
-  /* USER CODE END I2C1_Init 0 */
-
-  /* USER CODE BEGIN I2C1_Init 1 */
-
-  /* USER CODE END I2C1_Init 1 */
-  hi2c1.Instance = I2C1;
-  hi2c1.Init.ClockSpeed = 100000;
-  hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2;
-  hi2c1.Init.OwnAddress1 = 0;
-  hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
-  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
-  hi2c1.Init.OwnAddress2 = 0;
-  hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
-  hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
-  if (HAL_I2C_Init(&hi2c1) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN I2C1_Init 2 */
+    /* USER CODE BEGIN I2C1_Init 0 */
+
+    /* USER CODE END I2C1_Init 0 */
+
+    /* USER CODE BEGIN I2C1_Init 1 */
+
+    /* USER CODE END I2C1_Init 1 */
+    hi2c1.Instance = I2C1;
+    hi2c1.Init.ClockSpeed = 100000;
+    hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2;
+    hi2c1.Init.OwnAddress1 = I2C_ADDRESS;
+    hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
+    hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
+    hi2c1.Init.OwnAddress2 = 0xFF;
+    hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
+    hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
+    if (HAL_I2C_Init(&hi2c1) != HAL_OK)
+    {
+	Error_Handler();
+    }
+    /* USER CODE BEGIN I2C1_Init 2 */
 
-  /* USER CODE END I2C1_Init 2 */
+    /* USER CODE END I2C1_Init 2 */
 
 }
 
 /**
-  * @brief USART1 Initialization Function
-  * @param None
-  * @retval None
-  */
+ * @brief USART1 Initialization Function
+ * @param None
+ * @retval None
+ */
 static void MX_USART1_UART_Init(void)
 {
 
-  /* USER CODE BEGIN USART1_Init 0 */
+    /* USER CODE BEGIN USART1_Init 0 */
 
-  /* USER CODE END USART1_Init 0 */
+    /* USER CODE END USART1_Init 0 */
 
-  /* USER CODE BEGIN USART1_Init 1 */
+    /* USER CODE BEGIN USART1_Init 1 */
 
-  /* USER CODE END USART1_Init 1 */
-  huart1.Instance = USART1;
-  huart1.Init.BaudRate = 115200;
-  huart1.Init.WordLength = UART_WORDLENGTH_8B;
-  huart1.Init.StopBits = UART_STOPBITS_1;
-  huart1.Init.Parity = UART_PARITY_NONE;
-  huart1.Init.Mode = UART_MODE_TX_RX;
-  huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  huart1.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_UART_Init(&huart1) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN USART1_Init 2 */
+    /* USER CODE END USART1_Init 1 */
+    huart1.Instance = USART1;
+    huart1.Init.BaudRate = 9600;
+    huart1.Init.WordLength = UART_WORDLENGTH_8B;
+    huart1.Init.StopBits = UART_STOPBITS_1;
+    huart1.Init.Parity = UART_PARITY_NONE;
+    huart1.Init.Mode = UART_MODE_TX_RX;
+    huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+    huart1.Init.OverSampling = UART_OVERSAMPLING_16;
+    if (HAL_UART_Init(&huart1) != HAL_OK)
+    {
+	Error_Handler();
+    }
+    /* USER CODE BEGIN USART1_Init 2 */
 
-  /* USER CODE END USART1_Init 2 */
+    /* USER CODE END USART1_Init 2 */
 
 }
 
 /**
-  * @brief GPIO Initialization Function
-  * @param None
-  * @retval None
-  */
+ * @brief GPIO Initialization Function
+ * @param None
+ * @retval None
+ */
 static void MX_GPIO_Init(void)
 {
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
+    GPIO_InitTypeDef GPIO_InitStruct = {0};
 
-  /* GPIO Ports Clock Enable */
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
+    /* GPIO Ports Clock Enable */
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOH_CLK_ENABLE();
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
 
-  /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(led_GPIO_Port, led_Pin, GPIO_PIN_RESET);
+    /*Configure GPIO pin Output Level */
+    HAL_GPIO_WritePin(led_GPIO_Port, led_Pin, GPIO_PIN_RESET);
 
-  /*Configure GPIO pin : led_Pin */
-  GPIO_InitStruct.Pin = led_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(led_GPIO_Port, &GPIO_InitStruct);
+    /*Configure GPIO pin : led_Pin */
+    GPIO_InitStruct.Pin = led_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    HAL_GPIO_Init(led_GPIO_Port, &GPIO_InitStruct);
 
 }
 
@@ -287,12 +588,13 @@ static void MX_GPIO_Init(void)
 bool encode_subscription_callback(pb_ostream_t *ostream, const pb_field_t *field, void * const *arg)
 {
     if(ostream!=NULL && field->tag == s2m_MDR_response_subscriptions_tag) {
-	for (int x=0; x<5; x++) {
+	for (int x=0; x<2; x++) {
 	    _subscriptions subs;
 	    subs.module_id = x+10*x;
 	    subs.i2c_address = x+1;
 	    subs.has_entity_id=false;
 	    subs.has_module_class=false;
+	    subs.has_module_id=true;
 	    subs.has_i2c_address=true;
 	    if(!pb_encode_tag_for_field(ostream, field)){
 		printf("ERR1\n");
@@ -309,34 +611,59 @@ bool encode_subscription_callback(pb_ostream_t *ostream, const pb_field_t *field
     }
     return true;
 }
+
+bool decode_subscriptions_callback(pb_istream_t *istream, const pb_field_t *field, void **args)
+{
+    _subscriptions subs;
+    if(!pb_decode(istream, _subscriptions_fields, &subs)) {
+	return false;
+    }
+    else {
+	/* Parse all fields if they're included */
+	if (subs.has_module_id)
+	    gsubs[subs_idx].module_id = subs.module_id;
+	if (subs.has_entity_id)
+	    gsubs[subs_idx].entity_id = subs.entity_id;
+	if (subs.has_module_class)
+	    gsubs[subs_idx].module_class = subs.module_class;
+	if (subs.has_i2c_address)
+	    gsubs[subs_idx].i2c_address = subs.i2c_address;
+	subs_idx++;
+	subs_idx%=10;
+	return true;
+    }
+}
 /* USER CODE END 4 */
 
 /**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
+ * @brief  This function is executed in case of error occurrence.
+ * @retval None
+ */
 void Error_Handler(void)
 {
-  /* USER CODE BEGIN Error_Handler_Debug */
-  /* User can add his own implementation to report the HAL error return state */
-
-  /* USER CODE END Error_Handler_Debug */
+    /* USER CODE BEGIN Error_Handler_Debug */
+    /* User can add his own implementation to report the HAL error return state */
+    while (1) {
+	HAL_GPIO_TogglePin(led_GPIO_Port, led_Pin);
+	HAL_Delay(1000);
+    }
+    /* USER CODE END Error_Handler_Debug */
 }
 
 #ifdef  USE_FULL_ASSERT
 /**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
+ * @brief  Reports the name of the source file and the source line number
+ *         where the assert_param error has occurred.
+ * @param  file: pointer to the source file name
+ * @param  line: assert_param error line source number
+ * @retval None
+ */
 void assert_failed(uint8_t *file, uint32_t line)
 { 
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-     tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* USER CODE END 6 */
+    /* USER CODE BEGIN 6 */
+    /* User can add his own implementation to report the file name and line number,
+       tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+    /* USER CODE END 6 */
 }
 #endif /* USE_FULL_ASSERT */
 
-- 
cgit v1.2.3