Revision 22:9114680c05da, committed 2010-07-08

Comitter:

simon

Date:

Thu Jul 08 14:27:15 2010 +0000

Parent:

21:3944f1e2fa4f

Child:

23:74b8d43b5817

Commit message:

* CAN updates
* I2CSlave
* I2C and Ethernet bugfixes

Changed in this revision

--- a/CAN.h	Thu Jun 17 16:23:14 2010 +0000
+++ b/CAN.h	Thu Jul 08 14:27:15 2010 +0000
@@ -12,6 +12,7 @@
 #include "PeripheralNames.h"
 
 #include "can_helper.h" 
+#include "FunctionPointer.h"
 
 #include <string.h>
 
@@ -186,6 +187,14 @@
      * To use after error overflow.
      */
     void reset();
+
+    /* Function: monitor
+     *  Puts or removes the CAN interface into silent monitoring mode
+     *
+     * Variables:
+     *  silent - boolean indicating whether to go into silent mode or not
+     */
+    void monitor(bool silent);
     
     /* Function: rderror
      *  Returns number of read errors to detect read overflow errors.
@@ -196,10 +205,34 @@
      *  Returns number of write errors to detect write overflow errors.
      */
     unsigned char tderror();
+
+    /* Function: attach
+     *  Attach a function to call whenever a CAN frame received interrupt is
+     *  generated.
+     *
+     * Variables:
+     *  fptr - A pointer to a void function, or 0 to set as none
+     */
+    void attach(void (*fptr)(void));
+   
+   /* Function attach
+    *  Attach a member function to call whenever a CAN frame received interrupt
+    *  is generated.
+    *
+    * Variables:
+    *  tptr - pointer to the object to call the member function on
+    *  mptr - pointer to the member function to be called
+    */
+   template<typename T>
+   void attach(T* tptr, void (T::*mptr)(void));
     
 private:
 
     CANName _id;
+    FunctionPointer _rxirq;
+
+    void setup_interrupt(void);
+    void remove_interrupt(void);
 };
 
 } // namespace mbed

--- a/I2C.h	Thu Jun 17 16:23:14 2010 +0000
+++ b/I2C.h	Thu Jul 08 14:27:15 2010 +0000
@@ -106,7 +106,7 @@
      *
      * Variables:
      *  data - data to write out on bus
-     *  returns - a '1' if an ACK was retrieved, a '0' otherwise
+     *  returns - a '1' if an ACK was received, a '0' otherwise
      */
     int write(int data);
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/I2CSlave.h	Thu Jul 08 14:27:15 2010 +0000
@@ -0,0 +1,149 @@
+/* mbed Microcontroller Library - I2CSlave
+ * Copyright (c) 2007-2010 ARM Limited. All rights reserved.
+ * jward 
+ */ 
+ 
+#ifndef MBED_I2C_SLAVE_H
+#define MBED_I2C_SLAVE_H
+
+#include "platform.h"
+#include "PinNames.h"
+#include "PeripheralNames.h"
+#include "Base.h"
+
+namespace mbed {
+
+/* Class: I2CSlave
+ *  An I2C Slave, used for communicating with an I2C Master device
+ *
+ * Example:
+ * > // Simple I2C responder
+ * > #include <mbed.h>
+ * >
+ * > I2CSlave slave(p9, p10);
+ * >
+ * > int main() {
+ * >     char buf[10];
+ * >     char msg[] = "Slave!";
+ * >
+ * >     slave.address(0xA0);
+ * >     while (1) {
+ * >         int i = slave.receive();
+ * >         switch (i) {
+ * >             case I2CSlave::ReadAddressed: 
+ * >                 slave.write(msg, strlen(msg) + 1); // Includes null char
+ * >                 break;
+ * >             case I2CSlave::WriteGeneral:
+ * >                 slave.read(buf, 10);
+ * >                 printf("Read G: %s\n", buf);
+ * >                 break;
+ * >             case I2CSlave::WriteAddressed:
+ * >                 slave.read(buf, 10);
+ * >                 printf("Read A: %s\n", buf);
+ * >                 break;
+ * >         }
+ * >         for(int i = 0; i < 10; i++) buf[i] = 0;    // Clear buffer
+ * >     }
+ * > }
+ * >                  
+ */
+class I2CSlave : public Base {
+
+public:
+    
+    enum RxStatus {
+        NoData              = 0
+        , ReadAddressed     = 1
+        , WriteGeneral      = 2
+        , WriteAddressed    = 3
+    };
+
+    /* Constructor: I2CSlave
+     *  Create an I2C Slave interface, connected to the specified pins.
+     *
+     * Variables:
+     *  sda - I2C data line pin
+     *  scl - I2C clock line pin
+     */
+    I2CSlave(PinName sda, PinName scl, const char *name = NULL);
+
+    /* Function: frequency
+     *  Set the frequency of the I2C interface
+     *
+     * Variables:
+     *  hz - The bus frequency in hertz
+     */
+    void frequency(int hz);
+
+    /* Function: receive
+     *  Checks to see if this I2C Slave has been addressed.
+     *
+     * Variables:
+     *  returns - a status indicating if the device has been addressed, and how
+     *  > NoData            - the slave has not been addressed
+     *  > ReadAddressed     - the master has requested a read from this slave
+     *  > WriteAddressed    - the master is writing to this slave
+     *  > WriteGeneral      - the master is writing to all slave 
+     */
+    int receive(void);
+
+    /* Function: read
+     *  Read from an I2C master.
+     *
+     * Variables:
+     *  data - pointer to the byte array to read data in to
+     *  length - maximum number of bytes to read
+     *  returns - 0 on success, non-0 otherwise
+     */
+    int read(char *data, int length); 
+
+    /* Function: read
+     *  Read a single byte from an I2C master.
+     *
+     * Variables:
+     *  returns - the byte read
+     */
+    int read(void);
+
+    /* Function: write
+     *  Write to an I2C master.
+     *
+     * Variables:
+     *  data - pointer to the byte array to be transmitted
+     *  length - the number of bytes to transmite
+     *  returns - a 0 on success, non-0 otherwise
+     */
+    int write(const char *data, int length);
+
+    /* Function: write
+     *  Write a single byte to an I2C master.
+     *
+     * Variables
+     *  data - the byte to write
+     *  returns - a '1' if an ACK was received, a '0' otherwise
+     */
+    int write(int data);
+
+    /* Function: address
+     *  Sets the I2C slave address.
+     *
+     * Variables
+     *  address - the address to set for the slave (ignoring the least
+     *  signifcant bit). If set to 0, the slave will only respond to the
+     *  general call address.
+     */
+    void address(int address);
+
+    /* Function: stop
+     *  Reset the I2C slave back into the known ready receiving state.
+     */
+    void stop(void);
+
+protected:
+
+    I2CName     _i2c;
+};
+
+} // namespace mbed
+
+#endif

Binary file LPC1768/capi.ar has changed

Binary file LPC1768/core_cm3.o has changed

Binary file LPC1768/mbed.ar has changed

Binary file LPC2368/capi.ar has changed

Binary file LPC2368/mbed.ar has changed

--- a/mbed.h	Thu Jun 17 16:23:14 2010 +0000
+++ b/mbed.h	Thu Jul 08 14:27:15 2010 +0000
@@ -6,7 +6,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 23
+#define MBED_LIBRARY_VERSION 24
  
 // Useful C libraries
 #include <stdio.h>
@@ -37,6 +37,7 @@
 #include "SPISlave.h"
 #include "SPIHalfDuplex.h"
 #include "I2C.h"
+#include "I2CSlave.h"
 #include "Ethernet.h"
 #include "CAN.h"
 //#include "SPI3.h"