ABS/abscontrol Commit - r117:118 · Jicamarca Repository

imanay -

r117:118

parent child

Context file:

r117:118

trunk/absroot/source/absc/Control_Module/.cproject +5 -2

             </extensions>
             </storageModule>
             <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-            <configuration artifactName="Control_Module_v1_debug" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1568263498" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+            <configuration artifactName="tcp_Control_Module" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1568263498" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
             <folderInfo id="cdt.managedbuild.config.gnu.exe.release.1568263498." name="/" resourcePath="">
             <toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.785297601" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
             <targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1008424557" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-            <builder buildPath="${workspace_loc:/Control_Module/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.365458410" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+            <builder buildPath="${workspace_loc:/Control_Module}" id="cdt.managedbuild.target.gnu.builder.exe.release.365458410" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
             <tool id="cdt.managedbuild.tool.gnu.archiver.base.1343949145" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
             <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.57926565" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
             <option id="gnu.cpp.compiler.exe.release.option.optimization.level.35312113" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
             <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1347535566" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
             </tool>
             <tool command="arm-unknown-linux-gnu-gcc" id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1288648685" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
+            <option id="gnu.c.link.option.libs.1983512541" superClass="gnu.c.link.option.libs" valueType="libs">
+            <listOptionValue builtIn="false" value="m"/>
+            </option>
             <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.2046701530" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
             <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
             <additionalInput kind="additionalinput" paths="$(LIBS)"/>

trunk/absroot/source/absc/Control_Module/.project +1 -1

             				</dictionary>
             				<dictionary>
             					<key>org.eclipse.cdt.make.core.buildLocation</key>
-            					<value>${workspace_loc:/Control_Module/Release}</value>
+            					<value>${workspace_loc:/Control_Module}</value>
             				</dictionary>
             				<dictionary>
             					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>

trunk/absroot/source/absc/Control_Module/ServidorTCP.c +9 -2

             	//Se modifican las salidas correspondientes a la selecci�n del atenuador y calibraci�n, de acuerdo a los par�metros ingresados en la funci�n ABS_monitoreo.
-            	pio_out(pioc, mask_sel_atenuacion, sel_atenuador,1);
+            	if ( sel_atenuador == 1)
-            	pio_out(pioc, mask_sel_calibracion, sel_calibracion,1);
+            		pio_out(pioc, mask_sel_atenuacion, sel_atenuador,1);
+            	else
+            		pio_out(pioc, mask_sel_atenuacion, sel_atenuador,0);
+            	if ( sel_calibracion == 1)
+            		pio_out(pioc, mask_sel_calibracion, sel_calibracion,1);
+            	else
+            		pio_out(pioc, mask_sel_calibracion, sel_calibracion,0);
             	strcpy (fname, "/mnt/sd/archivos/absmonitoreo.txt");	//Direcci�n y nombre del archivo donde se desea guardar los datos.
             		//Se pone la salida de selecci�n de canal para seleccionar el canal 1 del detector de fase
+            //		pio_out(pioc, mask_sel_canal, 0,1);
             		pio_out(pioc, mask_sel_canal, 0,1);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages