Merge branch 'master' of ssh://git.b9.com/home/gitpub/avr_serial_lcd

diff --git a/Makefile b/Makefile
index 6ccef0b3db95bf88299041e0f45dbe6f0cf2b0aa..4a6b1d30d2e7e9e6bd703e8a545cbffe9568d147 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,18 +23,6 @@ build: tester-build
        $(MAKE) -C icc_c\r
        $(MAKE) -C cv_c\r
 \r
-dist: tester-build  build\r
-       @chmod -x *.c *.h *.cpp README ChangeLog LICENSE\r
-       @find $(GCCDIR) -type f -exec chmod -x {} \;\r
-       @find $(IARDIR) -type f -exec chmod -x {} \;\r
-       @find $(ICCDIR) -type f -exec chmod -x {} \;\r
-       @zip serial_lcd-$(date).zip README serial_lcd.c serial_lcd.cpp serial_lcd_obj.cpp serial_lcd.h LICENSE ChangeLog \\r
-       $(GCCDIR)/Makefile $(GCCDIR)/serial_lcd.map $(GCCDIR)/serial_lcd_cpp.map $(GCCDIR)/serial_lcd.lss \\r
-       $(GCCDIR)/serial_lcd_cpp.lss $(GCCDIR)/serial_lcd.hex $(GCCDIR)/serial_lcd_cpp.hex \\r
-       $(GCCDIR)/serial_lcd_obj.lss $(GCCDIR)/serial_lcd_obj.map $(GCCDIR)/serial_lcd_obj.map \\r
-       $(IARDIR)/*.lst $(IARDIR)/*.map $(IARDIR)/*.hex $(ICCDIR)/*.mp $(ICCDIR)/*.lst $(ICCDIR)/*.hex \\r
-       $(tester).c $(tester).exe\r
-\r
 .PHONY: clean\r
 clean:\r
        @rm -rf tester-build\r

diff --git a/cv_c/Makefile b/cv_c/Makefile
index e4726206ab06c48d415e881903b796239b121b8f..3eb0ff5faa325991e2f13c494269d631b9282654 100644 (file)
--- a/cv_c/Makefile
+++ b/cv_c/Makefile
@@ -1,3 +1,7 @@
+###############################################################################\r
+# Makefile for the serial_lcd C version for Codevision\r
+# Note: CodeVision only allows building from its IDE\r
+\r
 PROJECT := serial_lcd\r
 \r
 all: build\r

diff --git a/gcc_c/Makefile b/gcc_c/Makefile
index 47eb20899977add86fb0de082c88e1c69e08f1c6..e2d9ea16730c862e927358eee8e98ef8a20fefbe 100644 (file)
--- a/gcc_c/Makefile
+++ b/gcc_c/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd C version for GCC\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd\r

diff --git a/gcc_cpp/Makefile b/gcc_cpp/Makefile
index 1e142cf19b46aee07c00227bcc6f188b8212b3a4..89acb5a392cf1d7ced01d7f600984917544fded9 100644 (file)
--- a/gcc_cpp/Makefile
+++ b/gcc_cpp/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd CPP version for GCC\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd_cpp\r

diff --git a/gcc_cpp_obj/Makefile b/gcc_cpp_obj/Makefile
index 9f5811cf1223c95aa708bac1f972bbec23f92427..5ac1c750a553574846d3e78027c121ae79173647 100644 (file)
--- a/gcc_cpp_obj/Makefile
+++ b/gcc_cpp_obj/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd CPP Object version for GCC\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd_obj\r

diff --git a/iar_c/Makefile b/iar_c/Makefile
index c0dfcb59aeb22995d006ff8ae2676672957dced3..949ac7cbedc23b2700c5dab8dbd36d6028b3e064 100644 (file)
--- a/iar_c/Makefile
+++ b/iar_c/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd C version for IAR\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd\r

diff --git a/iar_cpp/Makefile b/iar_cpp/Makefile
index 5c638544dc95c209861986132649165dbb969625..a0e30b381c149e9c94120caafe680e7926239da6 100644 (file)
--- a/iar_cpp/Makefile
+++ b/iar_cpp/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd CPP version for IAR\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd_cpp\r

diff --git a/iar_cpp_obj/Makefile b/iar_cpp_obj/Makefile
index c9ddf60e9f12f20d9cfd45ccbfb21414fa95e37b..da561c7e7ffd15e6557d22fafa6e4297176b3009 100644 (file)
--- a/iar_cpp_obj/Makefile
+++ b/iar_cpp_obj/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd CPP Object version for IAR\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd_obj\r

diff --git a/icc_c/Makefile b/icc_c/Makefile
index cbdf209c069914899c4471850eb93e28de9b5bea..e0395096a365bd120dcc4b3a181350ad3ab52bd8 100644 (file)
--- a/icc_c/Makefile
+++ b/icc_c/Makefile
@@ -1,5 +1,5 @@
 ###############################################################################\r
-# Makefile for the serial_lcd C & CPP versions \r
+# Makefile for the serial_lcd C version for ICC\r
 \r
 ## General Flags\r
 PROJECT = serial_lcd\r

diff --git a/serial_lcd.c b/serial_lcd.c
index 899e945bcbef5eb56803e48875bcf9d5eb76aaa1..dc375fddf158cebe842ac39c929cf63e2ac95863 100644 (file)
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -25,11 +25,11 @@
 #include "serial_lcd.h"\r
 \r
 #if defined(__GNUC__)\r
-FUSES = {\r
-  .low = SUT1, \r
-  .high = (unsigned char) (DWEN & WDTON & RSTDISBL & BODLEVEL1 & BODLEVEL2),\r
-  .extended = EFUSE_DEFAULT,\r
-};\r
+//FUSES = {\r
+// .low = SUT1, \r
+    //  .high = (unsigned char) (DWEN & WDTON & RSTDISBL & BODLEVEL1 & BODLEVEL2),\r
+    //  .extended = EFUSE_DEFAULT,\r
+    //};\r
 #endif\r
   \r
 // Number of PWM brightness levels supported\r