Toby Harris
The codebase to run the *spark d-fuser controller www.sparkav.co.uk/dvimixer
Dependencies: SPK-TVOne DMX DmxArtNet NetServicesMin OSC PinDetect mRotaryEncoder iniparser mbed spk_oled_ssd1305 filter
Revision 57:14d37904c889, committed 2013-05-12
- Comitter:
- tobyspark
- Date:
- Sun May 12 18:38:47 2013 +0000
- Parent:
- 56:d6f77bd54e10
- Child:
- 58:54347f2c3184
- Commit message:
- UX around EDID changing (and detecting that, and enqueueing the messages)
Changed in this revision
--- a/SPK-TVOne.lib Sun May 12 15:56:00 2013 +0000 +++ b/SPK-TVOne.lib Sun May 12 18:38:47 2013 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/tobyspark/code/SPK-TVOne/#ebddf3ddb1f6 +http://mbed.org/users/tobyspark/code/SPK-TVOne/#2260dde18dfa
--- a/main.cpp Sun May 12 15:56:00 2013 +0000
+++ b/main.cpp Sun May 12 18:38:47 2013 +0000
@@ -849,28 +849,15 @@
void troubleshootingMenuEDIDHandler(int change, bool action)
{
static int currentEDIDPassthrough;
+ static int currentEDID;
static int state = 0;
-
+
if (change == 0 && !action)
{
- int32_t payload1 = -1;
- tvOne.readCommand(kTV1SourceRGB1, kTV1WindowIDA, kTV1FunctionAdjustSourceEDID, payload1);
-
- int32_t payload2 = -1;
- tvOne.readCommand(kTV1SourceRGB2, kTV1WindowIDA, kTV1FunctionAdjustSourceEDID, payload2);
+ currentEDID = tvOne.getEDID();
- if ((payload1 == payload2) && (payload2 == EDIDPassthroughSlot))
- {
- currentEDIDPassthrough = 1;
- }
- else if ((payload1 == payload2) && (payload2 != EDIDPassthroughSlot))
- {
- currentEDIDPassthrough = 0;
- }
- else
- {
- currentEDIDPassthrough = -1;
- }
+ if (currentEDID == -1) currentEDIDPassthrough = -1;
+ else currentEDIDPassthrough = (currentEDID == EDIDPassthroughSlot) ? 1 : 0;
}
state += change;
@@ -898,18 +885,25 @@
tvOneEDIDPassthrough = currentEDIDPassthrough == 0;
bool ok = true;
+ std::string message;
- int32_t slot = tvOneEDIDPassthrough ? EDIDPassthroughSlot : resolutionMenu.selectedItem().payload.command[1];
+ int newEDID = tvOneEDIDPassthrough ? EDIDPassthroughSlot : resolutionMenu.selectedItem().payload.command[1];
+
+ if (newEDID != currentEDID)
+ {
+ ok = ok && tvOne.command(kTV1SourceRGB1, kTV1WindowIDA, kTV1FunctionAdjustSourceEDID, newEDID);
+ ok = ok && tvOne.command(kTV1SourceRGB2, kTV1WindowIDA, kTV1FunctionAdjustSourceEDID, newEDID);
+ if (ok) message = "Sent: EDID";
+ else message = "Send Error: EDID";
+ }
+ else message = "EDID already set";
- ok = ok && tvOne.command(kTV1SourceRGB1, kTV1WindowIDA, kTV1FunctionAdjustSourceEDID, slot);
- ok = ok && tvOne.command(kTV1SourceRGB2, kTV1WindowIDA, kTV1FunctionAdjustSourceEDID, slot);
-
if (ok) tvOne.command(0, kTV1WindowIDA, kTV1FunctionPowerOnPresetStore, 1);
- std::string sendOK = ok ? "Sent: EDID " : "Send Error: EDID ";
- sendOK += tvOneEDIDPassthrough ? "Passthrough" : "Internal";
+ tvOneStatusMessage.addMessage(message, kTVOneStatusMessageHoldTime);
- tvOneStatusMessage.addMessage(sendOK, kTVOneStatusMessageHoldTime);
+ // This is WHACK. Can't believe it's both needed and officially in the 1T-C2-750 manual
+ if ((newEDID != currentEDID) && ok) tvOneStatusMessage.addMessage("EDID: Processor Off+On?", kTVOneStatusMessageHoldTime);
}
// Get back to menu
@@ -1580,21 +1574,25 @@
screen.sendBuffer();
bool ok;
- int32_t slot = tvOneEDIDPassthrough ? EDIDPassthroughSlot : resolutionMenu.selectedItem().payload.command[1];
+ int oldEDID = tvOne.getEDID();
+ int newEDID = tvOneEDIDPassthrough ? EDIDPassthroughSlot : resolutionMenu.selectedItem().payload.command[1];
- ok = tvOne.setResolution(resolutionMenu.selectedItem().payload.command[0], slot);
+ ok = tvOne.setResolution(resolutionMenu.selectedItem().payload.command[0], newEDID);
// Save new resolution and EDID into TV One unit for power-on. Cycling TV One power sometimes needed for EDID. Pffft.
if (ok) tvOne.command(0, kTV1WindowIDA, kTV1FunctionPowerOnPresetStore, 1);
- string sentOK;
- if (ok) sentOK = "Sent: ";
- else sentOK = "Send Error: ";
+ string message;
+ if (ok)
+ {
+ if (oldEDID == newEDID) message = "Sent: Resolution";
+ else message = "Sent: Resolution + EDID";
+ }
+ else message = "Send Error: Resolution";
+ tvOneStatusMessage.addMessage(message, kTVOneStatusMessageHoldTime);
- char sentMSGBuffer[kStringBufferLength];
- snprintf(sentMSGBuffer, kStringBufferLength,"Res %i, EDID %i", resolutionMenu.selectedItem().payload.command[0], resolutionMenu.selectedItem().payload.command[1]);
-
- tvOneStatusMessage.addMessage(sentOK + sentMSGBuffer, kTVOneStatusMessageHoldTime);
+ // This is WHACK. Can't believe it's both needed and officially in the 1T-C2-750 manual
+ if ((oldEDID != newEDID) && ok) tvOneStatusMessage.addMessage("EDID: Processor Off+On?", kTVOneStatusMessageHoldTime);
if (debug) { debug->printf("Changing resolution"); }
}
--- a/spk_utils.h Sun May 12 15:56:00 2013 +0000
+++ b/spk_utils.h Sun May 12 18:38:47 2013 +0000
@@ -6,6 +6,7 @@
#include <string>
#include <vector>
+#include <queue>
class SPKIndexInRange {
public:
@@ -203,36 +204,56 @@
SPKMessageHold() {
holding = false;
currentMessage = "";
- waitingMessage = "";
+ savedMessage = "";
}
- void addMessage(string message, float minimumSeconds) {
- if (minimumSeconds > 0.0f)
+ void addMessage(string message, float minimumSeconds)
+ {
+ if (holding)
{
- timeout.detach();
- timeout.attach(this, &SPKMessageHold::handleTimeout, minimumSeconds);
- holding = true;
- waitingMessage = currentMessage;
- currentMessage = message;
+ if (minimumSeconds > 0.0f) enqueuedMessages.push( make_pair(message, minimumSeconds) );
+ else savedMessage = message;
}
else
{
- if (holding) waitingMessage = message;
- else currentMessage = message;
+ if (minimumSeconds > 0.0f)
+ {
+ timeout.detach();
+ timeout.attach(this, &SPKMessageHold::handleTimeout, minimumSeconds);
+ holding = true;
+ savedMessage = currentMessage;
+ currentMessage = message;
+ }
+ else
+ {
+ currentMessage = message;
+ }
}
}
string message() { return currentMessage; }
private:
- void handleTimeout() {
- currentMessage = waitingMessage;
- waitingMessage = "";
- holding = false;
+ void handleTimeout()
+ {
+ if (enqueuedMessages.empty())
+ {
+ currentMessage = savedMessage;
+ holding = false;
+ }
+ else
+ {
+ currentMessage = enqueuedMessages.front().first;
+ float secs = enqueuedMessages.front().second;
+ enqueuedMessages.pop();
+
+ timeout.attach(this, &SPKMessageHold::handleTimeout, secs);
+ }
}
bool holding;
string currentMessage;
- string waitingMessage;
+ string savedMessage;
+ queue< pair<string, float> >enqueuedMessages;
Timeout timeout;
};
\ No newline at end of file