Skip to content

Merge state at commit 15211fd4d7bad1c13c79e8cb43c1b20f45c07db1 - #4

Merged
zultron merged 407 commits into
machinekit:machinekit/masterfrom
cerna:merge-6-october-2020
Oct 6, 2020
Merged

zultron merged 407 commits into
machinekit:machinekit/masterfrom
cerna:merge-6-october-2020

Conversation

@cerna

@cerna cerna commented Oct 6, 2020

Copy link
Copy Markdown
Contributor

This pull request merges in changes from upstream LinuxCNC@master branch at commit 15211fd (the latest commit with fully passed tests at LinuxCNC's buildbot operation).

Checked locally in simulation mode on amd64.

Phillip Carter and others added 30 commits August 15, 2020 18:26
Signed-off-by: andypugh <andy@bodgesoc.org>
Inthe long run, it might be better to rethink the touch widget.
But with this I can class patch to launcg a different dialog - macro widget uses it.
This is always overly complicated for a user.
development vrs installed -I hope I got it covered.
It was just annoying. it's a little better now.
Change header to be only one word and capitalize it.
According to Lintian.


Signed-off-by: andypugh <andy@bodgesoc.org>
Signed-off-by: andypugh <andy@bodgesoc.org>
Signed-off-by: andypugh <andy@bodgesoc.org>
simpockets.tbl.orig was mistakenly identified as a result from a failed merge


Signed-off-by: andypugh <andy@bodgesoc.org>
This should be easier then reinventing the wheel each time.
I added a lathe tool change with wear remap into standard glue.
This excecises it.
Change the tool table name to something less silly.
comment the remap file so someone might figure out where the actual code is.
it' not really a haas look alike anymore.
I had removed M6 for testing with a remapped lathe screen.
I forgot to put the M6 back for regular lathe configs.
I now have fixed the remap screen t0 ignore M6.
So now even with the added M6 both type of configs will work
Signed-off-by: andypugh <andy@bodgesoc.org>
elovalvo and others added 26 commits September 23, 2020 18:50
As reported in  https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md

"As of the 4.9 kernel, all Pis report BCM2835, even those with BCM2836, BCM2837 and BCM2711 processors. You should not use this string to detect the processor. Decode the revision code using the information below, or cat /sys/firmware/devicetree/base/model"

So the get_cpuinfo_revision() function is no longer correct and above all does not work with RPi4.

Therefore, I think it is more appropriate to completely replace this function, which is now obsolete, with a simpler one that can also adapt to future models of the Raspberry.
Also it's possible to delete cpuinfo.h
Replace *get_cpuinfo_revision(char *revision)
widgetswitcher has specific requirements for layouts
that might not be obvious - this might help.
scalebase was never used -left over from pygtk.
now it's useful for outputting float and s32 HAL pins
that can be scaled.
This widget is a double spinbox with HAL output pins.
it can output pyqt signals for other widgets (like QLabel).
it can be fed an input signal that will be multiplied with the output.
It's a pain to make a panel for a quick HAL test.
this supplies 4 each of LEDs, pushbuttons, checkbuttons,
dials with scaling spinboxes.
Also launch buttons for halmeter and halscope.
I should make a way to connect pins and send HAL commands...
add a docked terminal, and use dock for the dials.
The A axis often doesn't have home switches.
If not every axes have home switches then the 'all home' button
in AXIS does not show.
Now 'All home' button will work if the A axis homes immediately in position.
Signed-off-by: andypugh <andy@bodgesoc.org>
(fix buildbot builds for rtai)

roundf() (float args) is not available for rtai
but
round()  (double args) is available

notes:
1) hal 'float' pins are actually doubles:
   ref hal.h:
       typedef double real_t __attribute__((aligned(8)));
       ...
       #define hal_float_t volatile real_t

2) mixed usage of 'variable double', 'variable float'
   declarations within file may be unecessarily complicated
   (but are handled by implicit casts)
to help with debugging user's systems during the transition to python 3
@zultron
zultron merged commit d0d1f2f into machinekit:machinekit/master Oct 6, 2020
@zultron

zultron commented Oct 6, 2020

Copy link
Copy Markdown
Contributor

Thanks, @cerna!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.