comparison hw.c @ 86:345a42f6151b

Catch up with change to new board
author Daniel O'Connor <darius@dons.net.au>
date Thu, 12 Mar 2015 23:22:35 +1030
parents bb52e6dad784
children 5fc6a25f40ef
comparison
equal deleted inserted replaced
85:18b154c447bb 86:345a42f6151b
101 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; 101 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
102 GPIO_Init(GPIOB, &GPIO_InitStructure); 102 GPIO_Init(GPIOB, &GPIO_InitStructure);
103 103
104 /* USART configuration */ 104 /* USART configuration */
105 /* USART1 - 115200 8n1, no flow control TX & RX enabled */ 105 /* USART1 - 115200 8n1, no flow control TX & RX enabled */
106 USART_InitStructure.USART_BaudRate = 115200; 106 USART_InitStructure.USART_BaudRate = 38400;
107 USART_InitStructure.USART_WordLength = USART_WordLength_8b; 107 USART_InitStructure.USART_WordLength = USART_WordLength_8b;
108 USART_InitStructure.USART_StopBits = USART_StopBits_1; 108 USART_InitStructure.USART_StopBits = USART_StopBits_1;
109 USART_InitStructure.USART_Parity = USART_Parity_No; 109 USART_InitStructure.USART_Parity = USART_Parity_No;
110 USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None; 110 USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
111 USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx; 111 USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
268 GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5; 268 GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5;
269 GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; 269 GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
270 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; 270 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
271 GPIO_Init(GPIOE, &GPIO_InitStructure); 271 GPIO_Init(GPIOE, &GPIO_InitStructure);
272 272
273 GPIO_InitStructure.GPIO_Pin = GPIO_Pin_8 | GPIO_Pin_9;
274 GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
275 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
276 GPIO_Init(GPIOC, &GPIO_InitStructure);
277
278 GPIO_InitStructure.GPIO_Pin = GPIO_Pin_11 | GPIO_Pin_12;
279 GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
280 GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
281 GPIO_Init(GPIOA, &GPIO_InitStructure);
282
273 /* Setup 1-wire bus */ 283 /* Setup 1-wire bus */
274 OWInit(); 284 OWInit();
275 285
276 /* Setup I2C bus */ 286 /* Setup I2C bus */
277 287