195,7 → 195,7 |
//-------------------------------------------------------------- |
void I2C1_Deinit(void) |
{ |
GPIO_InitTypeDef GPIO_InitStructure; |
GPIO_InitTypeDef GPIO_InitStructure; |
|
SerialPutString("\r\n I2C deinit..."); |
I2C_GenerateStart(I2C1, DISABLE); |
205,19 → 205,19 |
I2C_Cmd(I2C1, DISABLE); |
I2C_DeInit(I2C1); |
SCU_APBPeriphClockConfig(__I2C1, DISABLE); |
|
|
// set ports to input |
SCU_APBPeriphClockConfig(__GPIO2, ENABLE); |
GPIO_StructInit(&GPIO_InitStructure); |
GPIO_InitStructure.GPIO_Direction = GPIO_PinInput; |
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2 | GPIO_Pin_3; |
GPIO_InitStructure.GPIO_Type = GPIO_Type_PushPull; |
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2 | GPIO_Pin_3; |
GPIO_InitStructure.GPIO_Type = GPIO_Type_PushPull; |
GPIO_InitStructure.GPIO_IPConnected = GPIO_IPConnected_Disable; |
GPIO_InitStructure.GPIO_Alternate = GPIO_InputAlt1; |
GPIO_Init(GPIO2, &GPIO_InitStructure); |
GPIO_InitStructure.GPIO_Alternate = GPIO_InputAlt1; |
GPIO_Init(GPIO2, &GPIO_InitStructure); |
|
I2C_TxBuffer = NULL; |
Tx_Idx = 0; |
Tx_Idx = 0; |
I2C_TxBufferSize = 0; |
|
I2C_RxBuffer = NULL; |
242,7 → 242,7 |
status = I2C_GetLastEvent(I2C1); |
|
if(status & (I2C_FLAG_AF|I2C_FLAG_BERR)) // if an acknowledge failure or bus error occured |
{ // Set and subsequently clear the STOP bit while BTF is set. |
{ // Set and subsequently clear the STOP bit while BTF is set. |
while(I2C_GetFlagStatus (I2C1, I2C_FLAG_BTF) != RESET) |
{ |
I2C_GenerateSTOP (I2C1, ENABLE); // free the bus |
264,7 → 264,7 |
case I2C_MODE_TRANSMITTER: |
I2C_State = I2C_TX_PROGRESS; |
break; |
|
|
case I2C_MODE_RECEIVER: |
if ((I2C_RxBuffer == NULL) || (I2C_RxBufferSize == 0)) |
{ |
277,7 → 277,7 |
I2C_State = I2C_RX_PROGRESS; |
} |
break; |
|
|
default: // invalid direction |
I2C_GenerateSTOP (I2C1, ENABLE); |
I2C_State = I2C_IDLE; |
289,17 → 289,17 |
// send address/direction byte on the bus |
I2C_Send7bitAddress(I2C1, I2C_SLAVE_ADDRESS, I2C_Direction); |
break; |
|
|
// the address byte was send |
case I2C_EVENT_MASTER_MODE_SELECTED: |
// Clear EV6 by set again the PE bit |
I2C_Cmd(I2C1, ENABLE); |
I2C_Cmd(I2C1, ENABLE); |
// reset checksum |
crc = 0; |
switch(I2C_State) |
{ |
case I2C_TX_PROGRESS: |
// send command 1st data byte (allways the command id) |
// send command 1st data byte (allways the command id) |
I2C_SendData(I2C1, I2C_Command); |
crc += I2C_Command; |
Tx_Idx = 0; |
306,11 → 306,11 |
// reset timeout |
I2C1_Timeout = SetDelay(500); // after 500 ms of inactivity the I2C1 bus will be reset |
break; |
|
|
case I2C_RX_PROGRESS: |
Rx_Idx = 0; |
break; |
|
|
default: // unknown I2C state |
// should never happen |
I2C_GenerateSTOP (I2C1, ENABLE); |
318,10 → 318,10 |
break; |
} |
break; |
|
|
// the master has transmitted a byte and slave has been acknowledged |
case I2C_EVENT_MASTER_BYTE_TRANSMITTED: |
|
|
// some bytes have to be transmitted |
if(Tx_Idx < I2C_TxBufferSize) |
{ |
342,8 → 342,8 |
// generate stop or repeated start condition |
if ((I2C_RxBuffer != NULL) && (I2C_RxBufferSize > 0)) // is any answer byte expected? |
{ |
I2C_Direction = I2C_MODE_RECEIVER; // switch to master receiver after repeated start condition |
I2C_GenerateStart(I2C1, ENABLE); // initiate repeated start condition on the bus |
I2C_Direction = I2C_MODE_RECEIVER; // switch to master receiver after repeated start condition |
I2C_GenerateStart(I2C1, ENABLE); // initiate repeated start condition on the bus |
} |
else |
{ // stop communication |
353,11 → 353,11 |
DebugOut.Analog[15]++; |
} |
} |
Tx_Idx++; |
Tx_Idx++; |
break; |
|
|
// the master has received a byte from the slave |
case I2C_EVENT_MASTER_BYTE_RECEIVED: |
case I2C_EVENT_MASTER_BYTE_RECEIVED: |
// some bytes have to be received |
if (Rx_Idx < I2C_RxBufferSize) |
{ // copy received byte from the data register to the rx-buffer |
366,7 → 366,7 |
crc += I2C_PrimRxBuffer[Rx_Idx]; |
} |
// if the last byte (crc) was received |
else if ( Rx_Idx == I2C_RxBufferSize) |
else if ( Rx_Idx == I2C_RxBufferSize) |
{ |
// generate a STOP condition on the bus before reading data register |
I2C_GenerateSTOP(I2C1, ENABLE); |
385,7 → 385,7 |
DebugOut.Analog[14]++; |
} |
I2C_State = I2C_IDLE; |
LED_GRN_OFF; |
LED_GRN_OFF; |
} |
Rx_Idx++; |
// if the 2nd last byte was received disable acknowledge for the last one |
394,7 → 394,7 |
I2C_AcknowledgeConfig (I2C1, DISABLE); |
} |
break; |
|
|
default: |
break; |
} |
413,7 → 413,7 |
// set pointers to data area with respect to the command id |
switch (command) |
{ |
case I2C_CMD_VERSION: |
case I2C_CMD_VERSION: |
I2C_RxBuffer = (u8 *)&MK3MAG_Version; |
I2C_RxBufferSize = sizeof(MK3MAG_Version); |
I2C_TxBuffer = NULL; |
425,13 → 425,13 |
I2C_TxBuffer = (u8 *)&I2C_WriteCal; |
I2C_TxBufferSize = sizeof(I2C_WriteCal); |
break; |
case I2C_CMD_READ_MAG: |
case I2C_CMD_READ_MAG: |
I2C_RxBuffer = (u8 *)&I2C_Mag; |
I2C_RxBufferSize = sizeof(I2C_Mag); |
I2C_TxBuffer = NULL; |
I2C_TxBufferSize = 0; |
break; |
case I2C_CMD_READ_HEADING: |
case I2C_CMD_READ_HEADING: |
DebugOut.Analog[10] = I2C_Heading.Heading; |
I2C_RxBuffer = (u8 *)&I2C_Heading; |
I2C_RxBufferSize = sizeof(I2C_Heading); |
452,14 → 452,11 |
I2C_ITConfig(I2C1, ENABLE); |
// set direction to master transmitter |
I2C_Direction = I2C_MODE_TRANSMITTER; |
// test on busy flag and clear it |
// test on busy flag and clear it |
I2C_CheckEvent( I2C1, I2C_FLAG_BUSY ); |
// initiale start condition on the bus |
// initiale start condition on the bus |
I2C_GenerateStart(I2C1, ENABLE); |
// to be continued in the I2C1_IRQHandler() above |
|
|
|
} |
|
//---------------------------------------------------------------- |
466,7 → 463,7 |
void I2C1_GetMK3MagVersion(void) |
{ |
u8 msg[64]; |
u8 repeat = 10; |
u8 repeat = 10; |
|
MK3MAG_Version.Major = 0xFF; |
MK3MAG_Version.Minor = 0xFF; |
475,19 → 472,19 |
|
while ((MK3MAG_Version.Major == 0xFF) && (repeat != 0)) |
{ |
I2C1_SendCommand(I2C_CMD_VERSION); |
I2C1_Timeout = SetDelay(500); |
I2C1_SendCommand(I2C_CMD_VERSION); |
I2C1_Timeout = SetDelay(500); |
while (!CheckDelay(I2C1_Timeout)) if (MK3MAG_Version.Major != 0xFF) break; |
repeat--; |
} |
|
|
if (MK3MAG_Version.Major != 0xFF) |
{ |
{ |
sprintf(msg, "\n\r MK3Mag V%d.%d%c", MK3MAG_Version.Major, MK3MAG_Version.Minor, 'a' + MK3MAG_Version.Patch); |
SerialPutString(msg); |
SerialPutString(msg); |
sprintf(msg, " Compatible: %d", MK3MAG_Version.Compatible); |
SerialPutString(msg); |
SerialPutString(msg); |
} |
else SerialPutString("\n\rNo version information from MK3Mag."); |
else SerialPutString("\n\rNo version information from MK3Mag."); |
|
} |