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

Fix motor su values to not persist or initialize

Browse Source
This commit is contained in:
Rob Giseburt
2020-01-10 19:25:10 -06:00
parent fb54dce364
commit f0ef5407de
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/generate_motors_cfgArray.js
+1 -1
View File
@@ -13,7 +13,7 @@ for (n=1; n<=6; n++) {
{ "${n}","${n}ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M${n}_MOTOR_MAP },
{ "${n}","${n}sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M${n}_STEP_ANGLE },
{ "${n}","${n}tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M${n}_TRAVEL_PER_REV },
{ "${n}","${n}su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M${n}_STEPS_PER_UNIT },
{ "${n}","${n}su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M${n}_STEPS_PER_UNIT },
{ "${n}","${n}mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M${n}_MICROSTEPS },
{ "${n}","${n}po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M${n}_POLARITY },
{ "${n}","${n}pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M${n}_POWER_MODE },
g2core/config_app.cpp
+6 -6
View File
@@ -234,7 +234,7 @@ const cfgItem_t cfgArray[] = {
{ "1","1ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M1_MOTOR_MAP },
{ "1","1sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M1_STEP_ANGLE },
{ "1","1tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M1_TRAVEL_PER_REV },
{ "1","1su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M1_STEPS_PER_UNIT },
{ "1","1su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M1_STEPS_PER_UNIT },
{ "1","1mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M1_MICROSTEPS },
{ "1","1po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M1_POLARITY },
{ "1","1pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M1_POWER_MODE },
@@ -268,7 +268,7 @@ const cfgItem_t cfgArray[] = {
{ "2","2ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M2_MOTOR_MAP },
{ "2","2sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M2_STEP_ANGLE },
{ "2","2tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M2_TRAVEL_PER_REV },
{ "2","2su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M2_STEPS_PER_UNIT },
{ "2","2su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M2_STEPS_PER_UNIT },
{ "2","2mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M2_MICROSTEPS },
{ "2","2po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M2_POLARITY },
{ "2","2pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M2_POWER_MODE },
@@ -302,7 +302,7 @@ const cfgItem_t cfgArray[] = {
{ "3","3ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M3_MOTOR_MAP },
{ "3","3sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M3_STEP_ANGLE },
{ "3","3tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M3_TRAVEL_PER_REV },
{ "3","3su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M3_STEPS_PER_UNIT },
{ "3","3su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M3_STEPS_PER_UNIT },
{ "3","3mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M3_MICROSTEPS },
{ "3","3po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M3_POLARITY },
{ "3","3pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M3_POWER_MODE },
@@ -336,7 +336,7 @@ const cfgItem_t cfgArray[] = {
{ "4","4ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M4_MOTOR_MAP },
{ "4","4sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M4_STEP_ANGLE },
{ "4","4tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M4_TRAVEL_PER_REV },
{ "4","4su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M4_STEPS_PER_UNIT },
{ "4","4su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M4_STEPS_PER_UNIT },
{ "4","4mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M4_MICROSTEPS },
{ "4","4po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M4_POLARITY },
{ "4","4pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M4_POWER_MODE },
@@ -370,7 +370,7 @@ const cfgItem_t cfgArray[] = {
{ "5","5ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M5_MOTOR_MAP },
{ "5","5sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M5_STEP_ANGLE },
{ "5","5tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M5_TRAVEL_PER_REV },
{ "5","5su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M5_STEPS_PER_UNIT },
{ "5","5su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M5_STEPS_PER_UNIT },
{ "5","5mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M5_MICROSTEPS },
{ "5","5po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M5_POLARITY },
{ "5","5pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M5_POWER_MODE },
@@ -404,7 +404,7 @@ const cfgItem_t cfgArray[] = {
{ "6","6ma", _iip, 0, st_print_ma, st_get_ma, st_set_ma, nullptr, M6_MOTOR_MAP },
{ "6","6sa", _fip, 3, st_print_sa, st_get_sa, st_set_sa, nullptr, M6_STEP_ANGLE },
{ "6","6tr", _fipc, 4, st_print_tr, st_get_tr, st_set_tr, nullptr, M6_TRAVEL_PER_REV },
{ "6","6su", _fipi, 5, st_print_su, st_get_su, st_set_su, nullptr, M6_STEPS_PER_UNIT },
{ "6","6su", _f0, 5, st_print_su, st_get_su, st_set_su, nullptr, M6_STEPS_PER_UNIT },
{ "6","6mi", _iip, 0, st_print_mi, st_get_mi, st_set_mi, nullptr, M6_MICROSTEPS },
{ "6","6po", _iip, 0, st_print_po, st_get_po, st_set_po, nullptr, M6_POLARITY },
{ "6","6pm", _iip, 0, st_print_pm, st_get_pm, st_set_pm, nullptr, M6_POWER_MODE },