Changeset 577 for trunk/electronics

Timestamp:

10/16/09 06:07:41 (2 years ago)

Author:

kleinjt

Message:

okay, updated i2c master tester to be a bit more helpful for testing

Location:

trunk/electronics/avr/i2c_irboard

Files:

• i2c_master/serial_i2c.pde (modified) (2 diffs)
• i2c_slave/twi_slave.c (modified) (1 diff)

trunk/electronics/avr/i2c_irboard/i2c_master/serial_i2c.pde

@@ -1 +1 @@
 #include <Wire.h>
-#define ADC_MODE 1
 #define ADDRESS 0x26
-
+#define RAW_ADC     ( 1 )
+#define DISTANCE    ( 2 )
+#define SETADDR     ( 3 )
+#define READADDR    ( 4 )
+#define SET_CORR    ( 5 )
+#define ERROR       ( 0 )
 
 void setup() {
@@ -10 +14 @@
 
 void loop() {
-  int data = -1;
-  Serial.println("sending message");
-  Wire.beginTransmission(ADDRESS);
-  Wire.send(ADC_MODE);
-  Wire.endTransmission();
+  Serial.println("okay, awaiting byte to send over i2c");
   
-  Serial.println("sent message");
-
+  serial_send_char();
+  
   Wire.beginTransmission(ADDRESS);
   Wire.requestFrom(ADDRESS, 1);
   
-  while(!Wire.available()) {
-  }
+  while(!Wire.available());
   data = Wire.receive();
   
-  //if (Wire.available()) {
-  //  data = Wire.receive();
-  //}
+  Wire.endTransmission();
   
-  Wire.endTransmission();
-  Serial.println("received message");
-  Serial.println(data, DEC);
-  delay(2000);
+  switch(in) {
+        case RAW_ADC:
+                Serial.print("raw adc: ");
+                Serial.println(data, DEC);
+                break;
+        case DISTANCE:
+                Serial.print("distance in cm: ");
+                Serial.println(data, DEC);
+                break;
+        case SETADDR:
+                serial.println("enter an address: ");
+                serial_send_char();
+                Serial.print("set address to: ");
+                Serial.println(data, DEC);
+                Serial.println("please reset board");
+                break;
+        case READADDR:
+                Serial.print("address is: ");
+                Serial.println(data, DEC);
+                break;
+        case SET_CORR:
+                Serial.print("enter upper m: ");
+                serial_send_char();
+                Serial.print("enter lower m: ");
+                serial_send_char();
+                Serial.print("enter b: ");
+                serial_send_char();
+                Serial.print("enter k: ");
+                serial_send_char();
+        case ERROR:
+                Serial.println("dude.. wait.. what?");
+                break:
+        default:
+                Serial.println("command not recognized.");
+  }
 }
 
-
+void send_serial_char(void) {
+        while(!Serial.available());
+        in = serial.read();
+        Wire.beginTransmission(ADDRESS);
+        Wire.send(in);
+        Wire.endTransmission();
+}

trunk/electronics/avr/i2c_irboard/i2c_slave/twi_slave.c

@@ -64 +64 @@
          {
            case RAW_ADC:
-             twi_out = ADCIN() > 2;
+             twi_out = ADCIN() >> 2;
              break;
        case SETADDR: