search

snoplus / tellie

The timing ELLIE LED calibration system
0 stars 11 forks source link

Merge underground changes into master #43

Closed mnirkko closed 6 years ago

mnirkko commented 6 years ago

I believe we should merge the UG changes (= what we are currently running TELLIE with) into the master branch, to make sure everyone is on the same page.

Looks to me like the ORCA bug (multiple "Nones") as well as a few minor issues (missing parameters etc.) are all fixed in this version.

EdLeming commented 6 years ago

Logic is sensible, however it says there are no differences between master and this branch. Perhaps they've already been synced?

mnirkko commented 6 years ago

I know, I think Mark's commit "Fix conflicts" took care of this when merging into his UGchanges branch. But it was never pushed upstream?

EdLeming commented 6 years ago

Hmmmm, all of this was done since the last commit in the snoplus/tellie repo's history. I'm not sure exactly what's going on but I'm happy to pull through.

Have you been running on the Mark--S/undergroundChanges branch for recent testing? It might be worth adding a check to the server launch code tell the user if they're not on master when launching. That should make it difficult for people to from test branches by mistake.

mnirkko commented 6 years ago

Yes, I believe the branch Mark--S/undergroundChanges has been running on SNODROP for at least a year now. Such a check may be worth writing indeed.

mnirkko commented 6 years ago

@EdLeming please merge this PR before the other one I just proposed (#44).