Removing stupid Windows line endings on a couple of files.

diff --git a/rpp/rpp/rpp_srmain.tlc b/rpp/rpp/rpp_srmain.tlc
index 8aecf67b5664b193782f5fa8f1a3eac4700d7f98..f1e25fa15d40a1339ac0abf053cd09b0790b0d19 100644 (file)
--- a/rpp/rpp/rpp_srmain.tlc
+++ b/rpp/rpp/rpp_srmain.tlc
@@ -1,91 +1,91 @@
-%% Copyright (C) 2013 Czech Technical University in Prague\r
-%%\r
-%% Authors:\r
-%%      - Carlos Jenkins <carlos@jenkins.co.cr>\r
-%%\r
-%% This program is free software; you can redistribute it and/or modify\r
-%% it under the terms of the GNU General Public License as published by\r
-%% the Free Software Foundation; either version 2 of the License, or\r
-%% (at your option) any later version.\r
-%%\r
-%% This program is distributed in the hope that it will be useful,\r
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-%% GNU General Public License for more details.\r
-%%\r
-%% You should have received a copy of the GNU General Public License\r
-%% along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
-%%\r
-%% File : rpp_srmain.tlc\r
-%% Abstract:\r
-%%       Custom file processing to generate a "main" file.\r
-%%       Reference: ???\r
-\r
-%selectfile NULL_FILE\r
-\r
-%function FcnSingleTaskingMain() void\r
-\r
-  %if GenerateSampleERTMain\r
-    %assign CompiledModel.GenerateSampleERTMain = TLC_FALSE\r
-  %endif\r
-\r
-  %assign cFile = LibCreateSourceFile("Source", "Custom", "ert_main")\r
-\r
-  %openfile tmpBuf\r
-  #include "%<LibGetMdlPubHdrBaseName()>.h"\r
-  /* Include Files */\r
-  #include "sys_common.h"\r
-  #include "system.h"\r
-\r
-  #include "cmd_proc_freertos_tms570.h"\r
-  #include "FreeRTOS.h"\r
-  #include "os_task.h"\r
-  #include "can.h"\r
-  #include "adc.h"\r
-  #include "gio.h"\r
-  #include "het.h"\r
-  #include "emif.h"\r
-  #include "dmm.h"\r
-  #include "lin.h"\r
-  #include "emac_test.h"\r
-  #include "spi_tms570.h"\r
-  #include "spi_drv.h"\r
-  %closefile tmpBuf\r
-\r
-  %<LibSetSourceFileSection(cFile, "Includes", tmpBuf)>\r
-  %openfile tmpBuf\r
-  %closefile tmpBuf\r
-\r
-  %<LibSetSourceFileSection(cFile, "Declarations", tmpBuf)>\r
-  %openfile tmpBuf\r
-\r
-  void main(void)\r
-  {\r
-\r
-    /* Initialize model */\r
-    %<LibCallModelInitialize()>\\r
-    dmmInit();\r
-    gioInit();\r
-    hetInit();\r
-    sciInit();\r
-    canInit();\r
-    adcInit();\r
-    linInit();\r
-    emif_SDRAMInit();\r
-    spi_tms570_init();\r
-    _enable_IRQ();\r
-    initCmdProc(1, (uint8_t*)"\r\n----\r\n  Rapid Prototyping Platform v00.01-001\r\n  Porsche Engineering 12/2012\r\n----\r\n\r\nType commands", (uint8_t *)"\r\n--> ");\r
-    vTaskStartScheduler();\r
-\r
-    // We should never get here\r
-    while(1)\r
-        ;\r
-\r
-    %<LibCallModelTerminate()>\\r
-    return 0;\r
-  }\r
-  %closefile tmpBuf\r
-\r
-  %<LibSetSourceFileSection(cFile, "Functions", tmpBuf)>\r
-\r
-%endfunction\r
+%% Copyright (C) 2013 Czech Technical University in Prague
+%%
+%% Authors:
+%%      - Carlos Jenkins <carlos@jenkins.co.cr>
+%%
+%% This program is free software; you can redistribute it and/or modify
+%% it under the terms of the GNU General Public License as published by
+%% the Free Software Foundation; either version 2 of the License, or
+%% (at your option) any later version.
+%%
+%% This program is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%% GNU General Public License for more details.
+%%
+%% You should have received a copy of the GNU General Public License
+%% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%%
+%% File : rpp_srmain.tlc
+%% Abstract:
+%%       Custom file processing to generate a "main" file.
+%%       Reference: ???
+
+%selectfile NULL_FILE
+
+%function FcnSingleTaskingMain() void
+
+  %if GenerateSampleERTMain
+    %assign CompiledModel.GenerateSampleERTMain = TLC_FALSE
+  %endif
+
+  %assign cFile = LibCreateSourceFile("Source", "Custom", "ert_main")
+
+  %openfile tmpBuf
+  #include "%<LibGetMdlPubHdrBaseName()>.h"
+  /* Include Files */
+  #include "sys_common.h"
+  #include "system.h"
+
+  #include "cmd_proc_freertos_tms570.h"
+  #include "FreeRTOS.h"
+  #include "os_task.h"
+  #include "can.h"
+  #include "adc.h"
+  #include "gio.h"
+  #include "het.h"
+  #include "emif.h"
+  #include "dmm.h"
+  #include "lin.h"
+  #include "emac_test.h"
+  #include "spi_tms570.h"
+  #include "spi_drv.h"
+  %closefile tmpBuf
+
+  %<LibSetSourceFileSection(cFile, "Includes", tmpBuf)>
+  %openfile tmpBuf
+  %closefile tmpBuf
+
+  %<LibSetSourceFileSection(cFile, "Declarations", tmpBuf)>
+  %openfile tmpBuf
+
+  void main(void)
+  {
+
+    /* Initialize model */
+    %<LibCallModelInitialize()>\
+    dmmInit();
+    gioInit();
+    hetInit();
+    sciInit();
+    canInit();
+    adcInit();
+    linInit();
+    emif_SDRAMInit();
+    spi_tms570_init();
+    _enable_IRQ();
+    initCmdProc(1, (uint8_t*)"\r\n----\r\n  Rapid Prototyping Platform v00.01-001\r\n  Porsche Engineering 12/2012\r\n----\r\n\r\nType commands", (uint8_t *)"\r\n--> ");
+    vTaskStartScheduler();
+
+    // We should never get here
+    while(1)
+        ;
+
+    %<LibCallModelTerminate()>\
+    return 0;
+  }
+  %closefile tmpBuf
+
+  %<LibSetSourceFileSection(cFile, "Functions", tmpBuf)>
+
+%endfunction

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index 33dc9a8cbaa733d77a8bd6dc5835f33c5b8a0ef8..968759354aa0410b245d4b7df5b9146126d30271 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -1,78 +1,78 @@
-# Copyright (C) 2013 Czech Technical University in Prague\r
-#\r
-# Authors:\r
-#      - Carlos Jenkins <carlos@jenkins.co.cr>\r
-#\r
-# This program is free software; you can redistribute it and/or modify\r
-# it under the terms of the GNU General Public License as published by\r
-# the Free Software Foundation; either version 2 of the License, or\r
-# (at your option) any later version.\r
-#\r
-# This program is distributed in the hope that it will be useful,\r
-# but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-# GNU General Public License for more details.\r
-#\r
-# You should have received a copy of the GNU General Public License\r
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
-#\r
-# File : rpp_srmain.tlc\r
-# Abstract:\r
-#       ?????\r
-#       Reference: ???\r
-\r
-\r
-##########################\r
-# TODO: Adapt file\r
-##########################\r
-\r
-#include $(START_DIR)/slprj/arduino_prefs.mk\r
-\r
-#LOCAL_AVR_TOOLS_PATH = $(ARDUINO_ROOT)/hardware/tools/avr/bin/\r
-\r
-#LOCAL_OPT = -Os\r
-#LOCAL_CDEFS = -DF_CPU=$(F_CPU)\r
-#LOCAL_CXXDEFS = -DF_CPU=$(F_CPU)\r
-#LOCAL_CSTANDARD = -std=gnu99\r
-#LOCAL_CWARN = -Wall -Wstrict-prototypes\r
-#LOCAL_MCU_OPT = -mmcu=$(MCU)\r
-#CDEBUG = -gstabs\r
-\r
-## Compiler command and options\r
-#CC                  = $(LOCAL_AVR_TOOLS_PATH)/avr-gcc\r
-#CFLAGS = $(LOCAL_MCU_OPT) -I. $(LOCAL_CDEFS)\r
-#CFLAGS += $(LOCAL_OPT) $(LOCAL_CWARN) $(LOCAL_CSTANDARD)\r
-\r
-## Specify the output extension from compiler\r
-#CCOUTPUTFLAG        = -o\r
-#OBJ_EXT             = .o\r
-\r
-#CXX                 = $(LOCAL_AVR_TOOLS_PATH)/avr-g++\r
-#CXXFLAGS            = $(LOCAL_MCU_OPT) -I. $(LOCAL_CXXDEFS) $(LOCAL_OPT)\r
-\r
-## Linker command and options\r
-#LD                  = $(LOCAL_AVR_TOOLS_PATH)/avr-gcc\r
-#LDFLAGS = $(LOCAL_MCU_OPT) $(LOCAL_CDEFS) $(LOCAL_OPT) $(LOCAL_CWARN) $(LOCAL_CSTANDARD) -lm -Wl,-Map,mapFile.map,--cref\r
-\r
-## Specify extension from linker\r
-#LDOUTPUTFLAG        = -o\r
-#PROGRAM_FILE_EXT    = .elf\r
-\r
-## Archiver command and options\r
-#AR                  = $(LOCAL_AVR_TOOLS_PATH)/avr-ar\r
-#ARFLAGS             = rcs\r
-\r
-## Binary file format converter command and options\r
-#OBJCOPY             = $(LOCAL_AVR_TOOLS_PATH)/avr-objcopy\r
-#OBJCOPYFLAGS        = -O ihex -R .eeprom\r
-#BINARY_FILE_EXT     = .hex\r
-\r
-## Specify extension for final product at end of build\r
-#EXE_FILE_EXT = $(BINARY_FILE_EXT)\r
-\r
-#TARGET_INC_DIR      = $(ARDUINO_ROOT)/hardware/arduino/cores/arduino\r
-#TARGET_INCS         = -I$(TARGET_INC_DIR)\r
-#TARGET_SRC_DIR      = $(ARDUINO_ROOT)/hardware/arduino/cores/arduino\r
-#LOCAL_ARDUINO_SRCS  = $(notdir $(wildcard $(TARGET_SRC_DIR)/*.cpp)) $(notdir $(wildcard $(TARGET_SRC_DIR)/*.c))\r
-#TARGET_SRCS         = $(filter-out main.cpp,$(LOCAL_ARDUINO_SRCS))\r
-\r
+# Copyright (C) 2013 Czech Technical University in Prague
+#
+# Authors:
+#      - Carlos Jenkins <carlos@jenkins.co.cr>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File : rpp_srmain.tlc
+# Abstract:
+#       ?????
+#       Reference: ???
+
+
+##########################
+# TODO: Adapt file
+##########################
+
+#include $(START_DIR)/slprj/arduino_prefs.mk
+
+#LOCAL_AVR_TOOLS_PATH = $(ARDUINO_ROOT)/hardware/tools/avr/bin/
+
+#LOCAL_OPT = -Os
+#LOCAL_CDEFS = -DF_CPU=$(F_CPU)
+#LOCAL_CXXDEFS = -DF_CPU=$(F_CPU)
+#LOCAL_CSTANDARD = -std=gnu99
+#LOCAL_CWARN = -Wall -Wstrict-prototypes
+#LOCAL_MCU_OPT = -mmcu=$(MCU)
+#CDEBUG = -gstabs
+
+## Compiler command and options
+#CC                  = $(LOCAL_AVR_TOOLS_PATH)/avr-gcc
+#CFLAGS = $(LOCAL_MCU_OPT) -I. $(LOCAL_CDEFS)
+#CFLAGS += $(LOCAL_OPT) $(LOCAL_CWARN) $(LOCAL_CSTANDARD)
+
+## Specify the output extension from compiler
+#CCOUTPUTFLAG        = -o
+#OBJ_EXT             = .o
+
+#CXX                 = $(LOCAL_AVR_TOOLS_PATH)/avr-g++
+#CXXFLAGS            = $(LOCAL_MCU_OPT) -I. $(LOCAL_CXXDEFS) $(LOCAL_OPT)
+
+## Linker command and options
+#LD                  = $(LOCAL_AVR_TOOLS_PATH)/avr-gcc
+#LDFLAGS = $(LOCAL_MCU_OPT) $(LOCAL_CDEFS) $(LOCAL_OPT) $(LOCAL_CWARN) $(LOCAL_CSTANDARD) -lm -Wl,-Map,mapFile.map,--cref
+
+## Specify extension from linker
+#LDOUTPUTFLAG        = -o
+#PROGRAM_FILE_EXT    = .elf
+
+## Archiver command and options
+#AR                  = $(LOCAL_AVR_TOOLS_PATH)/avr-ar
+#ARFLAGS             = rcs
+
+## Binary file format converter command and options
+#OBJCOPY             = $(LOCAL_AVR_TOOLS_PATH)/avr-objcopy
+#OBJCOPYFLAGS        = -O ihex -R .eeprom
+#BINARY_FILE_EXT     = .hex
+
+## Specify extension for final product at end of build
+#EXE_FILE_EXT = $(BINARY_FILE_EXT)
+
+#TARGET_INC_DIR      = $(ARDUINO_ROOT)/hardware/arduino/cores/arduino
+#TARGET_INCS         = -I$(TARGET_INC_DIR)
+#TARGET_SRC_DIR      = $(ARDUINO_ROOT)/hardware/arduino/cores/arduino
+#LOCAL_ARDUINO_SRCS  = $(notdir $(wildcard $(TARGET_SRC_DIR)/*.cpp)) $(notdir $(wildcard $(TARGET_SRC_DIR)/*.c))
+#TARGET_SRCS         = $(filter-out main.cpp,$(LOCAL_ARDUINO_SRCS))
+