Skip to content

Commit 46a449d

Browse files
ClutchplateDudeClutchplateDude
committed
Merge branch 'master' into oam-support
2 parents 6d96e89 + b8624be commit 46a449d

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/modules/WizardStep.jsx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,9 @@ const WizardStep = (props) => {
444444
control: {
445445
type: 'radioimg',
446446
choices: [
447-
{ key: 'BY', value: 'Modded 28BYJ-48 (Bipolar)', image: '/images/byj48.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define RA_STEPPER_SPR 2048.0f // steps/rev',], condition: "$stepperlib != N" },
448-
{ key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE' },
449-
{ key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define RA_STEPPER_SPR 200.0f'] },
447+
{ key: 'BY', value: 'Modded 28BYJ-48 (Bipolar)', image: '/images/byj48.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define RA_STEPPER_SPR 2048.0f // steps/rev',], condition: "$stepperlib != N" },
448+
{ key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED' },
449+
{ key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define RA_STEPPER_SPR 200.0f'] },
450450
]
451451
},
452452
},
@@ -466,13 +466,13 @@ const WizardStep = (props) => {
466466
type: 'radioimg',
467467
choices: [
468468
{
469-
key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE',
469+
key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED',
470470
additionalLines: [
471471
'#define RA_STEPPER_SPR (400 * 9)',
472472
]
473473
},
474474
{
475-
key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE',
475+
key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED',
476476
additionalLines: [
477477
'#define RA_STEPPER_SPR (200 * 9)',
478478
]
@@ -606,24 +606,24 @@ const WizardStep = (props) => {
606606
control: {
607607
type: 'radioimg',
608608
choices: [
609-
{ key: 'BY', value: 'Modded 28BYJ-48 (Bipolar)', image: '/images/byj48.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define DEC_STEPPER_SPR 2048.0f'], condition: "($tracker == OAT) AND ($stepperlib != N)" },
610-
{ key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE', condition: "$tracker == OAT" },
611-
{ key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define DEC_STEPPER_SPR 200.0f'], condition: "$tracker == OAT" },
612-
{ key: 'N49', value: 'NEMA 14, 0.9°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLE', condition: "$tracker == OAT" },
613-
{ key: 'N48', value: 'NEMA 14, 1.8°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define DEC_STEPPER_SPR 200.0f'], condition: "$tracker == OAT" },
609+
{ key: 'BY', value: 'Modded 28BYJ-48 (Bipolar)', image: '/images/byj48.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define DEC_STEPPER_SPR 2048.0f'], condition: "($tracker == OAT) AND ($stepperlib != N)" },
610+
{ key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED', condition: "$tracker == OAT" },
611+
{ key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define DEC_STEPPER_SPR 200.0f'], condition: "$tracker == OAT" },
612+
{ key: 'N49', value: 'NEMA 14, 0.9°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLED', condition: "$tracker == OAT" },
613+
{ key: 'N48', value: 'NEMA 14, 1.8°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define DEC_STEPPER_SPR 200.0f'], condition: "$tracker == OAT" },
614614
{
615615
key: 'N9O',
616616
value: 'NEMA 17, 0.9°/step',
617617
image: '/images/nema17.png',
618-
defineValue: 'STEPPER_TYPE_ENABLE',
618+
defineValue: 'STEPPER_TYPE_ENABLED',
619619
condition: "$tracker == OAM",
620620
additionalLines: ['#define DEC_STEPPER_SPR (400 * 9)']
621621
},
622622
{
623623
key: 'N8O',
624624
value: 'NEMA 17, 1.8°/step',
625625
image: '/images/nema17.png',
626-
defineValue: 'STEPPER_TYPE_ENABLE',
626+
defineValue: 'STEPPER_TYPE_ENABLED',
627627
condition: "$tracker == OAM",
628628
additionalLines: ['#define DEC_STEPPER_SPR (200 * 9)']
629629
},
@@ -938,11 +938,11 @@ const WizardStep = (props) => {
938938
control: {
939939
type: 'radioimg',
940940
choices: [
941-
{ key: 'BY', value: 'Modded 28BYJ-48 (Bipolar)', image: '/images/byj48.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define FOCUS_STEPPER_SPR 2048.0f'] },
942-
{ key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE' },
943-
{ key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define FOCUS_STEPPER_SPR 200.0f'] },
944-
{ key: 'N49', value: 'NEMA 14, 0.9°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLE' },
945-
{ key: 'N48', value: 'NEMA 14, 1.8°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLE', additionalLines: ['#define FOCUS_STEPPER_SPR 200.0f'] },
941+
{ key: 'BY', value: 'Modded 28BYJ-48 (Bipolar)', image: '/images/byj48.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define FOCUS_STEPPER_SPR 2048.0f'] },
942+
{ key: 'N9', value: 'NEMA 17, 0.9°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED' },
943+
{ key: 'N8', value: 'NEMA 17, 1.8°/step', image: '/images/nema17.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define FOCUS_STEPPER_SPR 200.0f'] },
944+
{ key: 'N49', value: 'NEMA 14, 0.9°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLED' },
945+
{ key: 'N48', value: 'NEMA 14, 1.8°/step', image: '/images/nema14.png', defineValue: 'STEPPER_TYPE_ENABLED', additionalLines: ['#define FOCUS_STEPPER_SPR 200.0f'] },
946946
]
947947
},
948948
},

0 commit comments

Comments
 (0)