Merge pull request #627 from EmbeddedMan/master

Fix for issue #596 : adding keywords.txt for DWTI library.
chipKIT32 · Oct 25, 2015 · 1ef6712 · 1ef6712
2 parents 9d636f7 + 25603c0
commit 1ef6712
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 1 deletion.
diff --git a/hardware/pic32/libraries/DTWI/keywords.txt b/hardware/pic32/libraries/DTWI/keywords.txt
@@ -0,0 +1,55 @@
+#######################################
+# Syntax Coloring Map For DTWI library
+#######################################
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+beginMaster	        KEYWORD2
+endMaster	        KEYWORD2
+startMasterWrite	KEYWORD2
+startMasterRead	    KEYWORD2
+stopMaster	        KEYWORD2
+beginSlave	        KEYWORD2
+endSlave	        KEYWORD2
+read	            KEYWORD2
+discard	            KEYWORD2
+available	        KEYWORD2
+write	            KEYWORD2
+abort	            KEYWORD2
+transmitting	    KEYWORD2
+DTWI	            KEYWORD2
+stopMaster	        KEYWORD2
+stopMaster	        KEYWORD2
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+I2C_STATUS_T	    KEYWORD1
+I2C_FREQ            KEYWORD1
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+addrGenCall         LITERAL1
+addrStartByte       LITERAL1
+addrCBUS0           LITERAL1
+addrCBUS1           LITERAL1
+addrDiffBusFormat0  LITERAL1
+addrDiffBusFormat1  LITERAL1
+addrResrv0          LITERAL1
+addrResrv1          LITERAL1
+SLAVEADDR           LITERAL1
+SESSION_ID          LITERAL1
+GEN_CALL            LITERAL1
+BUS_IN_USE          LITERAL1
+MY_BUS              LITERAL1
+MASTER_MODE         LITERAL1
+SLAVE_MODE          LITERAL1
+BUS_ERROR           LITERAL1
+NAKING              LITERAL1
+WRITE               LITERAL1
+READ                LITERAL1
+recvInfinite        LITERAL1
diff --git a/hardware/pic32/platforms.txt b/hardware/pic32/platforms.txt
@@ -2,7 +2,7 @@
 pic32.recipe.c.o.pattern={0}{1}::{2}::{3}{4}::-DF_CPU={5}::-D{6}::-D{7}::{8}::{9}::{10}::-o::{11}
 pic32.recipe.cpp.o.pattern={0}{1}::{2}::{3}{4}::-DF_CPU={5}::-D{6}::-D{7}::{8}::{9}::{10}::-o::{11}
 pic32.recipe.ar.pattern={0}{1}::{2}::{3}{4}::{5}
-pic32.recipe.c.combine.pattern={0}{1}::{2}::{3}{4}::-o::{5}{6}.elf::{7}::{8}::{9}::-L{10}::-lm::-T::{11}/{12}::-T{13}/{14}
+pic32.recipe.c.combine.pattern={0}{1}::{2}::{3}{4}::-o::{5}{6}.elf::{11}\cpp-startup.S::{7}::{8}::{9}::-L{10}::-lm::-T::{11}/{12}::-T{13}/{14}
 pic32.recipe.objcopy.eep.pattern={0}{1}::{2}::{3}.elf::{4}.eep
 pic32.recipe.objcopy.hex.pattern={0}{1}::{2}::{3}.elf