Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-08-20 22:14:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix motor configuration errors

Browse Source 
Fixes #17
This commit is contained in:
Rob Giseburt
2019-10-28 16:10:15 -05:00
parent 34e6cf0dd5
commit 23d2bc4159
3 changed files with 285 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/generate_dins_cfgArray.js
Executable
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/env node
// Run this with no arguments, and get the motor code suitable for use in config_app.cpp
console.log(`
// Digital input configs
// generated with \${PROJECT_ROOT}/Resources/generate_dins_cfgArray.js
`)
for (n=1; n<=12; n++) {
console.log(`
#if (D_IN_CHANNELS >= ${n})
{ "di${n}","di${n}en",_bip, 0, din_print_en, din_get_en, din_set_en, &din${n}, DI${n}_ENABLED },
{ "di${n}","di${n}po",_iip, 0, din_print_po, din_get_po, din_set_po, &din${n}, DI${n}_POLARITY },
{ "di${n}","di${n}ac",_iip, 0, din_print_ac, din_get_ac, din_set_ac, &din${n}, DI${n}_ACTION },
{ "di${n}","di${n}in",_iip, 0, din_print_in, din_get_in, din_set_in, &din${n}, DI${n}_EXTERNAL_NUMBER },
#endif`);
}
console.log(`
// END generated with \${PROJECT_ROOT}/Resources/generate_dins_cfgArray.js
`)
Resources/generate_motors_cfgArray.js
+30 -21
View File
@@ -2,39 +2,48 @@
// Run this with no arguments, and get the motor code suitable for use in config_app.cpp
console.log(`
// Motor parameters
// generated with \${PROJECT_ROOT}/Resources/generate_motors_cfgArray.js
`)
for (n=1; n<=6; n++) {
console.log(`
#if (MOTORS >= ${n})
{ "${n}","${n}ma", _fip, 0, st_print_ma, st_get_ma, st_set_ma, &st_cfg.mot[MOTOR_${n}].motor_map, M${n}_MOTOR_MAP },
{ "${n}","${n}ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, &st_cfg.mot[MOTOR_${n}].motor_map, M${n}_MOTOR_MAP },
{ "${n}","${n}sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, &st_cfg.mot[MOTOR_${n}].step_angle, M${n}_STEP_ANGLE },
{ "${n}","${n}tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, &st_cfg.mot[MOTOR_${n}].travel_rev, M${n}_TRAVEL_PER_REV },
{ "${n}","${n}su", _fipi, 5, st_print_su, st_get_su, st_set_su, &st_cfg.mot[MOTOR_${n}].steps_per_unit, M${n}_STEPS_PER_UNIT },
{ "${n}","${n}mi", _fip, 0, st_print_mi, st_get_mi, st_set_mi, &st_cfg.mot[MOTOR_${n}].microsteps, M${n}_MICROSTEPS },
{ "${n}","${n}po", _fip, 0, st_print_po, st_get_po, st_set_po, &st_cfg.mot[MOTOR_${n}].polarity, M${n}_POLARITY },
{ "${n}","${n}pm", _fip, 0, st_print_pm, st_get_pm, st_set_pm, &cs.null, M${n}_POWER_MODE },
{ "${n}","${n}mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, &st_cfg.mot[MOTOR_${n}].microsteps, M${n}_MICROSTEPS },
{ "${n}","${n}po", _iip, 0, st_print_po, st_get_po, st_set_po, &st_cfg.mot[MOTOR_${n}].polarity, M${n}_POLARITY },
{ "${n}","${n}pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, &cs.null, M${n}_POWER_MODE },
{ "${n}","${n}pl", _fip, 3, st_print_pl, st_get_pl, st_set_pl, &st_cfg.mot[MOTOR_${n}].power_level, M${n}_POWER_LEVEL },
{ "${n}","${n}ep", _iip, 0, st_print_ep, st_get_ep, st_set_ep, nullptr, M${n}_ENABLE_POLARITY },
{ "${n}","${n}sp", _iip, 0, st_print_sp, st_get_sp, st_set_sp, nullptr, M${n}_STEP_POLARITY },
// { "${n}","${n}pi", _fip, 3, st_print_pi, st_get_pi, st_set_pi, &st_cfg.mot[MOTOR_${n}].power_idle, M${n}_POWER_IDLE },
// { "${n}","${n}mt", _fip, 2, st_print_mt, st_get_mt, st_set_mt, &st_cfg.mot[MOTOR_${n}].motor_timeout, M${n}_MOTOR_TIMEOUT },
#ifdef MOTOR_${n}_IS_TRINAMIC
{ "${n}","${n}ts", _f0, 0, tx_print_nul, motor_${n}.get_ts_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}pth", _fip, 0, tx_print_nul, motor_${n}.get_pth_fn, motor_${n}.set_pth_fn, &motor_${n}, M${n}_TMC2130_TPWMTHRS },
{ "${n}","${n}cth", _fip, 0, tx_print_nul, motor_${n}.get_cth_fn, motor_${n}.set_cth_fn, &motor_${n}, M${n}_TMC2130_TCOOLTHRS },
{ "${n}","${n}hth", _fip, 0, tx_print_nul, motor_${n}.get_hth_fn, motor_${n}.set_hth_fn, &motor_${n}, M${n}_TMC2130_THIGH },
{ "${n}","${n}sgt", _fip, 0, tx_print_nul, motor_${n}.get_sgt_fn, motor_${n}.set_sgt_fn, &motor_${n}, M${n}_TMC2130_SGT },
{ "${n}","${n}sgr", _f0, 0, tx_print_nul, motor_${n}.get_sgr_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}csa", _f0, 0, tx_print_nul, motor_${n}.get_csa_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}sgs", _f0, 0, tx_print_nul, motor_${n}.get_sgs_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}tbl", _fip, 0, tx_print_nul, motor_${n}.get_tbl_fn, motor_${n}.set_tbl_fn, &motor_${n}, M${n}_TMC2130_TBL },
{ "${n}","${n}pgrd",_fip, 0, tx_print_nul, motor_${n}.get_pgrd_fn,motor_${n}.set_pgrd_fn, &motor_${n}, M${n}_TMC2130_PWM_GRAD },
{ "${n}","${n}pamp",_fip, 0, tx_print_nul, motor_${n}.get_pamp_fn,motor_${n}.set_pamp_fn, &motor_${n}, M${n}_TMC2130_PWM_AMPL },
{ "${n}","${n}hend",_fip, 0, tx_print_nul, motor_${n}.get_hend_fn,motor_${n}.set_hend_fn, &motor_${n}, M${n}_TMC2130_HEND },
{ "${n}","${n}hsrt",_fip, 0, tx_print_nul, motor_${n}.get_hsrt_fn,motor_${n}.set_hsrt_fn, &motor_${n}, M${n}_TMC2130_HSTRT },
{ "${n}","${n}smin",_fip, 0, tx_print_nul, motor_${n}.get_smin_fn,motor_${n}.set_smin_fn, &motor_${n}, M${n}_TMC2130_SMIN },
{ "${n}","${n}smax",_fip, 0, tx_print_nul, motor_${n}.get_smax_fn,motor_${n}.set_smax_fn, &motor_${n}, M${n}_TMC2130_SMAX },
{ "${n}","${n}sup", _fip, 0, tx_print_nul, motor_${n}.get_sup_fn, motor_${n}.set_sup_fn, &motor_${n}, M${n}_TMC2130_SUP },
{ "${n}","${n}sdn", _fip, 0, tx_print_nul, motor_${n}.get_sdn_fn, motor_${n}.set_sdn_fn, &motor_${n}, M${n}_TMC2130_SDN },
{ "${n}","${n}ts", _i0, 0, tx_print_nul, motor_${n}.get_ts_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}pth", _iip, 0, tx_print_nul, motor_${n}.get_pth_fn, motor_${n}.set_pth_fn, &motor_${n}, M${n}_TMC2130_TPWMTHRS },
{ "${n}","${n}cth", _iip, 0, tx_print_nul, motor_${n}.get_cth_fn, motor_${n}.set_cth_fn, &motor_${n}, M${n}_TMC2130_TCOOLTHRS },
{ "${n}","${n}hth", _iip, 0, tx_print_nul, motor_${n}.get_hth_fn, motor_${n}.set_hth_fn, &motor_${n}, M${n}_TMC2130_THIGH },
{ "${n}","${n}sgt", _iip, 0, tx_print_nul, motor_${n}.get_sgt_fn, motor_${n}.set_sgt_fn, &motor_${n}, M${n}_TMC2130_SGT },
{ "${n}","${n}sgr", _i0, 0, tx_print_nul, motor_${n}.get_sgr_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}csa", _i0, 0, tx_print_nul, motor_${n}.get_csa_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}sgs", _i0, 0, tx_print_nul, motor_${n}.get_sgs_fn, set_ro, &motor_${n}, 0 },
{ "${n}","${n}tbl", _iip, 0, tx_print_nul, motor_${n}.get_tbl_fn, motor_${n}.set_tbl_fn, &motor_${n}, M${n}_TMC2130_TBL },
{ "${n}","${n}pgrd",_iip, 0, tx_print_nul, motor_${n}.get_pgrd_fn,motor_${n}.set_pgrd_fn, &motor_${n}, M${n}_TMC2130_PWM_GRAD },
{ "${n}","${n}pamp",_iip, 0, tx_print_nul, motor_${n}.get_pamp_fn,motor_${n}.set_pamp_fn, &motor_${n}, M${n}_TMC2130_PWM_AMPL },
{ "${n}","${n}hend",_iip, 0, tx_print_nul, motor_${n}.get_hend_fn,motor_${n}.set_hend_fn, &motor_${n}, M${n}_TMC2130_HEND },
{ "${n}","${n}hsrt",_iip, 0, tx_print_nul, motor_${n}.get_hsrt_fn,motor_${n}.set_hsrt_fn, &motor_${n}, M${n}_TMC2130_HSTRT },
{ "${n}","${n}smin",_iip, 0, tx_print_nul, motor_${n}.get_smin_fn,motor_${n}.set_smin_fn, &motor_${n}, M${n}_TMC2130_SMIN },
{ "${n}","${n}smax",_iip, 0, tx_print_nul, motor_${n}.get_smax_fn,motor_${n}.set_smax_fn, &motor_${n}, M${n}_TMC2130_SMAX },
{ "${n}","${n}sup", _iip, 0, tx_print_nul, motor_${n}.get_sup_fn, motor_${n}.set_sup_fn, &motor_${n}, M${n}_TMC2130_SUP },
{ "${n}","${n}sdn", _iip, 0, tx_print_nul, motor_${n}.get_sdn_fn, motor_${n}.set_sdn_fn, &motor_${n}, M${n}_TMC2130_SDN },
#endif
#endif`);
}
console.log(`
// END generated with \${PROJECT_ROOT}/Resources/generate_motors_cfgArray.js
`)
g2core/config_app.cpp
+233 -222
View File
File diff suppressed because it is too large Load Diff