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

Initial Draft of InMoov2 and Finite State Machine #1336

Draft
wants to merge 129 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
e07d8b0
wip webxr vertx
supertick Mar 19, 2023
29a86b3
Merge branch 'config-with-peers-and-subscriptions' of github.com:MyRo…
supertick Mar 20, 2023
2332822
cron update
supertick Jul 17, 2023
06783cb
raspi updates
supertick Jul 17, 2023
dad01bc
forgot pindefinition
supertick Jul 17, 2023
4658b20
fixed legacy write and pinmode
supertick Jul 17, 2023
4440167
in progress
supertick Jul 18, 2023
4443dc0
oscope fixes
supertick Jul 18, 2023
370e128
from grog branch
supertick Jul 18, 2023
22faefb
oscope cron and raspi improvements
supertick Jul 18, 2023
bac8ca9
ipscan image and info down to debug
supertick Jul 19, 2023
ea0ab74
adding .gitignore entries
supertick Jul 19, 2023
94534be
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Jul 19, 2023
00e9611
Merge branch 'cron-update' of github.com-myrobotlab:MyRobotLab/myrobo…
supertick Jul 19, 2023
62ad8b0
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Jul 20, 2023
f1c691c
generated pom
supertick Jul 20, 2023
bae8c3d
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Jul 20, 2023
993669c
rename
supertick Jul 22, 2023
b7ddb43
incremental
supertick Jul 22, 2023
754b978
Improved Cron and Cron history
supertick Jul 22, 2023
177c81d
Merge branch 'cron-enhanced' of github.com-myrobotlab:MyRobotLab/myro…
supertick Jul 22, 2023
a8dc963
forgot one
supertick Jul 22, 2023
c2de6bb
Merge branch 'cron-enhanced' of github.com-myrobotlab:MyRobotLab/myro…
supertick Jul 22, 2023
8791647
Teamwork fix of Hd44780
supertick Jul 23, 2023
66b42fb
Merge branch 'cron-enhanced' of github.com-myrobotlab:MyRobotLab/myro…
supertick Jul 23, 2023
f090e48
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Jul 23, 2023
ccceb78
intermediate
supertick Jul 23, 2023
24cfa91
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Jul 23, 2023
0cf9a52
initial draft
supertick Sep 3, 2023
5a55812
rich change state object
supertick Sep 3, 2023
6d60fdc
cleaned up onStateChange
supertick Sep 3, 2023
419402d
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Sep 7, 2023
5ef82fa
py4j.py a wip but other stuff worky
supertick Sep 7, 2023
832880e
gpt3 config
supertick Sep 7, 2023
3cd480c
readme update
supertick Sep 10, 2023
93ebb11
Merge branch 'vertx-webxr' of github.com-myrobotlab:MyRobotLab/myrobo…
supertick Sep 10, 2023
6355f4e
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Sep 14, 2023
13c61a6
stubbing out states
supertick Sep 20, 2023
d6e43eb
small updates
supertick Sep 20, 2023
dcae692
intermediate
supertick Sep 20, 2023
3323897
caliko
supertick Sep 20, 2023
1d3f08c
updates
supertick Sep 20, 2023
9c875a8
transfer
supertick Sep 20, 2023
36e364f
Merge branch 'inmoov-and-statemachine-1' of github.com-myrobotlab:MyR…
supertick Sep 20, 2023
cc329ac
transfer2
supertick Sep 20, 2023
a35a268
Merge branch 'transfer2' of github.com-myrobotlab:MyRobotLab/myrobotl…
supertick Sep 20, 2023
cf072b0
last of the merge problems hopefully
supertick Sep 20, 2023
d52aaa2
config specific
supertick Sep 20, 2023
4e1a487
removed cast
supertick Sep 20, 2023
5b442bd
quiet maven tests
supertick Sep 20, 2023
2e567a2
quiet gitactions tests
supertick Sep 20, 2023
167498f
updated dependency error will throw
supertick Sep 20, 2023
2acc34f
added --fail-fast to gitactions
supertick Sep 20, 2023
7e1a22d
fast-fail only
supertick Sep 20, 2023
c2b4f98
out smart goofy maven
supertick Sep 20, 2023
6b3e1af
make it quiet
supertick Sep 20, 2023
801daef
fast fail on dependencies for jenkins
supertick Sep 20, 2023
17734b1
update caliko meta
supertick Sep 20, 2023
7f6fa09
added time for thread to start
supertick Sep 21, 2023
deb94c1
removign "hack"
supertick Sep 26, 2023
b38784c
LogConfig removed copypasta
supertick Sep 26, 2023
5f00884
fixes concurrecy issues
supertick Sep 26, 2023
8d9ecdf
worky vertx
supertick Sep 29, 2023
1bd238d
Merge branch 'inmoov-and-statemachine-1' of github.com:MyRobotLab/myr…
kwatters Oct 11, 2023
ecd64cb
cleanup yolo filter, don't attach the non-serializable frame to the c…
kwatters Oct 11, 2023
7759ff5
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 12, 2023
70eae53
added deprecated onMoveX methods
supertick Oct 12, 2023
1e04982
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 12, 2023
82d4c44
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 12, 2023
a0a4002
removed old config
supertick Oct 12, 2023
23b4245
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 15, 2023
6d7c264
removed unused var, added if release cond
supertick Oct 15, 2023
0574c5c
fixed ivy
supertick Oct 15, 2023
ef2e9d0
pre release in build
supertick Oct 15, 2023
688ab9c
testing maven cache
supertick Oct 15, 2023
e8a4dbf
checking for cache improvements
supertick Oct 15, 2023
25e898b
wip
supertick Oct 16, 2023
84a0367
added correct config
supertick Oct 16, 2023
da541c4
wip
supertick Oct 16, 2023
88abadd
publishHeartbeat
hairygael Oct 17, 2023
34159fb
fixed publishHeartbeat
supertick Oct 17, 2023
e757e70
Merge branch 'inmoov-and-statemachine-1' of github.com-myrobotlab:MyR…
supertick Oct 17, 2023
7b94a64
now double ... weird
supertick Oct 17, 2023
15ca9fc
yours was better
hairygael Oct 17, 2023
5554a4e
heh ...
supertick Oct 17, 2023
5011345
readme update links
supertick Oct 17, 2023
7a5ee0a
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 17, 2023
4f47f23
Peer config utilities
supertick Oct 21, 2023
361b3e8
adding build and ignore
supertick Oct 22, 2023
2674733
start of InMoov2Test
supertick Oct 22, 2023
86eff22
Merge branch 'peer-config-utilities' of github.com-myrobotlab:MyRobot…
supertick Oct 22, 2023
2380e7b
clearing plan
supertick Oct 22, 2023
6f0372e
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 24, 2023
51efc25
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 24, 2023
7756069
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 25, 2023
8149ae6
merged master
supertick Oct 25, 2023
4b939ca
removing video handler for now
supertick Oct 25, 2023
3ebb565
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Oct 29, 2023
fc63c5a
readme update
supertick Oct 29, 2023
ec5ef4a
updated mux config apply
supertick Nov 3, 2023
29df9ee
bumping
supertick Nov 3, 2023
8b468a0
removed changes from opencv
supertick Nov 5, 2023
17462b3
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Nov 5, 2023
42c27db
Update README.html
supertick Nov 5, 2023
ac39840
Merge branch 'inmoov-and-statemachine-1' of github.com-myrobotlab:MyR…
supertick Nov 5, 2023
d050ff3
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Nov 5, 2023
3125251
merged develop
supertick Nov 5, 2023
c6a518d
merged in develop
supertick Nov 5, 2023
efe51db
synching with dev
supertick Nov 5, 2023
52381d3
more merging of develop
supertick Nov 5, 2023
b521675
random service update
supertick Nov 11, 2023
37624b4
Merge branch 'random-service-update' of github.com-myrobotlab:MyRobot…
supertick Nov 11, 2023
3d4c7e1
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Nov 14, 2023
6a8d930
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Nov 15, 2023
9431841
gpt3 prefix and websockethandler fix
supertick Nov 16, 2023
4a891ac
updates
supertick Nov 16, 2023
5eef100
Merge branch 'develop' of https://github.com/MyRobotLab/myrobotlab in…
supertick Nov 16, 2023
3966bdf
removed invoker
supertick Nov 16, 2023
40c36ba
reverting to develop branch webgui.main
supertick Nov 16, 2023
70e5a4d
reverting webgui.main
supertick Nov 16, 2023
5c3b276
a little yolo filter cleaning
supertick Nov 16, 2023
2953d72
synching with develop
supertick Nov 16, 2023
31a2c1b
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Nov 17, 2023
be14db5
Neopixel with single thread controller queu
supertick Nov 23, 2023
9ad0145
forgot this one
supertick Nov 23, 2023
01cedf0
min updates to inmoov for new neopixel
supertick Nov 23, 2023
3119798
updated log statement
supertick Nov 23, 2023
fd86c46
Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…
supertick Nov 23, 2023
bc93427
Merge branch 'neopixel-fixes' of github.com-myrobotlab:MyRobotLab/myr…
supertick Nov 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated mux config apply
  • Loading branch information
supertick committed Nov 3, 2023
commit ec5ef4abec2d1cbfa1559dc695d91d91e1e63133
21 changes: 16 additions & 5 deletions src/main/java/org/myrobotlab/service/I2cMux.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.myrobotlab.logging.LoggerFactory;
import org.myrobotlab.logging.LoggingFactory;
import org.myrobotlab.service.config.I2cMuxConfig;
import org.myrobotlab.service.config.ServiceConfig;
import org.myrobotlab.service.interfaces.I2CControl;
import org.myrobotlab.service.interfaces.I2CController;
import org.slf4j.Logger;
Expand Down Expand Up @@ -376,11 +375,23 @@ public I2cMuxConfig getConfig() {
public I2cMuxConfig apply(I2cMuxConfig c) {
super.apply(c);
// FIXME - remove all this, it should "only" be in config
deviceBus = c.bus;
deviceAddress = c.address;
i2cDevices = c.i2cDevices;
if (c.bus != null) {
setBus(c.bus);
}
if (c.address != null) {
setAddress(c.address);
}

if (c.i2cDevices != null) {
i2cDevices = c.i2cDevices;
}

if (c.controller != null) {
controllerName = c.controller;
try {
attach(controllerName);
} catch(Exception e) {
error(e);
}
}
return c;
}
Expand Down
Loading