first commit

Author: minilogic

CHANGE.md

@@ -0,0 +1,8 @@
+# CHANGE LOG
+
+**28-Sep-2024**
+1. Added support for GT911 touch controller. See [multi-touch example](./src/twi/gt911) and [LVGL-example](./src/gui/lvgl9).
+2. The LWIP-library version has been updated to release 2.2.0.
+
+
+

common.mk

@@ -22,7 +22,7 @@ MKSUNXI	= "$(BASE)tools\sunxi\mksunxi"
 
 all:	out $(BOOT).bin $(NAME).bin
 	$(CC)size -G out/*.elf
-run:	all
+run:	#all
 	$(FEL) -p spl $(BOOT).bin
 	$(FEL) -p write 0x80000000 $(NAME).bin
 	$(FEL) exec 0x80000000

drv/twi.c

@@ -278,21 +278,78 @@ static int ns2009_rd (struct TWI_DEV *dev, u8 cmd, u32 *dat)
 int ns2009_read (struct TWI_DEV *dev)
 {
   u32 x, y, z;
-  struct TS *ts = (struct TS *)dev->data;
-  if(ns2009_rd(dev, NS2009_RD_Z1, &z) == KO) return KO;
-  if(ns2009_rd(dev, NS2009_RD_X, &x) == KO) return KO;
-  if(ns2009_rd(dev, NS2009_RD_Y, &y) == KO) return KO;
+  struct TS_NS2009 *ts = (struct TS_NS2009 *)dev->data;
+  if(ns2009_rd(dev, NS2009_RD_Z1, &z) == KO) return 0;
+  if(ns2009_rd(dev, NS2009_RD_X, &x) == KO) return 0;
+  if(ns2009_rd(dev, NS2009_RD_Y, &y) == KO) return 0;
   ts->z <<= 1;
-  if(z < ts->dz) return KO;
+  if(z < ts->dz) return 0;
   ts->z |= 1;
+  //printf("%03d %03d %03d\r", x, y, z);
   if(x < ts->x1) x = ts->x1; else if(x > ts->x2) x = ts->x2;
   if(y < ts->y1) y = ts->y1; else if(y > ts->y2) y = ts->y2;
   x = (x - ts->x1) * (display->width - 1) / (ts->x2 - ts->x1);
   y = (y - ts->y1) * (display->height - 1) / (ts->y2 - ts->y1);
   ts_buf_update(ts->bufx, x);
   ts_buf_update(ts->bufy, y);
-  if((ts->z & 0x1F) != 0x1F) return KO;
+  if((ts->z & 0x1F) != 0x1F) return 0;
   ts->x = ts_get_median(ts->bufx);
   ts->y = display->height - ts_get_median(ts->bufy);
-  return OK;
+  return 1;
+}
+
+/*******************************************************************************
+                                TS GT911
+*******************************************************************************/
+int gt911_rd (struct TWI_DEV *dev, u16 addr, void *dat, u32 len)
+{
+  u8 buf[2] = { addr >> 8, addr };
+  twi_start(dev->bus, dev->addr & 0xFE);
+  twi_send(dev->bus, buf, 2);
+  twi_stop(dev->bus);
+  if(!twi_error)
+  {
+    twi_start(dev->bus, dev->addr | 1);
+    twi_recv(dev->bus, dat, len);
+    twi_stop(dev->bus);
+  }
+  return twi_error ? KO : OK;
+}
+
+int gt911_wr (struct TWI_DEV *dev, u16 addr, void *dat, u32 len)
+{
+  u8 buf[2] = { addr >> 8, addr };
+  twi_start(dev->bus, dev->addr & 0xFE);
+  twi_send(dev->bus, buf, 2);
+  twi_send(dev->bus, dat, 1);
+  twi_stop(dev->bus);
+  return twi_error ? KO : OK;
+}
+
+int gt911_read (struct TWI_DEV *dev)
+{
+  u8 stat;
+  u16 x, y, z;
+  struct TS_GT911 *ts = (struct TS_GT911 *)dev->data;
+  if(gt911_rd(dev, 0x814e, &stat, sizeof(stat)) == KO) return 0;
+  if(!(stat & 0x80)) return 0;
+  stat &= 15;
+  for(int addr = 0x8150, i = 0; i < stat; i++)
+  {
+    if(gt911_rd(dev, addr, &x, sizeof(x)) == KO) return 0;
+    if(gt911_rd(dev, addr + 2, &y, sizeof(y)) == KO) return 0;
+    if(gt911_rd(dev, addr + 4, &z, sizeof(z)) == KO) return 0;
+    addr += 8;
+    //printf("pt%d:%d*%d*%d ", i, x, y, z);
+    if(x < ts->x1) x = ts->x1; else if(x > ts->x2) x = ts->x2;
+    if(y < ts->y1) y = ts->y1; else if(y > ts->y2) y = ts->y2;
+    x = (x - ts->x1) * (display->width - 1) / (ts->x2 - ts->x1);
+    y = (y - ts->y1) * (display->height - 1) / (ts->y2 - ts->y1);
+    ts->pt[i].x = x;
+    ts->pt[i].y = y;
+    ts->pt[i].z = z;
+  }
+  z = 0;
+  gt911_wr(dev, 0x814e, &z, 1);
+  return stat;
 }

drv/twi.h

@@ -33,7 +33,7 @@ void twi_write_start (TWI_T *TWI, char dev_addr, char reg_addr);
 void twi_read_start (TWI_T *TWI, char dev_addr, char reg_addr);
 
 /* RTC PCF8563 (BM8563) */
-#define PCF8563_ADDR  0xA2
+#define PCF8563_ADDR 0xA2
 
 struct TM {
   u8  sec;      // 00:59
@@ -51,19 +51,38 @@ int pcf8563_read_tm (struct TWI_DEV *dev);
 int pcf8563_write_tm (struct TWI_DEV *dev);
 
 /* TS NS2009 */
-#define NS2009_ADDR0  0x90
-#define NS2009_ADDR1  0x91
-#define NS2009_TS_INIT { 0, 0, 0, 150, 3960, 140, 3800, 80 }
+#define NS2009_ADDR 0x90
+#define NS2009_TS_INIT { 150, 3960, 140, 3800, 80 }
 
-struct TS {
-  u32 x, y, z;  // X, Y - real coordinates, Z - touch history
+struct TS_NS2009 {
   u32 x1, x2;   // X - borders
   u32 y1, y2;   // Y - borders
   u32 dz;       // Z - threshold
   u32 bufx[5];  // X - fifo buffer
   u32 bufy[5];  // Y - fifo buffer
+  u32 x, y, z;  // X, Y - real coordinates, Z - touch history
 };
 
 int ns2009_read (struct TWI_DEV *dev);
 
+/* TS GT911 */
+#if 1
+#define GT911_ADDR 0xBA
+#else
+#define GT911_ADDR 0x28
+#endif
+#define GT911_TS_INIT { 0, 799, 0, 479 };
+
+struct TS_GT911 {
+  u32 x1, x2;   // X - borders
+  u32 y1, y2;   // Y - borders
+  struct {
+    u32 x, y, z;// X, Y - real coordinates, Z - point size
+  } pt[5];
+};
+
+int gt911_rd (struct TWI_DEV *dev, u16 addr, void *dat, u32 len);
+int gt911_wr (struct TWI_DEV *dev, u16 addr, void *dat, u32 len);
+int gt911_read (struct TWI_DEV *dev);
+
 #endif

lib/lwip/api/api_lib.c

@@ -323,7 +323,7 @@ netconn_bind(struct netconn *conn, const ip_addr_t *addr, u16_t port)
    * and NETCONN_FLAG_IPV6_V6ONLY is 0, use IP_ANY_TYPE to bind
    */
   if ((netconn_get_ipv6only(conn) == 0) &&
-      ip_addr_cmp(addr, IP6_ADDR_ANY)) {
+      ip_addr_eq(addr, IP6_ADDR_ANY)) {
     addr = IP_ANY_TYPE;
   }
 #endif /* LWIP_IPV4 && LWIP_IPV6 */
@@ -1260,13 +1260,13 @@ netconn_join_leave_group_netif(struct netconn *conn,
  *
  * @param name a string representation of the DNS host name to query
  * @param addr a preallocated ip_addr_t where to store the resolved IP address
- * @param dns_addrtype IP address type (IPv4 / IPv6)
  * @return ERR_OK: resolving succeeded
  *         ERR_MEM: memory error, try again later
  *         ERR_ARG: dns client not initialized or invalid hostname
  *         ERR_VAL: dns server response was invalid
  */
 #if LWIP_IPV4 && LWIP_IPV6
+/** @param dns_addrtype IP address type (IPv4 / IPv6) */
 err_t
 netconn_gethostbyname_addrtype(const char *name, ip_addr_t *addr, u8_t dns_addrtype)
 #else

lib/lwip/api/api_msg.c

@@ -93,7 +93,7 @@ static void netconn_drain(struct netconn *conn);
 #endif /* LWIP_TCPIP_CORE_LOCKING */
 
 #if LWIP_NETCONN_FULLDUPLEX
-const u8_t netconn_deleted = 0;
+static const u8_t netconn_deleted = 0;
 
 int
 lwip_netconn_is_deallocated_msg(void *msg)
@@ -106,9 +106,9 @@ lwip_netconn_is_deallocated_msg(void *msg)
 #endif /* LWIP_NETCONN_FULLDUPLEX */
 
 #if LWIP_TCP
-const u8_t netconn_aborted = 0;
-const u8_t netconn_reset = 0;
-const u8_t netconn_closed = 0;
+static const u8_t netconn_aborted = 0;
+static const u8_t netconn_reset = 0;
+static const u8_t netconn_closed = 0;
 
 /** Translate an error to a unique void* passed via an mbox */
 static void *
@@ -221,6 +221,7 @@ recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
   struct netbuf *buf;
   struct netconn *conn;
   u16_t len;
+  err_t err;
 #if LWIP_SO_RCVBUF
   int recv_avail;
 #endif /* LWIP_SO_RCVBUF */
@@ -269,8 +270,10 @@ recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
   }
 
   len = p->tot_len;
-  if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
+  err = sys_mbox_trypost(&conn->recvmbox, buf);
+  if (err != ERR_OK) {
     netbuf_delete(buf);
+    LWIP_DEBUGF(API_MSG_DEBUG, ("recv_udp: sys_mbox_trypost failed, err=%d\n", err));
     return;
   } else {
 #if LWIP_SO_RCVBUF
@@ -469,7 +472,7 @@ err_tcp(void *arg, err_t err)
   }
   /* pass error message to acceptmbox to wake up pending accept */
   if (NETCONN_MBOX_VALID(conn, &conn->acceptmbox)) {
-    /* use trypost to preven deadlock */
+    /* use trypost to prevent deadlock */
     sys_mbox_trypost(&conn->acceptmbox, mbox_msg);
   }
 
@@ -492,7 +495,7 @@ err_tcp(void *arg, err_t err)
         conn->current_msg->err = err;
       }
       op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
-      LWIP_ASSERT("inavlid op_completed_sem", sys_sem_valid(op_completed_sem));
+      LWIP_ASSERT("invalid op_completed_sem", sys_sem_valid(op_completed_sem));
       conn->current_msg = NULL;
       /* wake up the waiting task */
       sys_sem_signal(op_completed_sem);
@@ -759,10 +762,8 @@ netconn_alloc(enum netconn_type t, netconn_callback callback)
   sys_mbox_set_invalid(&conn->acceptmbox);
 #endif
   conn->state        = NETCONN_NONE;
-#if LWIP_SOCKET
   /* initialize socket to -1 since 0 is a valid socket */
-  conn->socket       = -1;
-#endif /* LWIP_SOCKET */
+  conn->callback_arg.socket = -1;
   conn->callback     = callback;
 #if LWIP_TCP
   conn->current_msg  = NULL;
@@ -978,7 +979,7 @@ lwip_netconn_do_close_internal(struct netconn *conn  WRITE_DELAYED_PARAM)
   /* Try to close the connection */
   if (shut_close) {
 #if LWIP_SO_LINGER
-    /* check linger possibilites before calling tcp_close */
+    /* check linger possibilities before calling tcp_close */
     err = ERR_OK;
     /* linger enabled/required at all? (i.e. is there untransmitted data left?) */
     if ((conn->linger >= 0) && (conn->pcb.tcp->unsent || conn->pcb.tcp->unacked)) {
@@ -1472,7 +1473,7 @@ lwip_netconn_do_listen(void *m)
           /* "Socket API like" dual-stack support: If IP to listen to is IP6_ADDR_ANY,
             * and NETCONN_FLAG_IPV6_V6ONLY is NOT set, use IP_ANY_TYPE to listen
             */
-          if (ip_addr_cmp(&msg->conn->pcb.ip->local_ip, IP6_ADDR_ANY) &&
+          if (ip_addr_eq(&msg->conn->pcb.ip->local_ip, IP6_ADDR_ANY) &&
               (netconn_get_ipv6only(msg->conn) == 0)) {
             /* change PCB type to IPADDR_TYPE_ANY */
             IP_SET_TYPE_VAL(msg->conn->pcb.tcp->local_ip,  IPADDR_TYPE_ANY);

lib/lwip/api/if_api.c

@@ -77,7 +77,7 @@ lwip_if_indextoname(unsigned int ifindex, char *ifname)
 
 /**
  * @ingroup if_api
- * Returs the interface index corresponding to name ifname.
+ * Returns the interface index corresponding to name ifname.
  * @param ifname Interface name
  * @return The corresponding index if ifname is the name of an interface;
  * otherwise, zero.

lib/lwip/api/netbuf.c

@@ -5,8 +5,8 @@
  * @defgroup netbuf Network buffers
  * @ingroup netconn
  * Network buffer descriptor for @ref netconn. Based on @ref pbuf internally
- * to avoid copying data around.\n
- * Buffers must not be shared accross multiple threads, all functions except
+ * to avoid copying data around.<br>
+ * Buffers must not be shared across multiple threads, all functions except
  * netbuf_new() and netbuf_delete() are not thread-safe.
  */
 

lib/lwip/api/netdb.c

@@ -61,13 +61,18 @@ struct gethostbyname_r_helper {
 int h_errno;
 #endif /* LWIP_DNS_API_DECLARE_H_ERRNO */
 
-/** define "hostent" variables storage: 0 if we use a static (but unprotected)
- * set of variables for lwip_gethostbyname, 1 if we use a local storage */
+/** LWIP_DNS_API_HOSTENT_STORAGE: if set to 0 (default), lwip_gethostbyname()
+ * returns the same global variabe for all calls (in all threads).
+ * When set to 1, your port should provide a function
+ *      struct hostent* sys_thread_hostent( struct hostent* h);
+ * which have to do a copy of "h" and return a pointer ont the "per-thread"
+ * copy.
+ */
 #ifndef LWIP_DNS_API_HOSTENT_STORAGE
 #define LWIP_DNS_API_HOSTENT_STORAGE 0
 #endif
 
-/** define "hostent" variables storage */
+/* define "hostent" variables storage */
 #if LWIP_DNS_API_HOSTENT_STORAGE
 #define HOSTENT_STORAGE
 #else