Merge branch 'master' into dev

2026-05-28 18:07:25 +08:00 · 2012-02-10 16:06:12 +01:00
parent c1e1cd3b6a d86b7b91f1
commit 3b90a341fe
2 changed files with 6 additions and 2 deletions
@@ -19,6 +19,8 @@ else ifeq ($(BOARD), umarim)
  ap.CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1
  ap.CFLAGS += -DADS1114_I2C_DEVICE=i2c1
  ap.srcs += peripherals/ads1114.c
+else ifeq ($(BOARD), lisa_l)
+  ap.CFLAGS += -DUSE_I2C2
 endif
    </raw>
  </makefile>