Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 04:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed associtated in[0] failures

Browse Source
This commit is contained in:
matthew wildoer
2017-10-13 19:21:09 +11:00
parent f03f029336
commit d444770ec5
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/board/geratech_proto/board_can.h
+1 -2
View File
@@ -18,14 +18,13 @@
#ifndef _CAN_LIBRARY_
#define _CAN_LIBRARY_
#define CAN_ENABLED
//#define CAN_ENABLED
#include "../../g2core.h"
namespace libsam {
#include "pio.h"
#include "pmc.h"
}
#define DUE_CAN_MAILBOX_TX_BUFFER_SUPPORT // helper definition for handling different FlexCAN revisions
g2core/board/geratech_proto/hardware.h
+1 -2
View File
@@ -33,8 +33,7 @@
#ifndef HARDWARE_H_ONCE
#define HARDWARE_H_ONCE
#define STEP_DIR_SERVO
//#define STEP_DIR_SERVO
/*--- Hardware platform enumerations ---*/
g2core/config_app.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ const cfgItem_t cfgArray[] = {
{ "c","ctn",_fip, 3, cm_print_tn, get_flt, set_flt, (float *)&cm.a[AXIS_C].travel_min, C_TRAVEL_MIN },
{ "c","ctm",_fip, 3, cm_print_tm, get_flt, set_flt, (float *)&cm.a[AXIS_C].travel_max, C_TRAVEL_MAX },
{ "c","cjm",_fip, 0, cm_print_jm, get_flt, cm_set_jm, (float *)&cm.a[AXIS_C].jerk_max, C_JERK_MAX },
{ "c","cjh",_fip, 0, cm_print_jh, get_flt, cm_set_jh, (float *)&cm.a[AXIS_C].jerk_high, C_JERK_HIGH_SPEED },
{ "c","cjh",_fip, 0, cm_print_jh, get_flt, cm_set_jh, (float *)&cm.a[AXIS_C].jerk_high, C_JERK_HIGH_SPEED },
{ "c","cra",_fipc, 3, cm_print_ra, get_flt, set_flt, (float *)&cm.a[AXIS_C].radius, C_RADIUS },
{ "c","chi",_fip, 0, cm_print_hi, get_ui8, cm_set_hi, (float *)&cm.a[AXIS_C].homing_input, C_HOMING_INPUT },
{ "c","chd",_fip, 0, cm_print_hd, get_ui8, set_01, (float *)&cm.a[AXIS_C].homing_dir, C_HOMING_DIRECTION },
g2core/gpio.cpp
-6
View File
@@ -400,12 +400,6 @@ void can_gpio_received (int pin_num, uint8_t length, uint8_t* data) {
case 12: _vdin12.pin_changed(pin_value); break;
}
// if (d_in[0].state == INPUT_ACTIVE) {
// d_in[0].state = INPUT_INACTIVE;
// } else {
// d_in[0].state = INPUT_ACTIVE;
// }
}
#endif