diff options
| author | Aditya Naik | 2020-06-15 13:07:34 -0400 |
|---|---|---|
| committer | Aditya Naik | 2020-06-15 13:07:34 -0400 |
| commit | 8883bdbccf223824935f36a77566d7af19ab4908 (patch) | |
| tree | f24836d0e797f0293db84c8d3af9073bf98d817f | |
| parent | 7fe90ace6e5200f6d1ef9c23879b099e3a0dea91 (diff) | |
I2C speed upgrade for master and slave
| -rw-r--r-- | makefile | 1 | ||||
| -rw-r--r-- | src/master.c | 11 | ||||
| -rw-r--r-- | src/slave.c | 4 |
3 files changed, 9 insertions, 7 deletions
@@ -69,6 +69,7 @@ C_INCLUDES = \ # Define the chip we're building for and include its makefile
+# Variable ASM_FILE will be defined in the included port makefile
PORT = stm32f4
PORT_DIR = ports/$(PORT)
include $(PORT_DIR)/makefile
diff --git a/src/master.c b/src/master.c index 2b8401a..09b6b66 100644 --- a/src/master.c +++ b/src/master.c @@ -114,19 +114,20 @@ int main(void) } } - else if (priority_counter == 5 && routing_ptr > 0) { - routing(); - } + /* else if (priority_counter == 5 && routing_ptr > 0) { */ + /* routing(); */ + /* } */ else { for (int device_idx = 0; device_idx < BUS_DEVICE_LIMIT-1; device_idx++) { if (dev_sts[device_idx] == REGISTERED) { device_dataflow(GET_ADDR_FROM_IDX(device_idx), SLAVE_TX, 0); } } + routing(); } priority_counter = ((priority_counter+1)%10); - sprintf((char*)debug_buf, "routing ptr: %ld\r\n", routing_ptr); + sprintf((char*)debug_buf, "Routing pointer: %ld\r\n", routing_ptr); HAL_UART_Transmit(&huart1, debug_buf, sizeof(debug_buf), 100); memset(debug_buf, 0, 128); } @@ -888,7 +889,7 @@ void SystemClock_Config(void) static void MX_I2C1_Init(void) { hi2c1.Instance = I2C1; - hi2c1.Init.ClockSpeed = 100000; + hi2c1.Init.ClockSpeed = 400000; hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2; hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE; diff --git a/src/slave.c b/src/slave.c index 4722c51..a0091e3 100644 --- a/src/slave.c +++ b/src/slave.c @@ -365,7 +365,7 @@ void SystemClock_Config(void) static void MX_I2C1_Init(void) { hi2c1.Instance = I2C1; - hi2c1.Init.ClockSpeed = 100000; + hi2c1.Init.ClockSpeed = 400000; hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2; hi2c1.Init.OwnAddress1 = I2C_ADDRESS; hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; @@ -388,7 +388,7 @@ static void MX_I2C1_Init(void) */ static void MX_USART1_UART_Init(void) { - huart1.Instance = USART1; + huart1.Instance = USART2; huart1.Init.BaudRate = 9600; huart1.Init.WordLength = UART_WORDLENGTH_8B; huart1.Init.StopBits = UART_STOPBITS_1; |