ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Position reporting, refactored system variables, serial print fixes, updated streaming scripts.

Browse Source 
- Added machine position reporting to status queries. This will be
further developed with part positioning/offsets and maintaining
location upon reset.

- System variables refactored into a global struct for better
readability.

- Removed old obsolete Ruby streaming scripts. These were no longer
compatible. Updated Python streaming scripts.

- Fixed printFloat() and other printing functions.

- Decreased planner buffer back to 18 blocks and increased TX serial
buffer to 64 bytes. Need the memory space for future developments.

- Begun adding run-time modes to grbl, where block delete toggle, mm/in
reporting modes, jog modes, etc can be set during runtime. Will be
fleshed out and placed into EEPROM when everything is added.
This commit is contained in:
Sonny Jeon
2012-01-06 10:10:41 -07:00
parent 03e2ca7cd5
commit e8a6bfd179
21 changed files with 396 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
print.c
View File

@ -3,6 +3,7 @@
Part of Grbl
Copyright (c) 2009-2011 Simen Svale Skogsrud
Copyright (c) 2011 Sungeun K. Jeon
Grbl is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -24,72 +25,107 @@
#include <math.h>
#include <avr/pgmspace.h>
#include "config.h"
#include "serial.h"
#ifndef DECIMAL_PLACES
#define DECIMAL_PLACES 3
#endif
void printString(const char *s)
{
while (*s)
serial_write(*s++);
while (*s)
serial_write(*s++);
}
// Print a string stored in PGM-memory
void printPgmString(const char *s)
{
char c;
while ((c = pgm_read_byte_near(s++)))
serial_write(c);
while ((c = pgm_read_byte_near(s++)))
serial_write(c);
}
void printIntegerInBase(unsigned long n, unsigned long base)
// void printIntegerInBase(unsigned long n, unsigned long base)
// {
// unsigned char buf[8 * sizeof(long)]; // Assumes 8-bit chars.
// unsigned long i = 0;
//
// if (n == 0) {
// serial_write('0');
// return;
// }
//
// while (n > 0) {
// buf[i++] = n % base;
// n /= base;
// }
//
// for (; i > 0; i--)
// serial_write(buf[i - 1] < 10 ?
// '0' + buf[i - 1] :
// 'A' + buf[i - 1] - 10);
// }
void print_uint8_base2(uint8_t n)
{
unsigned char buf[8 * sizeof(long)]; // Assumes 8-bit chars.
unsigned long i = 0;
unsigned char buf[8];
uint8_t i = 0;
if (n == 0) {
serial_write('0');
return;
}
while (n > 0) {
buf[i++] = n % base;
n /= base;
for (; i < 8; i++) {
buf[i] = n & 1;
n >>= 1;
}
for (; i > 0; i--)
serial_write(buf[i - 1] < 10 ?
'0' + buf[i - 1] :
'A' + buf[i - 1] - 10);
serial_write('0' + buf[i - 1]);
}
static void print_uint32_base10(unsigned long n)
{
unsigned char buf[32];
uint8_t i = 0;
if (n == 0) {
serial_write('0');
return;
}
while (n > 0) {
buf[i++] = n % 10;
n /= 10;
}
for (; i > 0; i--)
serial_write('0' + buf[i - 1]);
}
void printInteger(long n)
{
if (n < 0) {
serial_write('-');
n = -n;
}
printIntegerInBase(n, 10);
if (n < 0) {
serial_write('-');
n = -n;
}
print_uint32_base10(n);
}
// A very simple
void printFloat(double n)
{
double integer_part, fractional_part;
uint8_t decimal_part;
fractional_part = modf(n, &integer_part);
printInteger(integer_part);
if (n < 0) {
serial_write('-');
n = -n;
}
n += 0.5/DECIMAL_MULTIPLIER; // Add rounding factor
long integer_part;
integer_part = (int)n;
print_uint32_base10(integer_part);
serial_write('.');
fractional_part *= 10;
n -= integer_part;
int decimals = DECIMAL_PLACES;
uint8_t decimal_part;
while(decimals-- > 0) {
decimal_part = floor(fractional_part);
n *= 10;
decimal_part = (int) n;
serial_write('0'+decimal_part);
fractional_part -= decimal_part;
fractional_part *= 10;
n -= decimal_part;
}
}