Jim Morris [Mon, 15 Sep 2014 05:25:31 +0000 (22:25 -0700)]
Merge pull request #511 from Smoothieware/edge
merge edge into master
Jim Morris [Sun, 14 Sep 2014 07:08:27 +0000 (00:08 -0700)]
Merge pull request #509 from wolfmanjm/upstreamedge
fix panel directory navigation
Jim Morris [Sun, 14 Sep 2014 07:06:28 +0000 (00:06 -0700)]
fix panel directory navigation
Jim Morris [Sat, 13 Sep 2014 08:15:40 +0000 (01:15 -0700)]
Merge pull request #508 from wolfmanjm/fix/allow-space-in-filename-filter-panel-files
Fix/allow space in filename filter panel files
Jim Morris [Sat, 13 Sep 2014 08:05:00 +0000 (01:05 -0700)]
fix path bugs
Jim Morris [Sat, 13 Sep 2014 07:11:30 +0000 (00:11 -0700)]
refactor lc
Jim Morris [Sat, 13 Sep 2014 06:41:48 +0000 (23:41 -0700)]
filter panel filenames that have .g in them
allow spaces in filenames in play command and from panel
Jim Morris [Tue, 9 Sep 2014 21:57:05 +0000 (14:57 -0700)]
Merge pull request #506 from wolfmanjm/refactor/laser-to-be-code-compliant
refactor laser module to follow coding guidelines as it is meant to be a...
Jim Morris [Tue, 9 Sep 2014 21:55:37 +0000 (14:55 -0700)]
refactor laser module to follow coding guidelines as it is meant to be an example
Jim Morris [Sun, 7 Sep 2014 06:59:06 +0000 (23:59 -0700)]
update firmware.bin
Jim Morris [Sat, 6 Sep 2014 07:39:34 +0000 (00:39 -0700)]
Merge pull request #487 from wolfmanjm/add/probe-screen
Add a probe screen to panel
Jim Morris [Fri, 5 Sep 2014 22:39:39 +0000 (15:39 -0700)]
Have panels probe status refresh while selected
Jim Morris [Fri, 5 Sep 2014 22:07:34 +0000 (15:07 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/probe-screen
Jim Morris [Tue, 2 Sep 2014 22:39:23 +0000 (15:39 -0700)]
Merge pull request #505 from wolfmanjm/update/adjustZfnc-compensationTransform
change bed compensation to allow a transform of XYZ not just a Zoffset
Jim Morris [Tue, 2 Sep 2014 21:42:01 +0000 (14:42 -0700)]
do not hardcode maximum Zprobe distance use gamma_max*2
Jim Morris [Tue, 2 Sep 2014 20:17:34 +0000 (13:17 -0700)]
change bed compensation to allow a transform of XYZ not just a Zoffset
calculate distance travelled as 3D vector of compensated target
Jim Morris [Sat, 30 Aug 2014 20:25:40 +0000 (13:25 -0700)]
Merge pull request #504 from RepRapMorgan/SCARAlimits
Prevent undefined moves - C2 limits
Quentin Harley [Sat, 30 Aug 2014 20:11:35 +0000 (22:11 +0200)]
Prevent undefined moves - C2 limits
Jim Morris [Sat, 30 Aug 2014 13:49:32 +0000 (06:49 -0700)]
update firmware.bin
Jim Morris [Sat, 30 Aug 2014 06:40:29 +0000 (23:40 -0700)]
Merge pull request #503 from wolfmanjm/upstreamedge
make M119 return a lowercase string to keep pronterface happy
Jim Morris [Sat, 30 Aug 2014 06:39:36 +0000 (23:39 -0700)]
make M119 return a lowercase string to keep pronterface happy
Jim Morris [Fri, 29 Aug 2014 06:29:22 +0000 (23:29 -0700)]
Merge pull request #502 from hogthrob/edge
SDCard: Initial support for refreshing file list / exchange of SDCard
hogthrob [Fri, 29 Aug 2014 06:11:01 +0000 (08:11 +0200)]
Fixed tab vs. space
hogthrob [Fri, 29 Aug 2014 05:36:42 +0000 (07:36 +0200)]
Fixed tab vs. space
hogthrob [Fri, 29 Aug 2014 05:34:48 +0000 (07:34 +0200)]
Fixed tab vs. space
hogthrob [Fri, 29 Aug 2014 05:31:22 +0000 (07:31 +0200)]
Added M21 code to use remount
hogthrob [Thu, 28 Aug 2014 20:28:38 +0000 (22:28 +0200)]
Fixed indentation
hogthrob [Thu, 28 Aug 2014 20:25:59 +0000 (22:25 +0200)]
Synced changes
hogthrob [Thu, 28 Aug 2014 20:25:51 +0000 (22:25 +0200)]
Merge remote-tracking branch 'upstream/edge' into edge
Jim Morris [Thu, 28 Aug 2014 05:17:13 +0000 (22:17 -0700)]
Merge pull request #501 from Smoothieware/update/tempcontrolswitch
Update/tempcontrolswitch
Jim Morris [Thu, 28 Aug 2014 05:12:29 +0000 (22:12 -0700)]
optimize readonly
update configs
Jim Morris [Wed, 27 Aug 2014 06:14:23 +0000 (23:14 -0700)]
some comments
Jim Morris [Wed, 27 Aug 2014 05:32:54 +0000 (22:32 -0700)]
rename the temperature switch config entrythat specifies the switch to use, this avoids the confusion
it is backwards comptible
Jim Morris [Wed, 27 Aug 2014 05:05:56 +0000 (22:05 -0700)]
allow readonly temperatire sensors, set by output pin set to nc
Jim Morris [Wed, 27 Aug 2014 04:45:48 +0000 (21:45 -0700)]
allow different emperature switch instances controlling different switches and reading different temperatures
Jim Morris [Wed, 27 Aug 2014 00:35:58 +0000 (17:35 -0700)]
some more optimizations
Jim Morris [Wed, 27 Aug 2014 00:29:02 +0000 (17:29 -0700)]
make class smaller by using 16bit ints not 32bit
don't need to test designator twice
store switch checksum not string
Jim Morris [Mon, 25 Aug 2014 09:40:07 +0000 (02:40 -0700)]
Merge pull request #499 from hogthrob/edge
Change win32 git branch extraction to use same approach as generate-version.sh
hogthrob [Mon, 25 Aug 2014 09:11:51 +0000 (11:11 +0200)]
Merge remote-tracking branch 'upstream/edge' into edge
hogthrob [Mon, 25 Aug 2014 09:05:35 +0000 (11:05 +0200)]
Approach to generate branch name for version string now identical to linux/macos_x approach
hogthrob [Mon, 25 Aug 2014 08:58:59 +0000 (10:58 +0200)]
Approach to generate branch name for version string now identical to linux/macos_x approach
Jim Morris [Mon, 25 Aug 2014 08:36:55 +0000 (01:36 -0700)]
Merge pull request #498 from hogthrob/edge
Added support for Win32 git version string generation
hogthrob [Mon, 25 Aug 2014 07:40:59 +0000 (09:40 +0200)]
Added support for Win32 git version string generation
hogthrob [Mon, 25 Aug 2014 07:38:08 +0000 (09:38 +0200)]
Added support for Win32 git version string generation
Jim Morris [Sat, 23 Aug 2014 05:21:03 +0000 (22:21 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/probe-screen
Jim Morris [Sat, 23 Aug 2014 04:41:42 +0000 (21:41 -0700)]
Update README.creole
revert addition that installs a different compiler.
Jim Morris [Sat, 23 Aug 2014 00:32:58 +0000 (17:32 -0700)]
Update README.creole
Jim Morris [Sat, 23 Aug 2014 07:31:59 +0000 (00:31 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Sat, 23 Aug 2014 07:31:30 +0000 (00:31 -0700)]
update firnware.bin and checksum
Jim Morris [Sat, 23 Aug 2014 00:19:59 +0000 (17:19 -0700)]
Merge pull request #494 from bfoz/patch-1
Added install instructions for Homebrew users
Brandon Fosdick [Sat, 23 Aug 2014 00:18:42 +0000 (17:18 -0700)]
Added install instructions for Homebrew users
Mac OS X users of Homebrew can install gcc-arm-embedded from a Formula
Jim Morris [Wed, 20 Aug 2014 19:21:11 +0000 (12:21 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/probe-screen
Jim Morris [Wed, 20 Aug 2014 19:19:23 +0000 (12:19 -0700)]
Merge pull request #491 from soldierkam/edge
DHCP option 12 support (hostname)
soldierkam [Wed, 20 Aug 2014 19:14:32 +0000 (21:14 +0200)]
Merge remote-tracking branch 'upstream/master' into edge
Conflicts:
FirmwareBin/firmware.bin
soldierkam [Wed, 20 Aug 2014 18:48:52 +0000 (20:48 +0200)]
DHCP option 12 support (hostname)
Jim Morris [Tue, 19 Aug 2014 23:15:45 +0000 (16:15 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/probe-screen
Jim Morris [Tue, 19 Aug 2014 23:14:11 +0000 (16:14 -0700)]
Merge pull request #490 from wolfmanjm/upstreamedge
Fix switch state sio it is false if PWM switch and S0
Jim Morris [Tue, 19 Aug 2014 23:08:10 +0000 (16:08 -0700)]
Fix switch state sio it is false if PWM switch and S0
Jim Morris [Tue, 19 Aug 2014 21:05:14 +0000 (14:05 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/probe-screen
Jim Morris [Tue, 19 Aug 2014 11:35:34 +0000 (04:35 -0700)]
Merge pull request #489 from wolfmanjm/upstreamedge
Half hearted attempt at implementing M112 ESTOP
Jim Morris [Tue, 19 Aug 2014 11:32:22 +0000 (04:32 -0700)]
Half hearted attempt at implementing M112 ESTOP
Jim Morris [Thu, 14 Aug 2014 05:34:21 +0000 (22:34 -0700)]
Add a probe screen to panel
shows endstops and probe status and initiates and display a G30 probe
Jim Morris [Thu, 14 Aug 2014 01:01:24 +0000 (18:01 -0700)]
Merge pull request #486 from wolfmanjm/optimize/optionally-load-extruder-menu
Optimize/optionally load extruder menu
Jim Morris [Thu, 14 Aug 2014 00:57:46 +0000 (17:57 -0700)]
don't disdplay tmperatures on panel if no heaters
Jim Morris [Thu, 14 Aug 2014 00:39:25 +0000 (17:39 -0700)]
If no heaters presume no extruders and do not create extruder menu or temperature relted panel menu items
Jim Morris [Wed, 13 Aug 2014 21:21:38 +0000 (14:21 -0700)]
Merge pull request #485 from wolfmanjm/upstreamedge
make dtor virtual
Jim Morris [Wed, 13 Aug 2014 15:22:31 +0000 (08:22 -0700)]
make dtor virtual
Jim Morris [Wed, 13 Aug 2014 07:25:28 +0000 (00:25 -0700)]
Merge pull request #484 from wolfmanjm/features/add-on-exit-to-menus
add on_exit to panelscreen
Jim Morris [Wed, 13 Aug 2014 07:19:07 +0000 (00:19 -0700)]
add on_exit to panelscreen
have Configuration menu delete itself on exit (saves tons of memory)
have Extruder settings menu delete itself on exit
clean up header includes in headers for panel screens
Jim Morris [Wed, 13 Aug 2014 00:43:01 +0000 (17:43 -0700)]
Merge pull request #483 from wolfmanjm/features/add-E-acceleration-setting-add-to-panel
Added M204 Ennn to set extruder solo acceleration
Jim Morris [Wed, 13 Aug 2014 00:38:51 +0000 (17:38 -0700)]
Added M204 Ennn to set extruder solo acceleration
Added flow rate and aextruder acceleration to panel menu
added firmware retract length to panel
Jim Morris [Tue, 12 Aug 2014 16:21:47 +0000 (09:21 -0700)]
Merge pull request #482 from stth1998/fix/menu_mem_savings_cleaned
Squashed commit from branch fix/menu_mem_savings
stth1998 [Tue, 12 Aug 2014 15:44:11 +0000 (17:44 +0200)]
Squashed commit of the following:
commit
4eabd88eb9c53dbf45bb43b965be6c7e2d90a980
Author: stth1998 <stth1998@web.de>
Date: Mon Aug 11 23:06:18 2014 +0200
addition to commit
bfdf666
changed:
src/modules/utils/panel/screens/PrepareScreen.cpp
added initialization
commit
ed824b1ad8f8532fadeace04824097a27045a473
Author: stth1998 <stth1998@web.de>
Date: Mon Aug 11 23:01:52 2014 +0200
addition to commit
9e0f582
changed:
src/modules/utils/panel/screens/CustomScreen.cpp
initialization added
commit
9e04fe38da0fecbf8ef5373e28e179cab9e0f582
Author: stth1998 <stth1998@web.de>
Date: Mon Aug 11 20:55:26 2014 +0200
avoiding multiple string creation #2
changed:
src/modules/utils/panel/screens/CustomScreen.cpp
src/modules/utils/panel/screens/CustomScreen.h
std::string is 8 Bytes + heap allocations if set <-> const char * is 4 bytes + reused c string
in line 83 in CustomScreen.cpp there is always a const char * string pointer assigend
They do not need to be put into a string if the string's c_str() (const char*) is passed to send_command.
the assigned ptr is sufficient, too.
saves 4 bytes RAM (heap) (all the time) + strlen+1+padding bytes RAM (heap) (temporarily)
also saves time for allocation and deallocation
commit
bfdf666dc0b94e61f19e511284ba9dbba64ea7c3
Author: stth1998 <stth1998@web.de>
Date: Mon Aug 11 20:50:54 2014 +0200
avoiding multiple string creation #1
changed:
src/modules/utils/panel/screens/PrepareScreen.cpp
src/modules/utils/panel/screens/PrepareScreen.h
std::string is 8 Bytes + heap allocations if set <-> const char * is 4 bytes + reuse of c string literal
command is only assigned in line 67 to 73 in PrepareScreen.cpp there are const char [] string literals assigend only.
They do not need to be put into a string, if the string's c_str() (const char*) is passed to send_command.
the assigned literal is sufficient, too.
saves 4 bytes of RAM (heap) (all the time) + strlen+1+padding bytes RAM (heap) (temporarily)
also saves time for allocation and deallocation when a command is executed
commit
ba02d5f9c9b162e6dc58c7dae8983f1ec03769b2
Author: stth1998 <stth1998@web.de>
Date: Mon Aug 11 19:19:29 2014 +0200
respect memory alignment in class ControlScreen
changed:
src/modules/utils/panel/screens/ControlScreen.h
putting the bool in one block with the two chars saves 4 bytes of RAM per instance due to memory alignment
Jim Morris [Tue, 12 Aug 2014 06:13:17 +0000 (23:13 -0700)]
Merge pull request #481 from wolfmanjm/cleanup/unused-i2c-panels
Cleanup/unused i2c panels
Jim Morris [Tue, 12 Aug 2014 06:10:26 +0000 (23:10 -0700)]
remove unused I2C based panels
Jim Morris [Tue, 12 Aug 2014 06:00:25 +0000 (23:00 -0700)]
make private
Jim Morris [Tue, 12 Aug 2014 00:07:46 +0000 (17:07 -0700)]
Merge pull request #480 from wolfmanjm/upstreamedge
Add implementation for addMenuItem
Jim Morris [Tue, 12 Aug 2014 00:06:32 +0000 (17:06 -0700)]
Add implementation for addMenuItem
Jim Morris [Mon, 11 Aug 2014 05:29:24 +0000 (22:29 -0700)]
Merge pull request #478 from wolfmanjm/upstreamedge
enable adjust z function when restoring three point leveling plane
Jim Morris [Mon, 11 Aug 2014 05:11:43 +0000 (22:11 -0700)]
enable adjust z function when restoring three point leveling plane
Jim Morris [Sun, 10 Aug 2014 06:09:22 +0000 (23:09 -0700)]
updated firmware.bin
Jim Morris [Sat, 9 Aug 2014 22:55:43 +0000 (15:55 -0700)]
Merge pull request #477 from wolfmanjm/update/add-on-halt
add ON_HALT event
Jim Morris [Sat, 9 Aug 2014 22:36:06 +0000 (15:36 -0700)]
add ON_HALT event
turn off heaters and motors in on_halt()
call ON_HALT when a limit switch is hit
Jim Morris [Fri, 8 Aug 2014 21:36:28 +0000 (14:36 -0700)]
Merge pull request #476 from wolfmanjm/upstreamedge
Add M221 extruder flow rate multiplier closes #448
Jim Morris [Fri, 8 Aug 2014 21:33:43 +0000 (14:33 -0700)]
Add M221 extruder flow rate multiplier closes #448
Jim Morris [Fri, 8 Aug 2014 05:22:32 +0000 (22:22 -0700)]
Merge pull request #475 from wolfmanjm/feature/homing-move-to-zero-option
Feature/homing move to zero option
Jim Morris [Thu, 7 Aug 2014 23:56:38 +0000 (16:56 -0700)]
rename states
rename move to origin
Jim Morris [Thu, 7 Aug 2014 23:51:46 +0000 (16:51 -0700)]
fix speed/acceleration, only accelerate when doing the homing moves
Jim Morris [Thu, 7 Aug 2014 23:31:03 +0000 (16:31 -0700)]
add a move to zero 0,0 option after homing
Jim Morris [Thu, 7 Aug 2014 22:55:57 +0000 (15:55 -0700)]
Merge pull request #474 from wolfmanjm/refactor/predefined-thermistor-settings
make a flash based list of predefined thermistors, in a header file
Jim Morris [Thu, 7 Aug 2014 22:55:19 +0000 (15:55 -0700)]
whitespace change
Jim Morris [Thu, 7 Aug 2014 02:25:00 +0000 (19:25 -0700)]
make a flash based list of predefined thermistors, in a header file
iterate over that list to find one.
Jim Morris [Wed, 6 Aug 2014 04:10:06 +0000 (21:10 -0700)]
Merge pull request #473 from wolfmanjm/refactor/planner-block-memory
planner is no longer a module
Jim Morris [Wed, 6 Aug 2014 03:52:37 +0000 (20:52 -0700)]
planner is no longer a module
save some memory in block and planner
removed unused fields
Jim Morris [Tue, 5 Aug 2014 22:33:11 +0000 (15:33 -0700)]
Merge pull request #472 from wolfmanjm/add/z-only-move-acceleration
Use Z acceleration for Z only moves, default is off
Added z acceleration to configs
Jim Morris [Tue, 5 Aug 2014 22:29:08 +0000 (15:29 -0700)]
Added z acceleration to configs
Endstop/Homing and Zprobe will use Z acceleration for Z if set
Jim Morris [Tue, 5 Aug 2014 07:11:17 +0000 (00:11 -0700)]
Merge pull request #471 from wolfmanjm/feature/three-point-bed-levelling-strategy
Feature/three point bed levelling strategy
Jim Morris [Mon, 4 Aug 2014 00:24:57 +0000 (17:24 -0700)]
M503 will inform user if bed plane will be saved
Jim Morris [Mon, 4 Aug 2014 00:13:05 +0000 (17:13 -0700)]
add ability to save the bed plane with M500 and config setting to enable that
Jim Morris [Sun, 3 Aug 2014 23:26:13 +0000 (16:26 -0700)]
add docs