Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improves travis buildroot regexp #3998

Merged
merged 2 commits into from
Jun 11, 2016

Conversation

jbrazio
Copy link
Contributor

@jbrazio jbrazio commented Jun 10, 2016

Follow up #3906: The regular expressions are not working properly as most of the Travis tests are outputting the text bellow, which is a sign of options aren't being manipulated.

Sketch uses 52,456 bytes (20%) of program storage space. Maximum is 253,952 bytes.
Global variables use 2,961 bytes (36%) of dynamic memory, leaving 5,231 bytes for local variables. Maximum is 8,192 bytes.

I also took the opportunity to upgrade travis Arduino IDE version to 1.6.9.

@jbrazio jbrazio added this to the 1.1.0 milestone Jun 10, 2016
@jbrazio jbrazio force-pushed the bugfix/better-regex branch 3 times, most recently from 23acf34 to 3234d45 Compare June 10, 2016 15:18
@thinkyhead
Copy link
Member

Word boundaries, nice. I never knew about those in regular expressions.

Looks like the 1.6.9 changes aren't being taken well…

@jbrazio
Copy link
Contributor Author

jbrazio commented Jun 10, 2016

There is a known bug with ULTRA_LCD which was patched by @Blue-Marlin a few moments ago. This PR is supposed not to pass Travis because it makes that error visible.

@thinkyhead
Copy link
Member

If that is so, you can rebase this against RCBugFix, force-push, and all should be well.

@jbrazio
Copy link
Contributor Author

jbrazio commented Jun 11, 2016

$ restore_configs
The command "restore_configs" exited with 0.

$ opt_enable ULTRA_LCD
The command "opt_enable ULTRA_LCD" exited with 0.

$ build_marlin
Picked up JAVA_TOOL_OPTIONS: 
Loading configuration...
Xlib:  extension "RANDR" missing on display ":1.0".
Initializing packages...
Preparing boards...
Verifying...
sketch/ultralcd.cpp: In function 'void lcd_update()':
ultralcd.cpp:2165: error: 'manage_manual_move' was not declared in this scope
   manage_manual_move();
                      ^
exit status 1
'manage_manual_move' was not declared in this scope
The command "build_marlin" exited with 1.

#3993 and #4001

@thinkyhead
Copy link
Member

thinkyhead commented Jun 11, 2016

Strange. The manage_manual_move function is declared around line 1200, without any conditions.

EDIT: Actually, the code is just in a hard-to-see #if block. PR #4011 adjusts the indentation and wraps up more vars in the conditional.

@thinkyhead thinkyhead merged commit ddbb05f into MarlinFirmware:RCBugFix Jun 11, 2016
@jbrazio jbrazio deleted the bugfix/better-regex branch June 11, 2016 22:12
drewmoseley pushed a commit to drewmoseley/Marlin that referenced this pull request Nov 8, 2023
PFW-1479: Change Temp model to Thermal model
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants