Commit 5f940c99 authored by 957dd's avatar 957dd

Merge branch 'feature/add_ship0301' into 'master'

Feature/add ship0301 See merge request !59
parents 50bb868b 149174c2
cmake_minimum_required(VERSION 3.10)
project(car
VERSION 1.2.5
VERSION 1.2.7
LANGUAGES C
)
......
#define PROJECT_VERSION_MAJOR 1
#define PROJECT_VERSION_MINOR 2
#define PROJECT_VERSION_PATCH 5
#define PROJECT_VERSION_PATCH 7
#define GIT_HASH ""
#define BUILD_TIMESTAMP ""
#define BUILD_USER ""
No preview for this file type
......@@ -106,7 +106,7 @@ const gpiocontrol_t gpio_configs[] = {
{
.device_id = DEVICE_TANK0206,
.device_pin_value =public_pin_value,
.device_pwm_value =tank0203_pwm_value
.device_pwm_value =tank0206_pwm_value
},
{
.device_id = DEVICE_SHIP0301,
......@@ -319,13 +319,14 @@ void tank0206_pwm_value(int pin,int value) { //软件陪我们控制调速
if(value==1) {
if(pin == 27){
softPwmWrite(pin, 50);
softPwmWrite(26, 35);
} else {
softPwmWrite(pin, 35);
my_zlog_debug("pwm:%d",pin);
}
}else if(value==0) {
if(pin == 27) softPwmWrite(26, 0);
softPwmWrite(pin, 0);
my_zlog_debug("pwm:%d,0",pin);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment