#linuxcnc-devel Logs

Jan 21 2024

09:09 AM pcw--home: Master wont compile because: "Component name (bitmerge) does not match filename (bitsmerge)"
09:18 AM pcw--home: Not sure what the real component name should be...
09:50 AM JT-Cave: ouch
09:56 AM JT-Cave: grep can't find either one of those names in the repo
09:58 AM pcw--home: The file name was bitsmerge.comp but in component name in bitsmerge.comp was "bitmerge"
09:58 AM pcw--home: (latest master)
10:26 AM -!- #linuxcnc-devel mode set to +v by ChanServ
10:34 AM -!- #linuxcnc-devel mode set to +v by ChanServ
10:45 AM -!- #linuxcnc-devel mode set to +v by ChanServ
11:14 AM -!- #linuxcnc-devel mode set to +v by ChanServ
11:39 AM Tom_itx is now known as Tom_L
01:35 PM JT-Shop: I don't even see that file in the repo
01:38 PM pcw--home: maybe you don't have the latest master
01:58 PM JT-Shop: I was looking at the repo
01:59 PM JT-Shop: pulling here
01:59 PM JT-Shop: is it in /src/hal/components?
02:00 PM pcw--home: yes
02:01 PM pcw--home: peter@peter-HP-EliteDesk-800-G1-USDT:~/linuxcnc-dev/src/hal/components$ ls bi*
02:01 PM pcw--home: bin2gray.comp biquad.comp bitslice.comp bitsmerge.comp bitwise.comp
02:02 PM JT-Shop: I have bitslice and bitwise but not bitsmerge and I just pulled master
02:02 PM pcw--home: well that's a mystery...
02:02 PM JT-Shop: yes
02:03 PM Tom_L: http://tom-itx.no-ip.biz:81/~webpage/cnc/RTAI_TEST/RTAI_D525.png
02:03 PM Tom_L: acceptable for RTAI?
02:03 PM Tom_L: PP 7i90
02:03 PM JT-Shop: gotta go work on the chicken feeder
02:34 PM JT-Shop: pcw--home, are you sure you're on the master branch?
02:35 PM pcw--home: peter@peter-HP-EliteDesk-800-G1-USDT:~/linuxcnc-dev/src/hal/components$ git branch
02:35 PM pcw--home: 2.9
02:35 PM pcw--home: * master
02:35 PM JT-Shop: hmm
02:36 PM pcw--home: I can pull again
02:36 PM JT-Shop: john@machineshop:~/emc$ git branch
02:36 PM JT-Shop: 2.9
02:36 PM JT-Shop: * master
02:36 PM pcw--home: "already up to date"
02:36 PM JT-Shop: john@machineshop:~/emc$ git pull
02:36 PM JT-Shop: Already up to date.
02:36 PM JT-Shop: j
02:37 PM JT-Shop: brb
02:38 PM pcw--home: Well is was easily patched around by changing 1 char in the comp file but strange none the less
02:47 PM JT-Shop: yup
02:50 PM robert4: no bits?merge here https://github.com/LinuxCNC/linuxcnc/tree/master/src/hal/components
02:51 PM robert4 is now known as rmu
02:56 PM rmu: pcw--home: git log -1 should show which commit you are on
02:56 PM rmu: branch names are not part of the git history
02:58 PM JT-Shop: git log -1
02:58 PM JT-Shop: commit 8bff7e3fcff4c1e6fbec20652671d702fa548f75 (HEAD -> master, origin/master, origin/HEAD)
02:58 PM JT-Shop: Merge: aadb5974f3 ca0613539f
02:58 PM JT-Shop: Author: CMorley <chrisinnanaimo@hotmail.com>
02:58 PM JT-Shop: Date: Sat Jan 20 16:10:05 2024 -0800
02:58 PM JT-Shop: Merge branch '2.9'
02:59 PM rmu: https://github.com/LinuxCNC/linuxcnc/commit/8bff7e3fcff4c1e6fbec20652671d702fa548f75
03:00 PM rmu: 8bff7e3fcff4c1e6fbec20652671d702fa548f75 also is head of master branch on github
03:22 PM pcw--home: git log -1
03:22 PM pcw--home: commit 8bff7e3fcff4c1e6fbec20652671d702fa548f75 (HEAD -> master, origin/master, origin/HEAD)
03:22 PM pcw--home: Merge: aadb5974f3 ca0613539f
03:22 PM pcw--home: Author: CMorley <chrisinnanaimo@hotmail.com>
03:22 PM pcw--home: Date: Sat Jan 20 16:10:05 2024 -0800
03:37 PM JT-Shop: it is indeed a mystery now
03:40 PM rmu: does git status show bits?merge as new/dirty/untracked?
04:17 PM -!- #linuxcnc-devel mode set to +v by ChanServ
04:18 PM Tom_dev: i get commit 8bff7e3fcff4c1e6fbec20652671d702fa548f75 too
05:34 PM -!- #linuxcnc-devel mode set to +v by ChanServ
08:09 PM -!- #linuxcnc-devel mode set to +v by ChanServ