diff options
Diffstat (limited to 'src/c/scilab-arduino')
19 files changed, 0 insertions, 270 deletions
diff --git a/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c b/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c index 27f63c7..7018df2 100644 --- a/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c +++ b/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c @@ -15,13 +15,8 @@ float u8cmd_analog_in_volts(uint8 board_no, uint8 pin) { -<<<<<<< HEAD float a; a = ((5*(float)analogRead(pin))/1023); -======= - float a; //declaration of variable - a = ((5*(float)analogRead(pin))/1023); //recieved 10 bit input from analog pin is convert to voltage(0 - 50 ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 return(a); } 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 19a73fc..2dd82e4 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 } diff --git a/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c b/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c index a228303..349bcb1 100644 --- a/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c +++ b/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c @@ -15,7 +15,6 @@ void u8cmd_dcmotor_releases(uint8 board_no, uint8 motor_no) { -<<<<<<< HEAD if (dcm_mode[motor_no] == 3) { analogWrite(dcm_pin_1[motor_no],0); @@ -26,17 +25,5 @@ void u8cmd_dcmotor_releases(uint8 board_no, uint8 motor_no) { digitalWrite(dcm_pin_1[motor_no],LOW); digitalWrite(dcm_pin_2[motor_no],LOW); -======= - if (dcm_mode[motor_no] == 3) //for IC accepting analog value - { - analogWrite(dcm_pin_1[motor_no],0); //passing LOW to IC pins to stop the motor - analogWrite(dcm_pin_2[motor_no],0); - } - - else //for IC accepting digital value - { - digitalWrite(dcm_pin_1[motor_no],LOW); - digitalWrite(dcm_pin_2[motor_no],LOW); //passing LOW to IC pins to stop the motor ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } } diff --git a/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp b/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp index 2ba4d39..adc1a6e 100644 --- a/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp +++ b/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp @@ -1,34 +1,10 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -//This function establishes I2C communication between arduino and given device - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_dev.h" #include "Arduino.h" #include "Wire.h" -<<<<<<< HEAD uint8 u8cmd_i2c_devs(uint8 address) { Wire.begin(); return((uint8)address); -======= -uint8 u8cmd_i2c_devs(uint8 address) -{ - Wire.begin(); //To initiate connection - return((uint8)address); //Returns address to create a device object ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } diff --git a/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp b/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp index 78ef0ce..8f02a87 100644 --- a/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp +++ b/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp @@ -1,20 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -//This function reads data from I2C bus. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_read.h" #include "Arduino.h" #include "Wire.h" diff --git a/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp b/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp index 6b54159..0a2ec2e 100644 --- a/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp +++ b/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp @@ -1,20 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -//this function reads data from the device register with given address ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_read_register.h" #include "Arduino.h" #include "Wire.h" diff --git a/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp b/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp index 788fd08..0239097 100644 --- a/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp +++ b/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp @@ -1,19 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -//This function writes data to the connected device ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_write.h" #include "Arduino.h" #include "Wire.h" diff --git a/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp b/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp index f10dd97..63cc7c7 100644 --- a/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp +++ b/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp @@ -1,20 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -//This function writes to the register of the device ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_write_register.h" #include "Arduino.h" #include "Wire.h" diff --git a/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/src/c/scilab-arduino/default_files/sci2c_arduino.ino index 5d5d101..df28950 100644 --- a/src/c/scilab-arduino/default_files/sci2c_arduino.ino +++ b/src/c/scilab-arduino/default_files/sci2c_arduino.ino @@ -11,13 +11,8 @@ */ #include "Arduino.h" -<<<<<<< HEAD #include <loop_arduino.h> #include <setup_arduino.h> -======= -#include "loop_arduino.h" -#include "setup_arduino.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 void setup() { diff --git a/src/c/scilab-arduino/includes/cmd_i2c_dev.h b/src/c/scilab-arduino/includes/cmd_i2c_dev.h index 85d154a..861a8e7 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_dev.h +++ b/src/c/scilab-arduino/includes/cmd_i2c_dev.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_DEV_H__ #define __CMD_I2C_DEV_H__ diff --git a/src/c/scilab-arduino/includes/cmd_i2c_read.h b/src/c/scilab-arduino/includes/cmd_i2c_read.h index e49abcd..791bdd3 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_read.h +++ b/src/c/scilab-arduino/includes/cmd_i2c_read.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_READ_H__ #define __CMD_I2C_READ_H__ diff --git a/src/c/scilab-arduino/includes/cmd_i2c_read_register.h b/src/c/scilab-arduino/includes/cmd_i2c_read_register.h index 1b3a3cf..ea203ad 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_read_register.h +++ b/src/c/scilab-arduino/includes/cmd_i2c_read_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_READ_REGISTER_H__ #define __CMD_I2C_READ_REGISTER_H__ diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write.h b/src/c/scilab-arduino/includes/cmd_i2c_write.h index 58667c7..6a57222 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_write.h +++ b/src/c/scilab-arduino/includes/cmd_i2c_write.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_WRITE_H__ #define __CMD_I2C_WRITE_H__ diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write_register.h b/src/c/scilab-arduino/includes/cmd_i2c_write_register.h index bf8e788..ff1b9ec 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_write_register.h +++ b/src/c/scilab-arduino/includes/cmd_i2c_write_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_WRITE_REGISTER_H__ #define __CMD_I2C_WRITE_REGISTER_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h index c1de1b7..c4d93d7 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_DEV_H__ #define __INT_CMD_I2C_DEV_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h index ef11426..b0633a0 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_READ_H__ #define __INT_CMD_I2C_READ_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h index c2cdc65..5f4c529 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_READ_REGISTER_H__ #define __INT_CMD_I2C_READ_REGISTER_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h index 23474a7..a7705a8 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_WRITE_H__ #define __INT_CMD_I2C_WRITE_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h index e385b3f..35c0527 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_WRITE_REGISTER_H__ #define __INT_CMD_I2C_WRITE_REGISTER_H__ |