Skip to content

Commit b141a45

Browse files
DavidEGraysonDavidEGrayson
committed
Get rid of \r\n line endings.
1 parent d5e04f4 commit b141a45

21 files changed

+2154
-2154
lines changed

‎.dir-locals.el

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(
2-
(c-default-style . "BSD")
3-
(c-mode . ((c-basic-offset . 2) (tab-width . 2) (indent-tabs-mode . nil)))
4-
(c++-mode . ((c-basic-offset . 2) (tab-width . 2) (indent-tabs-mode . nil)))
5-
(nil . ((fill-column . 80)))
6-
)
1+
(
2+
(c-default-style . "BSD")
3+
(c-mode . ((c-basic-offset . 2) (tab-width . 2) (indent-tabs-mode . nil)))
4+
(c++-mode . ((c-basic-offset . 2) (tab-width . 2) (indent-tabs-mode . nil)))
5+
(nil . ((fill-column . 80)))
6+
)

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
*.inf -text
1+
*.inf -text

‎.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.DS_Store
2-
build*
3-
/docs
4-
/yaml
5-
/yaml*.tar.gz
1+
.DS_Store
2+
build*
3+
/docs
4+
/yaml
5+
/yaml*.tar.gz

‎CMakeLists.txt

+106-106
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
1-
cmake_minimum_required (VERSION 2.8.11)
2-
project (tic)
3-
4-
set(POLOLU_BUILD FALSE CACHE BOOL
5-
"True if this software is being built by Pololu, and should use the Pololu logo.")
6-
7-
set(ENABLE_GUI TRUE CACHE BOOL
8-
"True if you want to build the GUI, which depends on Qt 5.")
9-
10-
set (CLI_NAME "ticcmd")
11-
set (GUI_NAME "ticgui")
12-
set (DOCUMENTATION_URL "https://www.pololu.com/docs/0J71")
13-
14-
set (SOFTWARE_VERSION_MAJOR 1)
15-
set (SOFTWARE_VERSION_MINOR 0)
16-
set (SOFTWARE_VERSION_PATCH 0)
17-
set (SOFTWARE_VERSION ${SOFTWARE_VERSION_MAJOR}.${SOFTWARE_VERSION_MINOR}.${SOFTWARE_VERSION_PATCH})
18-
19-
string(TIMESTAMP YEAR "%Y")
20-
21-
find_package(PkgConfig)
22-
23-
if (NOT CMAKE_BUILD_TYPE)
24-
set (CMAKE_BUILD_TYPE "Release" CACHE STRING
25-
"Options are Debug Release RelWithDebInfo MinSizeRel" FORCE)
26-
endif ()
27-
28-
set(USE_SYSTEM_LIBYAML FALSE CACHE BOOL
29-
"True if you want to use libyaml from the system instead of the bundled one.")
30-
31-
# Our C code uses features from the C99 standard.
32-
macro(use_c99)
33-
if (CMAKE_VERSION VERSION_LESS "3.1")
34-
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
35-
set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
36-
endif ()
37-
else ()
38-
set (CMAKE_C_STANDARD 99)
39-
endif ()
40-
endmacro(use_c99)
41-
42-
# Our C++ code uses features from the C++11 standard.
43-
macro(use_cxx11)
44-
if (CMAKE_VERSION VERSION_LESS "3.1")
45-
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
46-
set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
47-
endif ()
48-
else ()
49-
set (CMAKE_CXX_STANDARD 11)
50-
endif ()
51-
endmacro(use_cxx11)
52-
53-
# Put libraries and executables in the top level of the build directory
54-
# so that the executables can find the libraries and it is easy to run
55-
# everything.
56-
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
57-
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
58-
59-
if (WIN32)
60-
# Enable correct behavior for the return value of vsnprintf.
61-
add_definitions (-D__USE_MINGW_ANSI_STDIO=1)
62-
63-
# Enable functions only available in Windows Vista and later.
64-
add_definitions (-D_WIN32_WINNT=0x0600 -DNTDDI_VERSION=0x06000000)
65-
endif ()
66-
67-
# Detect Linux.
68-
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
69-
set (LINUX 1)
70-
endif ()
71-
72-
# Fix a warning on Mac OS X.
73-
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
74-
cmake_policy(SET CMP0042 NEW)
75-
endif ()
76-
77-
include_directories (
78-
"${CMAKE_SOURCE_DIR}/include"
79-
"${CMAKE_BINARY_DIR}/include"
80-
)
81-
82-
configure_file (
83-
"include/config.h.in"
84-
"include/config.h"
85-
)
86-
87-
file(WRITE "${CMAKE_BINARY_DIR}/version.txt" "${SOFTWARE_VERSION}")
88-
89-
add_subdirectory (lib)
90-
add_subdirectory (cli)
91-
92-
if (ENABLE_GUI)
93-
# TODO: add_subdirectory (gui)
94-
endif ()
95-
96-
if (WIN32)
97-
# TODO: add_subdirectory (windows-installer)
98-
endif ()
99-
100-
if (APPLE)
101-
# TODO: add_subdirectory (mac-installer)
102-
endif ()
103-
104-
if (NOT USE_SYSTEM_LIBYAML)
105-
add_subdirectory (libyaml)
106-
endif ()
1+
cmake_minimum_required (VERSION 2.8.11)
2+
project (tic)
3+
4+
set(POLOLU_BUILD FALSE CACHE BOOL
5+
"True if this software is being built by Pololu, and should use the Pololu logo.")
6+
7+
set(ENABLE_GUI TRUE CACHE BOOL
8+
"True if you want to build the GUI, which depends on Qt 5.")
9+
10+
set (CLI_NAME "ticcmd")
11+
set (GUI_NAME "ticgui")
12+
set (DOCUMENTATION_URL "https://www.pololu.com/docs/0J71")
13+
14+
set (SOFTWARE_VERSION_MAJOR 1)
15+
set (SOFTWARE_VERSION_MINOR 0)
16+
set (SOFTWARE_VERSION_PATCH 0)
17+
set (SOFTWARE_VERSION ${SOFTWARE_VERSION_MAJOR}.${SOFTWARE_VERSION_MINOR}.${SOFTWARE_VERSION_PATCH})
18+
19+
string(TIMESTAMP YEAR "%Y")
20+
21+
find_package(PkgConfig)
22+
23+
if (NOT CMAKE_BUILD_TYPE)
24+
set (CMAKE_BUILD_TYPE "Release" CACHE STRING
25+
"Options are Debug Release RelWithDebInfo MinSizeRel" FORCE)
26+
endif ()
27+
28+
set(USE_SYSTEM_LIBYAML FALSE CACHE BOOL
29+
"True if you want to use libyaml from the system instead of the bundled one.")
30+
31+
# Our C code uses features from the C99 standard.
32+
macro(use_c99)
33+
if (CMAKE_VERSION VERSION_LESS "3.1")
34+
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
35+
set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
36+
endif ()
37+
else ()
38+
set (CMAKE_C_STANDARD 99)
39+
endif ()
40+
endmacro(use_c99)
41+
42+
# Our C++ code uses features from the C++11 standard.
43+
macro(use_cxx11)
44+
if (CMAKE_VERSION VERSION_LESS "3.1")
45+
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
46+
set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
47+
endif ()
48+
else ()
49+
set (CMAKE_CXX_STANDARD 11)
50+
endif ()
51+
endmacro(use_cxx11)
52+
53+
# Put libraries and executables in the top level of the build directory
54+
# so that the executables can find the libraries and it is easy to run
55+
# everything.
56+
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
57+
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
58+
59+
if (WIN32)
60+
# Enable correct behavior for the return value of vsnprintf.
61+
add_definitions (-D__USE_MINGW_ANSI_STDIO=1)
62+
63+
# Enable functions only available in Windows Vista and later.
64+
add_definitions (-D_WIN32_WINNT=0x0600 -DNTDDI_VERSION=0x06000000)
65+
endif ()
66+
67+
# Detect Linux.
68+
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
69+
set (LINUX 1)
70+
endif ()
71+
72+
# Fix a warning on Mac OS X.
73+
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
74+
cmake_policy(SET CMP0042 NEW)
75+
endif ()
76+
77+
include_directories (
78+
"${CMAKE_SOURCE_DIR}/include"
79+
"${CMAKE_BINARY_DIR}/include"
80+
)
81+
82+
configure_file (
83+
"include/config.h.in"
84+
"include/config.h"
85+
)
86+
87+
file(WRITE "${CMAKE_BINARY_DIR}/version.txt" "${SOFTWARE_VERSION}")
88+
89+
add_subdirectory (lib)
90+
add_subdirectory (cli)
91+
92+
if (ENABLE_GUI)
93+
# TODO: add_subdirectory (gui)
94+
endif ()
95+
96+
if (WIN32)
97+
# TODO: add_subdirectory (windows-installer)
98+
endif ()
99+
100+
if (APPLE)
101+
# TODO: add_subdirectory (mac-installer)
102+
endif ()
103+
104+
if (NOT USE_SYSTEM_LIBYAML)
105+
add_subdirectory (libyaml)
106+
endif ()

‎Doxyfile

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# Doxygen configuration file for generating documentation.
2-
PROJECT_NAME = "tic"
3-
OUTPUT_DIRECTORY = docs
4-
INLINE_INHERITED_MEMB = YES
5-
INPUT = README.md include
6-
USE_MDFILE_AS_MAINPAGE = README.md
7-
RECURSIVE = YES
8-
SOURCE_BROWSER = YES
9-
USE_MATHJAX = YES
10-
GENERATE_LATEX = NO
11-
# TYPEDEF_HIDES_STRUCT = YES
12-
13-
MACRO_EXPANSION = YES
14-
EXPAND_ONLY_PREDEF = YES
15-
PREDEFINED = \
16-
TIC_API= \
17-
TIC_WARN_UNUSED =
18-
19-
EXCLUDE_SYMBOLS = \
20-
TIC_WARN_UNUSED \
21-
TIC_API \
22-
tic_get_debug_data
1+
# Doxygen configuration file for generating documentation.
2+
PROJECT_NAME = "tic"
3+
OUTPUT_DIRECTORY = docs
4+
INLINE_INHERITED_MEMB = YES
5+
INPUT = README.md include
6+
USE_MDFILE_AS_MAINPAGE = README.md
7+
RECURSIVE = YES
8+
SOURCE_BROWSER = YES
9+
USE_MATHJAX = YES
10+
GENERATE_LATEX = NO
11+
# TYPEDEF_HIDES_STRUCT = YES
12+
13+
MACRO_EXPANSION = YES
14+
EXPAND_ONLY_PREDEF = YES
15+
PREDEFINED = \
16+
TIC_API= \
17+
TIC_WARN_UNUSED =
18+
19+
EXCLUDE_SYMBOLS = \
20+
TIC_WARN_UNUSED \
21+
TIC_API \
22+
tic_get_debug_data

‎LICENSE.txt

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
Copyright (c) 2015-2016 Pololu Corporation. For more information, see
2-
3-
http://www.pololu.com/
4-
http://forum.pololu.com/
5-
6-
Permission is hereby granted, free of charge, to any person
7-
obtaining a copy of this software and associated documentation
8-
files (the "Software"), to deal in the Software without
9-
restriction, including without limitation the rights to use,
10-
copy, modify, merge, publish, distribute, sublicense, and/or sell
11-
copies of the Software, and to permit persons to whom the
12-
Software is furnished to do so, subject to the following
13-
conditions:
14-
15-
The above copyright notice and this permission notice shall be
16-
included in all copies or substantial portions of the Software.
17-
18-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
19-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
20-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
22-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
23-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25-
OTHER DEALINGS IN THE SOFTWARE.
1+
Copyright (c) 2015-2016 Pololu Corporation. For more information, see
2+
3+
http://www.pololu.com/
4+
http://forum.pololu.com/
5+
6+
Permission is hereby granted, free of charge, to any person
7+
obtaining a copy of this software and associated documentation
8+
files (the "Software"), to deal in the Software without
9+
restriction, including without limitation the rights to use,
10+
copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the
12+
Software is furnished to do so, subject to the following
13+
conditions:
14+
15+
The above copyright notice and this permission notice shall be
16+
included in all copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
19+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
20+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
22+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
23+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25+
OTHER DEALINGS IN THE SOFTWARE.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# Tic USB Stepper Motor Controller software
1+
# Tic USB Stepper Motor Controller software

‎cli/CMakeLists.txt

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
use_cxx11()
2-
3-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
4-
5-
configure_file (cli_info.rc.in cli_info.rc)
6-
7-
add_executable (cli cli.cpp ${CMAKE_CURRENT_BINARY_DIR}/cli_info.rc)
8-
9-
set_target_properties (cli PROPERTIES
10-
OUTPUT_NAME ${CLI_NAME}
11-
)
12-
13-
include_directories (
14-
"${CMAKE_SOURCE_DIR}/include"
15-
)
16-
17-
target_link_libraries (cli lib)
18-
19-
install(TARGETS cli DESTINATION bin)
1+
use_cxx11()
2+
3+
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
4+
5+
configure_file (cli_info.rc.in cli_info.rc)
6+
7+
add_executable (cli cli.cpp ${CMAKE_CURRENT_BINARY_DIR}/cli_info.rc)
8+
9+
set_target_properties (cli PROPERTIES
10+
OUTPUT_NAME ${CLI_NAME}
11+
)
12+
13+
include_directories (
14+
"${CMAKE_SOURCE_DIR}/include"
15+
)
16+
17+
target_link_libraries (cli lib)
18+
19+
install(TARGETS cli DESTINATION bin)

0 commit comments

Comments
 (0)