[tuxdroid-svn] r1264 - firmware/rf/trunk

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2008-06-25 10:28:54 +0200 (Wed, 25 Jun 2008)
New Revision: 1264

Modified:
   firmware/rf/trunk/Makefile
   firmware/rf/trunk/version.h
Log:
* Fixed the Makefile when producing tuxrf.* and fuxrf.*.


Modified: firmware/rf/trunk/Makefile
===================================================================
--- firmware/rf/trunk/Makefile	2008-06-25 08:27:53 UTC (rev 1263)
+++ firmware/rf/trunk/Makefile	2008-06-25 08:28:54 UTC (rev 1264)
@@ -4,7 +4,6 @@
 
 ## General Flags
 MCU = atmega48
-TARGET = fuxrf.elf
 CC = avr-gcc
 AVRDUDE = avrdude
 
@@ -19,11 +18,12 @@
     PROJECT = fuxrf
     CFLAGS += -D_MASTER
 else
+    PROJECT = tuxrf
     ifneq (,$(findstring slave, $(TYPE)))
-    PROJECT = tuxrf
     CFLAGS += -D_SLAVE
     endif
 endif
+TARGET =  $(PROJECT).elf
 
 
 ## Assembly specific flags
@@ -48,7 +48,7 @@
 LINKONLYOBJECTS = 
 
 ## Build
-all: svnrev.h $(TARGET) fuxrf.hex fuxrf.eep fuxrf.lss size
+all: svnrev.h $(TARGET) $(PROJECT).hex $(PROJECT).eep $(PROJECT).lss size
 
 ## Compile
 device.o: device.c
@@ -115,7 +115,7 @@
 	$(AVRDUDE) -p $(MCU) -c jtag2isp -P usb -B 10 -U hfuse:w:0xD5:m
 
 debug:
-	avarice -P $(MCU) -B 1000 -2 -w -j usb -p -f $(PROJECT).elf :4242
+	avarice -P $(MCU) -B 1000 -2 -w -j usb -p -f $(TARGET) :4242
 
 progisp: $(PROJECT).hex $(PROJECT).eep
 	$(AVRDUDE) -p $(MCU) -c jtag2isp -P usb -B 10 -e \

Modified: firmware/rf/trunk/version.h
===================================================================
--- firmware/rf/trunk/version.h	2008-06-25 08:27:53 UTC (rev 1263)
+++ firmware/rf/trunk/version.h	2008-06-25 08:28:54 UTC (rev 1264)
@@ -1,30 +1,30 @@
-/* KySoH iTux agent
- *
- * Behavioural source code
- * created on 2005/10/20                                        David Bourgeois
- * --------------------------------------------------------
- *
- */
-
-#ifndef _VERSION_H_
-#define _VERSION_H_
-
-/*
- * Version number
- */
-
-#define VER_MAJOR           0
-#define VER_MINOR           2
-#define VER_UPDATE          0
-
-/** RELEASE should be set to '1' prior to tagging a release, and reset
- * immediately after. It's like appending (SVN_UNRELEASED) to a version number
- * when equal to '0'. */
-#define RELEASE             0
-
-#define AUTHOR_ID           0 /* official release */
-#define VARIATION           0 /* generic firmware */
-
-#define RELEASE_TYPE (SVN_STATUS | (RELEASE << 2))
-
-#endif /* VERSION_H */
+/* KySoH iTux agent
+ *
+ * Behavioural source code
+ * created on 2005/10/20                                        David Bourgeois
+ * --------------------------------------------------------
+ *
+ */
+
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+/*
+ * Version number
+ */
+
+#define VER_MAJOR           0
+#define VER_MINOR           6
+#define VER_UPDATE          0
+
+/** RELEASE should be set to '1' prior to tagging a release, and reset
+ * immediately after. It's like appending (SVN_UNRELEASED) to a version number
+ * when equal to '0'. */
+#define RELEASE             0
+
+#define AUTHOR_ID           0 /* official release */
+#define VARIATION           0 /* generic firmware */
+
+#define RELEASE_TYPE (SVN_STATUS | (RELEASE << 2))
+
+#endif /* VERSION_H */