diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/scilab-arduino/cmd_dcmotor_release | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/scilab-arduino/cmd_dcmotor_release')
| -rw-r--r-- | src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c | 13 |
1 files changed, 0 insertions, 13 deletions
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 } } |