[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openmoko-commitlog
Subject:    commitlog Digest, Vol 940, Issue 1
From:       commitlog-request () lists ! openmoko ! org
Date:       2010-02-24 10:57:27
Message-ID: mailman.2.1267009202.18008.commitlog () lists ! openmoko ! org
[Download RAW message or body]

Send commitlog mailing list submissions to
	commitlog@lists.openmoko.org

To subscribe or unsubscribe via the World Wide Web, visit
	http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
	commitlog-request@lists.openmoko.org

You can reach the person managing the list at
	commitlog-owner@lists.openmoko.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."


Today's Topics:

   1. r5852 - in developers/werner/cncmap: align gp2rml
      (werner@docs.openmoko.org)

[Attachment #4 (multipart/digest)]


Content-Transfer-Encoding: 8bit
From: werner@docs.openmoko.org
Precedence: list
To: commitlog@lists.openmoko.org
Date: Tue, 23 Feb 2010 20:28:35 +0100
Message-ID: <E1Nk0Qt-0007Fe-6j@docs>
Content-Type: text/plain; charset=UTF-8
Subject: r5852 - in developers/werner/cncmap: align gp2rml
Message: 1

Author: werner
Date: 2010-02-23 20:28:34 +0100 (Tue, 23 Feb 2010)
New Revision: 5852

Modified:
   developers/werner/cncmap/align/align.c
   developers/werner/cncmap/gp2rml/gp2rml.c
Log:
Fix mechanism to make "align" not complain excessively. Make gp2rml reach the
first position faster.

- align/align.c (process_file): show "(more warnings)" only once, not for each
  warning
- gp2rml/gp2rml.c (output_paths): lower the speed only after lowering the head
  to the lowest safe altitude



Modified: developers/werner/cncmap/align/align.c
===================================================================
--- developers/werner/cncmap/align/align.c	2010-02-23 01:02:19 UTC (rev 5851)
+++ developers/werner/cncmap/align/align.c	2010-02-23 19:28:34 UTC (rev 5852)
@@ -139,14 +139,18 @@
 			f1 = project(rx, ry, p[0], p[1], p[2], p[3]);
 			f2 = project(rx, ry, p[0], p[1], p[4], p[5]);
 			if (f1 < 0 || f1 > 1 || f2 < 0 || f2 > 1) {
-				if (warn) {
+				if (warn > 0) {
 					fprintf(stderr,
 					    "warning: point %f %f (from %f %f)"
 					    " is outside the workpiece\n",
 					    rx, ry, x, y);
 					warn--;
 				} else {
-					fprintf(stderr, "(more warnings)\n");
+					if (!warn) {
+						fprintf(stderr,
+						    "(more warnings)\n");
+						warn--;
+					}
 				}
 			}
 			printf("%f %f", rx, ry);

Modified: developers/werner/cncmap/gp2rml/gp2rml.c
===================================================================
--- developers/werner/cncmap/gp2rml/gp2rml.c	2010-02-23 01:02:19 UTC (rev 5851)
+++ developers/werner/cncmap/gp2rml/gp2rml.c	2010-02-23 19:28:34 UTC (rev 5852)
@@ -131,8 +131,9 @@
 	double x = 0, y = 0, z = 0;
 	double d, s = 0, t = 0;
 
-	printf("IN;!MC1;PA;VS%f;!VZ%f\n", xy_speed, z_speed);
+	printf("IN;!MC1;PA\n");
 	printf("!ZO%d;!PZ0,%d;PU\n", units(z_max), units(z_clear));
+	printf("VS%f;!VZ%f\n", xy_speed, z_speed);
 
 	for (path = paths; path; path = path->next) {
 		seg = path->segments; 




--===============0284072299==--

_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog


[prev in list] [next in list] [prev in thread] [next in thread]