Merge branch 'main' of ssh://git.sixteenmillimeter.com/16mm/filmout_display
This commit is contained in:
commit
cb479a2538
|
@ -39,7 +39,7 @@ State state;
|
||||||
uint64_t exposureTime = 0;
|
uint64_t exposureTime = 0;
|
||||||
steady_clock::time_point startTime;
|
steady_clock::time_point startTime;
|
||||||
bool displaying = false;
|
bool displaying = false;
|
||||||
bool completed = true;
|
bool completed = false;
|
||||||
bool timing = false;
|
bool timing = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -52,7 +52,7 @@ void State::setPosition (json& msgData) {
|
||||||
y = msgData["position"]["y"];
|
y = msgData["position"]["y"];
|
||||||
w = msgData["position"]["w"];
|
w = msgData["position"]["w"];
|
||||||
h = msgData["position"]["h"];
|
h = msgData["position"]["h"];
|
||||||
cout << "{ \"position\" : { \"x\" : " << x << ", \"y\" : " << y << ", \"w\" : " << w << ", \"h\" : " << h << " }" << endl;
|
cout << "{ \"position\" : { \"x\" : " << x << ", \"y\" : " << y << ", \"w\" : " << w << ", \"h\" : " << h << " } }" << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void State::setExposure (json& msgData) {
|
void State::setExposure (json& msgData) {
|
||||||
|
|
Loading…
Reference in New Issue