WebSVN – Code-Repo – Diff – /PIC Stuff/Cerebot_32MX7_LED_Cube/I2C1.c

     INTEnableInterrupts();
+}
 // Sends length number of bytes in msg to specified address (no R/W bit)
+// Will return status I2C1_SEND_OK or I2C1_SEND_FAIL
 void I2C1_Master_Send(uint8_t address, uint8_t *msg, uint32_t length) {
     uint32_t i;
     if (length == 0)
         return;
     // Generate start condition
     I2C1CONbits.SEN = 1;
+}
 // Reads length number of bytes from address (no R/W bit)
+// Will return status I2C1_RECV_OK or I2C1_RECV_FAIL
 void I2C1_Master_Recv(uint8_t address, uint32_t length) {
     if (length == 0)
         return;
     // Save length and address to get data from
     // Generate start condition
     I2C1CONbits.SEN = 1;
+}
 // Writes msg to address then reads length number of bytes from address
+// Will return status I2C1_SEND_FAIL or I2C1_RECV_FAIL or I2C1_RECV_OK
 void I2C1_Master_Restart(uint8_t address, uint8_t msg, uint32_t length) {
     uint8_t c;
     if (length == 0) {
         c = msg;
         I2C1_Master_Send(address, &c, 1);
      * 5. During a send ACK or NACK sequence to slave
      * 6. Data transfer byte transmitted
      * 7. During a slave-detected stop
      */
+    if (I2C1STATbits.IWCOL == 1) {
+        // TODO: Handle write collisions
+        I2C1STATbits.IWCOL = 0;
+    }
     // If we are in the middle of sending data
     if (i2c_data_p->master_status == I2C1_MASTER_SEND) {
         switch (i2c_data_p->operating_state) {
             case I2C1_IDLE:
                 break;
                     if (i2c_data_p->buffer_in_read_ind < i2c_data_p->buffer_in_len) {
                         I2C1TRN = i2c_data_p->buffer_in[i2c_data_p->buffer_in_read_ind];
                         i2c_data_p->buffer_in_read_ind++;
                     } else {
                         // If no more data is to be sent, send stop bit
-                        i2c_data_p->operating_state = I2C1_IDLE;
+                        i2c_data_p->operating_state = I2C1_STOPPED;
                         I2C1CONbits.PEN = 1;
-                        i2c_data_p->master_status = I2C1_MASTER_IDLE;
                         i2c_data_p->return_status = I2C1_SEND_OK;
+                    }
                 } else {
                     // If a NACK is received, stop transmission and send error
-                    i2c_data_p->operating_state = I2C1_IDLE;
+                    i2c_data_p->operating_state = I2C1_STOPPED;
                     I2C1CONbits.PEN = 1;
-                    i2c_data_p->master_status = I2C1_MASTER_IDLE;
                     i2c_data_p->return_status = I2C1_SEND_FAIL;
+                }
                 break;
+            case I2C1_STOPPED:
+                i2c_data_p->operating_state = I2C1_IDLE;
+                i2c_data_p->master_status = I2C1_MASTER_IDLE;
+                break;
+        }
     // If we are in the middle of receiving data
     } else if (i2c_data_p->master_status == I2C1_MASTER_RECV) {
         switch (i2c_data_p->operating_state) {
             case I2C1_IDLE:
                     // If an ACK is received, set module to receive 1 byte of data
                     i2c_data_p->operating_state = I2C1_RCV_DATA;
                     I2C1CONbits.RCEN = 1;
                 } else {
                     // If a NACK is received, stop transmission and send error
-                    i2c_data_p->operating_state = I2C1_IDLE;
+                    i2c_data_p->operating_state = I2C1_STOPPED;
                     I2C1CONbits.PEN = 1;
-                    i2c_data_p->master_status = I2C1_MASTER_IDLE;
                     i2c_data_p->return_status = I2C1_RECV_FAIL;
+                }
                 break;
             case I2C1_RCV_DATA:
                 // On receive, save byte into buffer
-                // TODO: Handle I2C buffer overflow
+                // TODO: Handle possible I2C buffer overflow
                 i2c_data_p->buffer_in[i2c_data_p->buffer_in_write_ind] = I2C1RCV;
                 i2c_data_p->buffer_in_write_ind++;
                 if (i2c_data_p->buffer_in_write_ind < i2c_data_p->buffer_in_len) {
                     // If we still need to read, send an ACK to the slave
                     i2c_data_p->operating_state = I2C1_REQ_DATA;
                 // Set module to receive one byte of data
                 i2c_data_p->operating_state = I2C1_RCV_DATA;
                 I2C1CONbits.RCEN = 1;
                 break;
             case I2C1_SEND_STOP:
-                // Send the stop bit and copy message to send to Main()
+                // Send the stop bit
-                i2c_data_p->operating_state = I2C1_IDLE;
+                i2c_data_p->operating_state = I2C1_STOPPED;
                 I2C1CONbits.PEN = 1;
-                i2c_data_p->master_status = I2C1_MASTER_IDLE;
                 i2c_data_p->return_status = I2C1_RECV_OK;
                 break;
+            case I2C1_STOPPED:
+                i2c_data_p->operating_state = I2C1_IDLE;
+                i2c_data_p->master_status = I2C1_MASTER_IDLE;
+                break;
+        }
     } else if (i2c_data_p->master_status == I2C1_MASTER_RESTART) {
         switch (i2c_data_p->operating_state) {
             case I2C1_IDLE:
                 break;
                     // If an ACK is received, send first byte of data
                     I2C1TRN = i2c_data_p->buffer_in[0];
                     i2c_data_p->operating_state = I2C1_CHECK_ACK_RESTART;
                 } else {
                     // If a NACK is received, stop transmission and send error
-                    i2c_data_p->operating_state = I2C1_IDLE;
+                    i2c_data_p->operating_state = I2C1_STOPPED;
                     I2C1CONbits.PEN = 1;
-                    i2c_data_p->master_status = I2C1_MASTER_IDLE;
                     i2c_data_p->return_status = I2C1_SEND_FAIL;
+                }
                 break;
             case I2C1_CHECK_ACK_RESTART:
                 if (!I2C1STATbits.ACKSTAT) {
                     I2C1CONbits.RSEN = 1;
                     i2c_data_p->operating_state = I2C1_SEND_ADDR_2;
                 } else {
                     // If a NACK is received, stop transmission and send error
-                    i2c_data_p->operating_state = I2C1_IDLE;
+                    i2c_data_p->operating_state = I2C1_STOPPED;
                     I2C1CONbits.PEN = 1;
-                    i2c_data_p->master_status = I2C1_MASTER_IDLE;
                     i2c_data_p->return_status = I2C1_SEND_FAIL;
+                }
                 break;
             case I2C1_SEND_ADDR_2:
                 // Send the address with read bit set
                     // If an ACK is received, set module to receive 1 byte of data
                     i2c_data_p->operating_state = I2C1_RCV_DATA;
                     I2C1CONbits.RCEN = 1;
                 } else {
                     // If a NACK is received, stop transmission and send error
-                    i2c_data_p->operating_state = I2C1_IDLE;
+                    i2c_data_p->operating_state = I2C1_STOPPED;
                     I2C1CONbits.PEN = 1;
-                    i2c_data_p->master_status = I2C1_MASTER_IDLE;
                     i2c_data_p->return_status = I2C1_RECV_FAIL;
+                }
                 break;
             case I2C1_RCV_DATA:
                 // On receive, save byte into buffer
-                // TODO: Handle I2C buffer overflow
+                // TODO: Handle possible I2C buffer overflow
                 i2c_data_p->buffer_in[i2c_data_p->buffer_in_write_ind] = I2C1RCV;
                 i2c_data_p->buffer_in_write_ind++;
                 if (i2c_data_p->buffer_in_write_ind < i2c_data_p->buffer_in_len) {
                     // If we still need to read, send an ACK to the slave
                     i2c_data_p->operating_state = I2C1_REQ_DATA;
                 // Set module to receive one byte of data
                 i2c_data_p->operating_state = I2C1_RCV_DATA;
                 I2C1CONbits.RCEN = 1;
                 break;
             case I2C1_SEND_STOP:
-                // Send the stop bit and copy message to send to Main()
+                // Send the stop bit
-                i2c_data_p->operating_state = I2C1_IDLE;
+                i2c_data_p->operating_state = I2C1_STOPPED;
                 I2C1CONbits.PEN = 1;
-                i2c_data_p->master_status = I2C1_MASTER_IDLE;
                 i2c_data_p->return_status = I2C1_RECV_OK;
                 break;
+            case I2C1_STOPPED:
+                i2c_data_p->operating_state = I2C1_IDLE;
+                i2c_data_p->master_status = I2C1_MASTER_IDLE;
+                break;
+        }
+    }
+}
 void I2C1_Interrupt_Slave() {
+    }
+}
 /* Returns 0 if I2C module is currently busy, otherwise returns status code */
 uint8_t I2C1_Get_Status() {
-        if (i2c_data_p->master_status != I2C1_MASTER_IDLE ||
+        if (i2c_data_p->master_status == I2C1_MASTER_IDLE &&
-                i2c_data_p->buffer_in_len == 0) {
+                i2c_data_p->operating_state == I2C1_IDLE &&
-            return 0;
+                I2C1STATbits.TBF == 0) {
-        } else {
             return i2c_data_p->return_status;
+        } else {
+            return 0;
+        }
+}
 uint8_t I2C1_Buffer_Len() {
     return i2c_data_p->buffer_in_len;

Subversion Repositories Code-Repo

(root)/PIC Stuff/Cerebot_32MX7_LED_Cube/I2C1.c @ 235 – Rev 234 → 235