From 2d913c2877562a00690c23163167dcd538194f58 Mon Sep 17 00:00:00 2001 From: Sameer Puri Date: Tue, 8 Jun 2021 19:19:37 -0400 Subject: [PATCH] add some more docs --- src/machine.rs | 3 +++ src/main.rs | 14 ++++++++------ src/turtle.rs | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/machine.rs b/src/machine.rs index 8724ab0..84d80ae 100644 --- a/src/machine.rs +++ b/src/machine.rs @@ -75,6 +75,7 @@ impl<'input> Machine<'input> { } } + /// Output user-defined setup gcode pub fn program_begin(&self) -> Vec> { self.program_begin_sequence .iter() @@ -82,6 +83,8 @@ impl<'input> Machine<'input> { .map(Token::from) .collect() } + + /// Output user-defined teardown gcode pub fn program_end(&self) -> Vec> { self.program_end_sequence .iter() diff --git a/src/main.rs b/src/main.rs index e29bd79..76ff48c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -76,7 +76,7 @@ fn main() -> io::Result<()> { input } None => { - info!("Reading from stdin"); + info!("Reading from standard input"); let mut input = String::new(); io::stdin().read_to_string(&mut input)?; input @@ -153,18 +153,20 @@ fn main() -> io::Result<()> { postprocess::set_origin(&mut program, lyon_geom::point(origin[0], origin[1])); if let Some(out_path) = opt.out { - tokens_into_gcode(program, File::create(out_path)?) + tokens_into_gcode_bytes(&program, File::create(out_path)?) } else { - tokens_into_gcode(program, std::io::stdout()) + tokens_into_gcode_bytes(&program, std::io::stdout()) } } +/// Convenience function for calling the g-code crate's PEG parser with user-defined g-code. fn parse_snippet(gcode: &'_ String) -> Result, ParseError> { snippet_parser(gcode) } -fn tokens_into_gcode( - program: Vec>, +/// Write GCode tokens to a byte sink in a nicely formatted manner +fn tokens_into_gcode_bytes( + program: &[g_code::emit::Token<'_>], mut w: W, ) -> io::Result<()> { use g_code::emit::Token::*; @@ -229,7 +231,7 @@ mod test { postprocess::set_origin(&mut program, lyon_geom::point(0., 0.)); let mut actual = vec![]; - assert!(tokens_into_gcode(program, &mut actual).is_ok()); + assert!(tokens_into_gcode_bytes(&program, &mut actual).is_ok()); String::from_utf8(actual).unwrap() } diff --git a/src/turtle.rs b/src/turtle.rs index 1816644..392c396 100644 --- a/src/turtle.rs +++ b/src/turtle.rs @@ -385,7 +385,7 @@ impl<'input> Turtle<'input> { let z = z.into(); let f = f.into(); - let inverse_transform = self.current_transform.inverse().unwrap(); + let inverse_transform = self.current_transform.inverse().unwrap(); let original_current_position = inverse_transform.transform_point(self.current_position); let mut to: F64Point = point(x, y); if !abs {