Skip to content

GitLab

Commit 65e10106 authored by Eric Fossum's avatar Eric Fossum
Browse files
Options

Switched to gcc and tested emc1072 code.

parent 25384333
Hide whitespace changes
Inline Side-by-side
Showing with 439 additions and 190 deletions
.gitignore 0 → 100644
View file @ 65e10106
# Netbeans Ignores
nbproject/private
include/emc1072.h 0 → 100644
View file @ 65e10106
/*
* File: emc1072.h
* Author: ericfoss
*
* Created on February 13, 2017, 7:48 PM
*/
#ifndef EMC1072_H
#define EMC1072_H
#include "linux-i2c.h"
class Emc1072 : private LinuxI2c {
public:
Emc1072(const char *, int);
double internal_temp();
double external_temp();
static double c_to_f(double);
static double f_to_c(double);
private:
};
#endif /* EMC1072_H */
include/linux-i2c.h
View file @ 65e10106
......@@ -25,7 +25,7 @@ public:
bool recv(char *buffer, int len);
bool send_recv(char *buffer, int send_len, int recv_len);
private:
int i2c_handle;
};
#endif /* LINUXI2C_H */
......
nbproject/Makefile-Debug.mk
View file @ 65e10106
......@@ -14,14 +14,14 @@ GREP=grep
NM=nm
CCADMIN=CCadmin
RANLIB=ranlib
CC=clang
CCC=clang++
CXX=clang++
CC=gcc
CCC=g++
CXX=g++
FC=gfortran
AS=as
# Macros
CND_PLATFORM=CLang-Linux
CND_PLATFORM=GNU-Linux
CND_DLIB_EXT=so
CND_CONF=Debug
CND_DISTDIR=dist
......@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
# Object Files
OBJECTFILES= \
${OBJECTDIR}/src/emc1072.o \
${OBJECTDIR}/src/linux-i2c.o
# Test Directory
......@@ -42,10 +43,12 @@ TESTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tests
# Test Files
TESTFILES= \
${TESTDIR}/TestFiles/f1 \
${TESTDIR}/TestFiles/f2
# Test Object Files
TESTOBJECTFILES= \
${TESTDIR}/tests/emc1072test.o \
${TESTDIR}/tests/linuxi2ctest.o
# C Compiler Flags
......@@ -66,13 +69,18 @@ LDLIBSOPTIONS=
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
"${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}
"${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT}
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}: ${OBJECTFILES}
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT}: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
clang++ -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT} ${OBJECTFILES} ${LDLIBSOPTIONS} -v -shared -fPIC
${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT} ${OBJECTFILES} ${LDLIBSOPTIONS} -v -shared -fPIC
${OBJECTDIR}/src/linux-i2c.o: src/linux-i2c.cpp
${OBJECTDIR}/src/emc1072.o: src/emc1072.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -g -Iinclude -std=c++98 -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/emc1072.o src/emc1072.cpp
${OBJECTDIR}/src/linux-i2c.o: src/linux-i2c.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -g -Iinclude -std=c++98 -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.cpp
......@@ -84,9 +92,19 @@ ${OBJECTDIR}/src/linux-i2c.o: src/linux-i2c.cpp
.build-tests-conf: .build-tests-subprojects .build-conf ${TESTFILES}
.build-tests-subprojects:
${TESTDIR}/TestFiles/f1: ${TESTDIR}/tests/emc1072test.o ${OBJECTFILES:%.o=%_nomain.o}
${MKDIR} -p ${TESTDIR}/TestFiles
${LINK.cc} -o ${TESTDIR}/TestFiles/f1 $^ ${LDLIBSOPTIONS}
${TESTDIR}/TestFiles/f2: ${TESTDIR}/tests/linuxi2ctest.o ${OBJECTFILES:%.o=%_nomain.o}
${MKDIR} -p ${TESTDIR}/TestFiles
${LINK.cc} -o ${TESTDIR}/TestFiles/f2 $^ ${LDLIBSOPTIONS}
${LINK.cc} -o ${TESTDIR}/TestFiles/f2 $^ ${LDLIBSOPTIONS}
${TESTDIR}/tests/emc1072test.o: tests/emc1072test.cpp
${MKDIR} -p ${TESTDIR}/tests
${RM} "$@.d"
$(COMPILE.cc) -g -Iinclude -I. -std=c++98 -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/emc1072test.o tests/emc1072test.cpp
${TESTDIR}/tests/linuxi2ctest.o: tests/linuxi2ctest.cpp
......@@ -95,6 +113,19 @@ ${TESTDIR}/tests/linuxi2ctest.o: tests/linuxi2ctest.cpp
$(COMPILE.cc) -g -Iinclude -I. -std=c++98 -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/linuxi2ctest.o tests/linuxi2ctest.cpp
${OBJECTDIR}/src/emc1072_nomain.o: ${OBJECTDIR}/src/emc1072.o src/emc1072.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/emc1072.o`; \
if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \
${RM} "$@.d";\
$(COMPILE.cc) -g -Iinclude -std=c++98 -fPIC -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/emc1072_nomain.o src/emc1072.cpp;\
else \
${CP} ${OBJECTDIR}/src/emc1072.o ${OBJECTDIR}/src/emc1072_nomain.o;\
fi
${OBJECTDIR}/src/linux-i2c_nomain.o: ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/linux-i2c.o`; \
......@@ -112,6 +143,7 @@ ${OBJECTDIR}/src/linux-i2c_nomain.o: ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.
.test-conf:
@if [ "${TEST}" = "" ]; \
then \
${TESTDIR}/TestFiles/f1 || true; \
${TESTDIR}/TestFiles/f2 || true; \
else \
./${TEST} || true; \
......@@ -120,7 +152,6 @@ ${OBJECTDIR}/src/linux-i2c_nomain.o: ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
${RM} -r ${CND_BUILDDIR}/${CND_CONF}
${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}
# Subprojects
.clean-subprojects:
......
nbproject/Makefile-Release.mk
View file @ 65e10106
......@@ -14,14 +14,14 @@ GREP=grep
NM=nm
CCADMIN=CCadmin
RANLIB=ranlib
CC=clang
CCC=clang++
CXX=clang++
CC=gcc
CCC=g++
CXX=g++
FC=gfortran
AS=as
# Macros
CND_PLATFORM=CLang-Linux
CND_PLATFORM=GNU-Linux
CND_DLIB_EXT=so
CND_CONF=Release
CND_DISTDIR=dist
......@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
# Object Files
OBJECTFILES= \
${OBJECTDIR}/src/emc1072.o \
${OBJECTDIR}/src/linux-i2c.o
# Test Directory
......@@ -42,10 +43,12 @@ TESTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tests
# Test Files
TESTFILES= \
${TESTDIR}/TestFiles/f1 \
${TESTDIR}/TestFiles/f2
# Test Object Files
TESTOBJECTFILES= \
${TESTDIR}/tests/emc1072test.o \
${TESTDIR}/tests/linuxi2ctest.o
# C Compiler Flags
......@@ -66,13 +69,18 @@ LDLIBSOPTIONS=
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
"${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}
"${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT}
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}: ${OBJECTFILES}
${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT}: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT} ${OBJECTFILES} ${LDLIBSOPTIONS} -shared -fPIC
${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT} ${OBJECTFILES} ${LDLIBSOPTIONS} -shared -fPIC
${OBJECTDIR}/src/linux-i2c.o: src/linux-i2c.cpp
${OBJECTDIR}/src/emc1072.o: src/emc1072.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -O2 -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/emc1072.o src/emc1072.cpp
${OBJECTDIR}/src/linux-i2c.o: src/linux-i2c.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -O2 -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.cpp
......@@ -84,9 +92,19 @@ ${OBJECTDIR}/src/linux-i2c.o: src/linux-i2c.cpp
.build-tests-conf: .build-tests-subprojects .build-conf ${TESTFILES}
.build-tests-subprojects:
${TESTDIR}/TestFiles/f1: ${TESTDIR}/tests/emc1072test.o ${OBJECTFILES:%.o=%_nomain.o}
${MKDIR} -p ${TESTDIR}/TestFiles
${LINK.cc} -o ${TESTDIR}/TestFiles/f1 $^ ${LDLIBSOPTIONS}
${TESTDIR}/TestFiles/f2: ${TESTDIR}/tests/linuxi2ctest.o ${OBJECTFILES:%.o=%_nomain.o}
${MKDIR} -p ${TESTDIR}/TestFiles
${LINK.cc} -o ${TESTDIR}/TestFiles/f2 $^ ${LDLIBSOPTIONS}
${LINK.cc} -o ${TESTDIR}/TestFiles/f2 $^ ${LDLIBSOPTIONS}
${TESTDIR}/tests/emc1072test.o: tests/emc1072test.cpp
${MKDIR} -p ${TESTDIR}/tests
${RM} "$@.d"
$(COMPILE.cc) -O2 -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/emc1072test.o tests/emc1072test.cpp
${TESTDIR}/tests/linuxi2ctest.o: tests/linuxi2ctest.cpp
......@@ -95,6 +113,19 @@ ${TESTDIR}/tests/linuxi2ctest.o: tests/linuxi2ctest.cpp
$(COMPILE.cc) -O2 -I. -MMD -MP -MF "$@.d" -o ${TESTDIR}/tests/linuxi2ctest.o tests/linuxi2ctest.cpp
${OBJECTDIR}/src/emc1072_nomain.o: ${OBJECTDIR}/src/emc1072.o src/emc1072.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/emc1072.o`; \
if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \
${RM} "$@.d";\
$(COMPILE.cc) -O2 -fPIC -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/emc1072_nomain.o src/emc1072.cpp;\
else \
${CP} ${OBJECTDIR}/src/emc1072.o ${OBJECTDIR}/src/emc1072_nomain.o;\
fi
${OBJECTDIR}/src/linux-i2c_nomain.o: ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/linux-i2c.o`; \
......@@ -112,6 +143,7 @@ ${OBJECTDIR}/src/linux-i2c_nomain.o: ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.
.test-conf:
@if [ "${TEST}" = "" ]; \
then \
${TESTDIR}/TestFiles/f1 || true; \
${TESTDIR}/TestFiles/f2 || true; \
else \
./${TEST} || true; \
......@@ -120,7 +152,6 @@ ${OBJECTDIR}/src/linux-i2c_nomain.o: ${OBJECTDIR}/src/linux-i2c.o src/linux-i2c.
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
${RM} -r ${CND_BUILDDIR}/${CND_CONF}
${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}
# Subprojects
.clean-subprojects:
......
nbproject/Makefile-impl.mk
View file @ 65e10106
......@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
# Project Name
PROJECTNAME=Emc1072
PROJECTNAME=emc1072
# Active Configuration
DEFAULTCONF=Debug
......
nbproject/Makefile-variables.mk
View file @ 65e10106
......@@ -7,21 +7,21 @@ CND_BASEDIR=`pwd`
CND_BUILDDIR=build
CND_DISTDIR=dist
# Debug configuration
CND_PLATFORM_Debug=CLang-Linux
CND_ARTIFACT_DIR_Debug=dist/Debug/CLang-Linux
CND_ARTIFACT_NAME_Debug=libEmc1072.so
CND_ARTIFACT_PATH_Debug=dist/Debug/CLang-Linux/libEmc1072.so
CND_PACKAGE_DIR_Debug=dist/Debug/CLang-Linux/package
CND_PACKAGE_NAME_Debug=libEmc1072.so.tar
CND_PACKAGE_PATH_Debug=dist/Debug/CLang-Linux/package/libEmc1072.so.tar
CND_PLATFORM_Debug=GNU-Linux
CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux
CND_ARTIFACT_NAME_Debug=libemc1072.so
CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux/libemc1072.so
CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux/package
CND_PACKAGE_NAME_Debug=libemc1072.so.tar
CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux/package/libemc1072.so.tar
# Release configuration
CND_PLATFORM_Release=CLang-Linux
CND_ARTIFACT_DIR_Release=dist/Release/CLang-Linux
CND_ARTIFACT_NAME_Release=libEmc1072.so
CND_ARTIFACT_PATH_Release=dist/Release/CLang-Linux/libEmc1072.so
CND_PACKAGE_DIR_Release=dist/Release/CLang-Linux/package
CND_PACKAGE_NAME_Release=libEmc1072.so.tar
CND_PACKAGE_PATH_Release=dist/Release/CLang-Linux/package/libEmc1072.so.tar
CND_PLATFORM_Release=GNU-Linux
CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux
CND_ARTIFACT_NAME_Release=libemc1072.so
CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/libemc1072.so
CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package
CND_PACKAGE_NAME_Release=libemc1072.so.tar
CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/libemc1072.so.tar
#
# include compiler specific variables
#
......
nbproject/Package-Debug.bash
View file @ 65e10106
......@@ -6,16 +6,16 @@
# Macros
TOP=`pwd`
CND_PLATFORM=CLang-Linux
CND_PLATFORM=GNU-Linux
CND_CONF=Debug
CND_DISTDIR=dist
CND_BUILDDIR=build
CND_DLIB_EXT=so
NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
TMPDIRNAME=tmp-packaging
OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}
OUTPUT_BASENAME=libEmc1072.${CND_DLIB_EXT}
PACKAGE_TOP_DIR=libEmc1072.so/
OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT}
OUTPUT_BASENAME=libemc1072.${CND_DLIB_EXT}
PACKAGE_TOP_DIR=libemc1072.so/
# Functions
function checkReturnCode
......@@ -60,15 +60,15 @@ mkdir -p ${NBTMPDIR}
# Copy files and create directories and links
cd "${TOP}"
makeDirectory "${NBTMPDIR}/libEmc1072.so/lib"
makeDirectory "${NBTMPDIR}/libemc1072.so/lib"
copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
# Generate tar file
cd "${TOP}"
rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libEmc1072.so.tar
rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libemc1072.so.tar
cd ${NBTMPDIR}
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libEmc1072.so.tar *
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libemc1072.so.tar *
checkReturnCode
# Cleanup
......
nbproject/Package-Release.bash
View file @ 65e10106
......@@ -6,16 +6,16 @@
# Macros
TOP=`pwd`
CND_PLATFORM=CLang-Linux
CND_PLATFORM=GNU-Linux
CND_CONF=Release
CND_DISTDIR=dist
CND_BUILDDIR=build
CND_DLIB_EXT=so
NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
TMPDIRNAME=tmp-packaging
OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libEmc1072.${CND_DLIB_EXT}
OUTPUT_BASENAME=libEmc1072.${CND_DLIB_EXT}
PACKAGE_TOP_DIR=libEmc1072.so/
OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libemc1072.${CND_DLIB_EXT}
OUTPUT_BASENAME=libemc1072.${CND_DLIB_EXT}
PACKAGE_TOP_DIR=libemc1072.so/
# Functions
function checkReturnCode
......@@ -60,15 +60,15 @@ mkdir -p ${NBTMPDIR}
# Copy files and create directories and links
cd "${TOP}"
makeDirectory "${NBTMPDIR}/libEmc1072.so/lib"
makeDirectory "${NBTMPDIR}/libemc1072.so/lib"
copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
# Generate tar file
cd "${TOP}"
rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libEmc1072.so.tar
rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libemc1072.so.tar
cd ${NBTMPDIR}
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libEmc1072.so.tar *
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libemc1072.so.tar *
checkReturnCode
# Cleanup
......
nbproject/configurations.xml
View file @ 65e10106
<?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="97">
<configurationDescriptor version="100">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<logicalFolder name="HeaderFiles"
displayName="Header Files"
projectFiles="true">
<itemPath>include/I2cBase.h</itemPath>
<itemPath>include/emc1072.h</itemPath>
<itemPath>include/linux-i2c.h</itemPath>
</logicalFolder>
<logicalFolder name="ResourceFiles"
......@@ -14,12 +15,19 @@
<logicalFolder name="SourceFiles"
displayName="Source Files"
projectFiles="true">
<itemPath>src/emc1072.cpp</itemPath>
<itemPath>src/linux-i2c.cpp</itemPath>
</logicalFolder>
<logicalFolder name="TestFiles"
displayName="Test Files"
projectFiles="false"
kind="TEST_LOGICAL_FOLDER">
<logicalFolder name="f1"
displayName="EMC1072 Test"
projectFiles="true"
kind="TEST">
<itemPath>tests/emc1072test.cpp</itemPath>
</logicalFolder>
<logicalFolder name="f2"
displayName="Linux I2C Test"
projectFiles="true"
......@@ -38,7 +46,7 @@
<confs>
<conf name="Debug" type="2">
<toolsSet>
<compilerSet>default</compilerSet>
<compilerSet>GNU|GNU</compilerSet>
<dependencyChecking>true</dependencyChecking>
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
......@@ -50,16 +58,29 @@
</cTool>
<ccTool>
<standard>4</standard>
<commandlineTool>clang++</commandlineTool>
<incDir>
<pElem>include</pElem>
</incDir>
</ccTool>
<linkerTool>
<commandlineTool>clang++</commandlineTool>
<commandLine>-v</commandLine>
</linkerTool>
</compileType>
<folder path="TestFiles/f1">
<cTool>
<incDir>
<pElem>.</pElem>
</incDir>
</cTool>
<ccTool>
<incDir>
<pElem>.</pElem>
</incDir>
</ccTool>
<linkerTool>
<output>${TESTDIR}/TestFiles/f1</output>
</linkerTool>
</folder>
<folder path="TestFiles/f2">
<cTool>
<incDir>
......@@ -77,10 +98,16 @@
</folder>
<item path="include/I2cBase.h" ex="false" tool="3" flavor2="0">
</item>
<item path="include/emc1072.h" ex="false" tool="3" flavor2="0">
</item>
<item path="include/linux-i2c.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/emc1072.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/linux-i2c.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/emc1072test.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/linuxi2ctest.cpp" ex="false" tool="1" flavor2="0">
</item>
</conf>
......@@ -104,6 +131,21 @@
<developmentMode>5</developmentMode>
</asmTool>
</compileType>
<folder path="TestFiles/f1">
<cTool>
<incDir>
<pElem>.</pElem>
</incDir>
</cTool>
<ccTool>
<incDir>
<pElem>.</pElem>
</incDir>
</ccTool>
<linkerTool>
<output>${TESTDIR}/TestFiles/f1</output>
</linkerTool>
</folder>
<folder path="TestFiles/f2">
<cTool>
<incDir>
......@@ -121,10 +163,16 @@
</folder>
<item path="include/I2cBase.h" ex="false" tool="3" flavor2="0">
</item>
<item path="include/emc1072.h" ex="false" tool="3" flavor2="0">
</item>
<item path="include/linux-i2c.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/emc1072.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/linux-i2c.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/emc1072test.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="tests/linuxi2ctest.cpp" ex="false" tool="1" flavor2="0">
</item>
</conf>
......
nbproject/private/configurations.xml deleted 100644 → 0
View file @ 25384333
<?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="97">
<projectmakefile>Makefile</projectmakefile>
<confs>
<conf name="Debug" type="2">
<toolsSet>
<developmentServer>localhost</developmentServer>
<platform>2</platform>
</toolsSet>
<dbx_gdbdebugger version="1">
<gdb_pathmaps>
</gdb_pathmaps>
<gdb_interceptlist>
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
</gdb_interceptlist>
<gdb_options>
<DebugOptions>
</DebugOptions>
</gdb_options>
<gdb_buildfirst gdb_buildfirst_overriden="false" gdb_buildfirst_old="false"/>
</dbx_gdbdebugger>
<nativedebugger version="1">
<engine>gdb</engine>
</nativedebugger>
<runprofile version="9">
<runcommandpicklist>
<runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
</runcommandpicklist>
<runcommand>"${OUTPUT_PATH}"</runcommand>
<rundir></rundir>
<buildfirst>true</buildfirst>
<terminal-type>0</terminal-type>
<remove-instrumentation>0</remove-instrumentation>
<environment>
</environment>
</runprofile>
</conf>
<conf name="Release" type="2">
<toolsSet>
<developmentServer>localhost</developmentServer>
<platform>2</platform>
</toolsSet>
<dbx_gdbdebugger version="1">
<gdb_pathmaps>
</gdb_pathmaps>
<gdb_interceptlist>
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
</gdb_interceptlist>
<gdb_options>
<DebugOptions>
</DebugOptions>
</gdb_options>
<gdb_buildfirst gdb_buildfirst_overriden="false" gdb_buildfirst_old="false"/>
</dbx_gdbdebugger>
<nativedebugger version="1">
<engine>gdb</engine>
</nativedebugger>
<runprofile version="9">
<runcommandpicklist>
<runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
</runcommandpicklist>
<runcommand>"${OUTPUT_PATH}"</runcommand>
<rundir></rundir>
<buildfirst>true</buildfirst>
<terminal-type>0</terminal-type>
<remove-instrumentation>0</remove-instrumentation>
<environment>
</environment>
</runprofile>
</conf>
</confs>
</configurationDescriptor>
nbproject/private/launcher.properties deleted 100644 → 0
View file @ 25384333
# Launchers File syntax:
#
# [Must-have property line]
# launcher1.runCommand=<Run Command>
# [Optional extra properties]
# launcher1.displayName=<Display Name, runCommand by default>
# launcher1.buildCommand=<Build Command, Build Command specified in project properties by default>
# launcher1.runDir=<Run Directory, ${PROJECT_DIR} by default>
# launcher1.symbolFiles=<Symbol Files loaded by debugger, ${OUTPUT_PATH} by default>
# launcher1.env.<Environment variable KEY>=<Environment variable VALUE>
# (If this value is quoted with ` it is handled as a native command which execution result will become the value)
# [Common launcher properties]
# common.runDir=<Run Directory>
# (This value is overwritten by a launcher specific runDir value if the latter exists)
# common.env.<Environment variable KEY>=<Environment variable VALUE>
# (Environment variables from common launcher are merged with launcher specific variables)
# common.symbolFiles=<Symbol Files loaded by debugger>
# (This value is overwritten by a launcher specific symbolFiles value if the latter exists)
#
# In runDir, symbolFiles and env fields you can use these macroses:
# ${PROJECT_DIR} - project directory absolute path
# ${OUTPUT_PATH} - linker output path (relative to project directory path)
# ${OUTPUT_BASENAME}- linker output filename
# ${TESTDIR} - test files directory (relative to project directory path)
# ${OBJECTDIR} - object files directory (relative to project directory path)
<