Merge branch 'main' of ssh://git.sixteenmillimeter.com/16mm/filmout_display

This commit is contained in:
Matt McWilliams 2024-05-15 13:08:10 -04:00
commit cb479a2538
2 changed files with 2 additions and 2 deletions

View File

@ -39,7 +39,7 @@ State state;
uint64_t exposureTime = 0;
steady_clock::time_point startTime;
bool displaying = false;
bool completed = true;
bool completed = false;
bool timing = false;
/**

View File

@ -52,7 +52,7 @@ void State::setPosition (json& msgData) {
y = msgData["position"]["y"];
w = msgData["position"]["w"];
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) {