master
Jessy Diamond Exum 2017-07-10 18:38:58 -07:00
parent e5b524eddc
commit 191f67b083
5 changed files with 3 additions and 6 deletions

View File

@ -36,4 +36,3 @@ uint32_t adc_get(int channel) {
return ADC1->JDR1;
}

View File

@ -77,4 +77,3 @@ good:
((void(*)()) _app_start[1])();
return 0;
}

View File

@ -148,7 +148,7 @@ void can_init(uint8_t canid) {
} else {
for (i = 0; i < CAN_MAX; i++)
if (can_ports[i].gmlan)
break;
break;
if (i == CAN_MAX){
set_gpio_output(GPIOB, 14, 0);
set_gpio_output(GPIOB, 15, 0);
@ -268,7 +268,7 @@ void set_can_mode(int canid, int use_gmlan) {
if (use_gmlan)
for (i = 0; i < CAN_MAX; i++)
if (can_ports[i].gmlan)
set_can_mode(i, 0);
set_can_mode(i, 0);
if (!can_ports[canid].gmlan_support) use_gmlan = 0;
can_ports[canid].gmlan = use_gmlan;

View File

@ -27,7 +27,7 @@ extern can_ring can_rx_q;
// ********************* port description types *********************
#define CAN_PORT_DESC_INITIALIZER \
.forwarding=-1, \
.forwarding=-1, \
.bitrate=CAN_DEFAULT_BITRATE, \
.bitrate=CAN_DEFAULT_BITRATE, \
.gmlan=false, \

View File

@ -13,4 +13,3 @@ void dac_set(int channel, uint32_t value) {
DAC->DHR12R2 = value;
}
}