firmware/user/src/i2c.c

@@ -18,7 +18,7 @@
 #define I2C_TIMEOUT             0xefff
 #define I2C_TIMEOUT_ACK_POLL    0x180
 
-static uint32_t timeout;
+static uint16_t timeout;
 
 
 void i2c_init()
@@ -29,7 +29,8 @@ void i2c_init()
 
     i2c.I2C_ClockSpeed = 666666;
     i2c.I2C_Mode = I2C_Mode_I2C;
-    i2c.I2C_DutyCycle = I2C_DutyCycle_2; // 16_9;
+    i2c.I2C_DutyCycle = I2C_DutyCycle_16_9;
+    i2c.I2C_OwnAddress1 = 0x7f;
     i2c.I2C_Ack = I2C_Ack_Enable;
     i2c.I2C_AcknowledgedAddress = I2C_AcknowledgedAddress_7bit;
     I2C_Init(I2C1, &i2c);
@@ -56,13 +57,11 @@ int8_t i2c_read_addr1b(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len)
     while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED) && timeout--);
     if (!timeout) return -3;
 
-    I2C_AcknowledgeConfig(I2C1, DISABLE);
     I2C_SendData(I2C1, reg);
     timeout = I2C_TIMEOUT;
     while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_BYTE_TRANSMITTED) && timeout--);
     if (!timeout) return -4;
 
-    I2C_AcknowledgeConfig(I2C1, ENABLE);
     I2C_GenerateSTART(I2C1, ENABLE);
     timeout = I2C_TIMEOUT;
     while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_MODE_SELECT) && timeout--);
@@ -80,9 +79,11 @@ int8_t i2c_read_addr1b(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len)
 
        *data++ = I2C_ReceiveData(I2C1);
        len--;
-    }
 
+       if (!len) {
            I2C_GenerateSTOP(I2C1, ENABLE);
+       }
+    }
 
     return 0;
 }
@@ -101,8 +102,6 @@ int8_t i2c_write_addr1b(uint8_t addr, uint8_t reg, const uint8_t *data, uint8_t
     while((I2C_GetFlagStatus(I2C1, I2C_FLAG_BUSY) != RESET) && timeout--);
     if (!timeout) return -1;
 
-    I2C_AcknowledgeConfig(I2C1, ENABLE);
-
     I2C_GenerateSTART(I2C1, ENABLE);
     timeout = I2C_TIMEOUT;
     while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_MODE_SELECT) && timeout--);
@@ -125,11 +124,6 @@ int8_t i2c_write_addr1b(uint8_t addr, uint8_t reg, const uint8_t *data, uint8_t
             I2C_SendData(I2C1, *data++);
             len--;
             while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_BYTE_TRANSMITTED));
-            continue;
-        }
-        // failed to acknowledge...
-        if (I2C_GetFlagStatus(I2C1, I2C_FLAG_AF)) {
-            break;
         }
     }
 
@@ -138,20 +132,14 @@ int8_t i2c_write_addr1b(uint8_t addr, uint8_t reg, const uint8_t *data, uint8_t
     return 0;
 }
 
-void i2c_write_reg_8b(uint8_t addr, uint8_t reg, const uint8_t dat)
+void i2c_write_reg_8b(uint8_t addr, uint8_t reg, uint8_t dat)
 {
     i2c_write_addr1b(addr, reg, &dat, 1);
 }
 
-int8_t i2c_addr_scan(uint8_t addr)
+int8_t i2c_ack_poll(uint8_t addr)
 {
-    uint8_t found = 1;
+    int8_t addr_match = 0;
-    uint32_t event;
-
-    // no low addresses
-    if ((addr >> 4) == 0) return 0;
-    // no high addresses
-    if ((addr & 0xf8) == 0xf8) return 0;
 
     timeout = I2C_TIMEOUT;
     while((I2C_GetFlagStatus(I2C1, I2C_FLAG_BUSY) != RESET) && timeout--);
@@ -162,30 +150,14 @@ int8_t i2c_addr_scan(uint8_t addr)
     while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_MODE_SELECT) && timeout--);
     if (!timeout) return -2;
 
-    I2C_Send7bitAddress(I2C1, (addr & 0xfe), (addr & 0x01));
+    I2C_Send7bitAddress(I2C1, addr, I2C_Direction_Receiver);
     timeout = I2C_TIMEOUT_ACK_POLL;
-    if (addr & 1) event = I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED;
+    while (!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED) && timeout--);
-    else          event = I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED;
-
-    while ((I2C_CheckEvent(I2C1, event) == NoREADY) && timeout--) {
-        if (I2C_GetFlagStatus(I2C1, I2C_FLAG_AF)) {
-            found = 0;
-            break;
-        }
-    }
-
     if (!timeout) {
-        found = 0;
+        addr_match = -128;
     }
 
-    // send a stop to make sure anything listening knows to stfu
     I2C_GenerateSTOP(I2C1, ENABLE);
 
-    // reset flags; it might be in a fucked state
+    return addr_match;
-    if (!found) {
-        I2C1->STAR1 = 0;
-        return 0;
-    }
-
-    return addr;
 }

firmware/user/src/i2c.h

@@ -1,5 +1,8 @@
 /*
+ * i2c.h
+ *
  *  Created on: Jul 27, 2024
+ *      Author: true
  */
 
 #ifndef USER_SRC_I2C_H_
@@ -17,9 +20,9 @@ int8_t i2c_read_addr1b(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len);
 int8_t i2c_write_addr1b(uint8_t addr, uint8_t reg, const uint8_t *data, uint8_t len);
 
 uint8_t i2c_read_reg_8b(uint8_t addr, uint8_t reg);
-void i2c_write_reg_8b(uint8_t addr, uint8_t reg, const uint8_t dat);
+void i2c_write_reg_8b(uint8_t addr, uint8_t reg, uint8_t dat);
 
-int8_t i2c_addr_scan(uint8_t addr);
+int8_t i2c_ack_poll(uint8_t devaddr);
 
 
 

firmware/user/src/touch.h

@@ -18,7 +18,7 @@
 #define TBTN2                   ADC_Channel_9       // left button
 
 #define TBTN_IDLE_LOW_VAL       0xfd0               // values above this == not touched. used to calibrate
-#define TBTN_PUSHED_COUNTS      0x4af               // counts must drop below tbtn_idle_cal-TBTN_THRESHOLD to be considered a press
+#define TBTN_PUSHED_COUNTS      0x37f               // counts must drop below tbtn_idle_cal-TBTN_THRESHOLD to be considered a press
 
 
 #define ADC_CTLR1_TKENABLE      (1 << 24)