eddy/mmpp
1
0
Fork 0
mirror of https://github.com/eddyem/mmpp.git synced 2025-12-06 10:35:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/eddyem/mmpp

Browse Source
This commit is contained in:
eddyem 2018-02-12 12:10:43 +03:00
commit f78e3b4683
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMPP_control/main.c
View File

@ -69,6 +69,7 @@ int movemotor(int mcu, int motnum, int steps, const char *name){
WARNX(_("Can't get current %s position"), name); WARNX(_("Can't get current %s position"), name);
return 0; return 0;
} }
if(G->absmove){
if(curpos < 0){ // need to init if(curpos < 0){ // need to init
// check if we are on zero endswitch // check if we are on zero endswitch
int esw = mot_getesw(mcu, motnum); int esw = mot_getesw(mcu, motnum);
@ -90,7 +91,6 @@ int movemotor(int mcu, int motnum, int steps, const char *name){
return 0; return 0;
} }
} }
if(G->absmove){
if(steps < 0){ if(steps < 0){
if(motnum == 1){ if(motnum == 1){
steps += (mcu == 1) ? 36000 : 28800; // convert rotator angle to positive steps += (mcu == 1) ? 36000 : 28800; // convert rotator angle to positive

22
electronics/steppers.kicad_pcb
View File

@ -37,7 +37,7 @@
) )
(setup (setup
(last_trace_width 0.5) (last_trace_width 0.25)
(user_trace_width 0.25) (user_trace_width 0.25)
(user_trace_width 0.5) (user_trace_width 0.5)
(user_trace_width 1) (user_trace_width 1)
@ -69,9 +69,9 @@
(grid_origin 38 30) (grid_origin 38 30)
(visible_elements FFFFFF7F) (visible_elements FFFFFF7F)
(pcbplotparams (pcbplotparams
(layerselection 0x00030_80000001) (layerselection 0x000f0_80000001)
(usegerberextensions false) (usegerberextensions false)
(excludeedgelayer true) (excludeedgelayer false)
(linewidth 0.100000) (linewidth 0.100000)
(plotframeref false) (plotframeref false)
(viasonmask false) (viasonmask false)
@ -214,14 +214,14 @@
(add_net /M2_B*) (add_net /M2_B*)
) )
(module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6853F3) (tstamp 5A6E10FA) (module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6EB106) (tstamp 5A6E10FA)
(at 78.063 78.3725) (at 78.063 78.3725)
(descr "Mounting Hole 3.2mm, no annular, M3") (descr "Mounting Hole 3.2mm, no annular, M3")
(tags "mounting hole 3.2mm no annular m3") (tags "mounting hole 3.2mm no annular m3")
(fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide (fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) (fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15)) (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
@ -229,14 +229,14 @@
(pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask)) (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
) )
(module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6853EC) (tstamp 5A6E10F3) (module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6EB118) (tstamp 5A6E10F3)
(at 78.063 33.8725) (at 78.063 33.8725)
(descr "Mounting Hole 3.2mm, no annular, M3") (descr "Mounting Hole 3.2mm, no annular, M3")
(tags "mounting hole 3.2mm no annular m3") (tags "mounting hole 3.2mm no annular m3")
(fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide (fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) (fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15)) (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
@ -244,14 +244,14 @@
(pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask)) (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
) )
(module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A685400) (tstamp 5A6E106E) (module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6EB110) (tstamp 5A6E106E)
(at 42 78.5) (at 42 78.5)
(descr "Mounting Hole 3.2mm, no annular, M3") (descr "Mounting Hole 3.2mm, no annular, M3")
(tags "mounting hole 3.2mm no annular m3") (tags "mounting hole 3.2mm no annular m3")
(fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide (fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) (fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15)) (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
@ -2591,14 +2591,14 @@
) )
) )
(module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6853E2) (tstamp 5A6E105D) (module Mounting_Holes.pretty:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 5A6EB11E) (tstamp 5A6E105D)
(at 42 34) (at 42 34)
(descr "Mounting Hole 3.2mm, no annular, M3") (descr "Mounting Hole 3.2mm, no annular, M3")
(tags "mounting hole 3.2mm no annular m3") (tags "mounting hole 3.2mm no annular m3")
(fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide (fp_text reference REF** (at 0 -4.2) (layer F.SilkS) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) (fp_text value MountingHole_3.2mm_M3 (at 0 4.2) (layer F.Fab) hide
(effects (font (size 1 1) (thickness 0.15))) (effects (font (size 1 1) (thickness 0.15)))
) )
(fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15)) (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))

2
electronics/steppers.sch
View File

@ -1008,7 +1008,7 @@ PUPD
Text Notes 2600 2400 2 60 ~ 0 Text Notes 2600 2400 2 60 ~ 0
PUPD PUPD
Text Notes 3000 7450 0 79 ~ 0 Text Notes 3000 7450 0 79 ~ 0
Pins 7,8,9 and 7,8,10 of steppers' connectors\nare for Hall switches and switch buttons.\nWithout signal voltage is 3.3V through 47k pullup,\nwith Hall signal it is near 0V, \nwhen there's no Hall you can connect the input\nby button with 47k pulldown and voltage will be\nnear 1.7V. Pins 1,5,7 and 9 of steppers' connectors\nare for Hall switches and switch buttons.\nWithout signal voltage is 3.3V through 47k pullup,\nwith Hall signal it is near 0V, \nwhen there's no Hall you can connect the input\nby button with 47k pulldown and voltage will be\nnear 1.7V.
$Comp $Comp
L R R23 L R R23
U 1 1 5A21099C U 1 1 5A21099C