From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/c/scilab-arduino/cmd_analog_out_volt')

diff --git a/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c b/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c
index 19a73fcf..2dd82e41 100644
--- a/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c
+++ b/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c
@@ -15,14 +15,8 @@
 
 void u8cmd_analog_out_volts(uint8 board_no, uint8 pin, float value)
 {	
-<<<<<<< HEAD
     int a;
     a = ((value*255)/5);
     analogWrite(pin,a);
-=======
-    int a;			//declaring variable 
-    a = ((value*255)/5);	//converting given voltage to duty cycle value (0 - 255)
-    analogWrite(pin,a);		//passing pin no. and duty cycle value
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
     
 }
-- 
cgit