|
4 | 4 |
|
5 | 5 | #if SUPPORT_INFO_DISPLAY == 1
|
6 | 6 | byte infoIndex = 0;
|
7 |
| -byte maxInfoIndex = 6; |
| 7 | +byte maxInfoIndex = 7; |
8 | 8 | byte subIndex = 0;
|
| 9 | +unsigned long lastInfoUpdate = 0; |
9 | 10 |
|
10 | 11 | bool processStatusKeys() {
|
11 | 12 | byte key;
|
12 | 13 | bool waitForRelease = false;
|
13 | 14 | if (lcdButtons.keyChanged(&key)) {
|
14 | 15 | waitForRelease = true;
|
| 16 | + lastInfoUpdate = 0; // Force immediate display |
15 | 17 | switch (key) {
|
16 | 18 | case btnDOWN: {
|
17 | 19 | infoIndex = adjustWrap(infoIndex, 1, 0, maxInfoIndex);
|
@@ -40,77 +42,94 @@ bool processStatusKeys() {
|
40 | 42 | }
|
41 | 43 |
|
42 | 44 | void printStatusSubmenu() {
|
43 |
| - char scratchBuffer[20]; |
44 |
| - switch (infoIndex) { |
45 |
| - case 0: { |
46 |
| - if (subIndex == 0) { |
47 |
| - lcdMenu.printMenu("RA Stpr: " + String(mount.getCurrentStepperPosition(WEST))); |
| 45 | + if (millis() - lastInfoUpdate > DISPLAY_UPDATE_TIME) |
| 46 | + { |
| 47 | + char scratchBuffer[20]; |
| 48 | + switch (infoIndex) { |
| 49 | + case 0: { |
| 50 | + if (subIndex == 0) { |
| 51 | + lcdMenu.printMenu("RA Stpr: " + String(mount.getCurrentStepperPosition(WEST))); |
| 52 | + } |
| 53 | + else if (subIndex == 1) { |
| 54 | + lcdMenu.printMenu("RTrg: " + mount.RAString(LCD_STRING | TARGET_STRING)); |
| 55 | + } |
| 56 | + else { |
| 57 | + lcdMenu.printMenu("RCur: " + mount.RAString(LCD_STRING | CURRENT_STRING)); |
| 58 | + } |
48 | 59 | }
|
49 |
| - else if (subIndex == 1) { |
50 |
| - lcdMenu.printMenu("RTrg: " + mount.RAString(LCD_STRING | TARGET_STRING)); |
51 |
| - } |
52 |
| - else { |
53 |
| - lcdMenu.printMenu("RCur: " + mount.RAString(LCD_STRING | CURRENT_STRING)); |
54 |
| - } |
55 |
| - } |
56 |
| - break; |
57 |
| - |
58 |
| - case 1: { |
59 |
| - if (subIndex == 0) { |
60 |
| - lcdMenu.printMenu("DEC Stpr:" + String(mount.getCurrentStepperPosition(NORTH))); |
| 60 | + break; |
| 61 | + |
| 62 | + case 1: { |
| 63 | + if (subIndex == 0) { |
| 64 | + lcdMenu.printMenu("DEC Stpr:" + String(mount.getCurrentStepperPosition(NORTH))); |
| 65 | + } |
| 66 | + else if (subIndex == 1) { |
| 67 | + lcdMenu.printMenu("DTrg: " + mount.DECString(LCD_STRING | TARGET_STRING)); |
| 68 | + } |
| 69 | + else { |
| 70 | + lcdMenu.printMenu("DCur: " + mount.DECString(LCD_STRING | CURRENT_STRING)); |
| 71 | + } |
61 | 72 | }
|
62 |
| - else if (subIndex == 1) { |
63 |
| - lcdMenu.printMenu("DTrg: " + mount.DECString(LCD_STRING | TARGET_STRING)); |
| 73 | + break; |
| 74 | + |
| 75 | + case 2: { |
| 76 | + if (subIndex == 0) { |
| 77 | + lcdMenu.printMenu("TRK Stepr:" + String(mount.getCurrentStepperPosition(TRACKING))); |
| 78 | + } |
| 79 | + else { |
| 80 | + sprintf(scratchBuffer, "TRK Spd:"); |
| 81 | + dtostrf(mount.getSpeed(TRACKING), 8, 6, &scratchBuffer[8]); |
| 82 | + lcdMenu.printMenu(scratchBuffer); |
| 83 | + } |
64 | 84 | }
|
65 |
| - else { |
66 |
| - lcdMenu.printMenu("DCur: " + mount.DECString(LCD_STRING | CURRENT_STRING)); |
| 85 | + break; |
| 86 | + |
| 87 | + case 3: { |
| 88 | + float lat = fabs(mount.latitude()); |
| 89 | + float lng = fabs(mount.longitude()); |
| 90 | + const char dirLat = (mount.latitude() < 0) ? 'S' : 'N'; |
| 91 | + const char dirLong = (mount.longitude() < 0) ? 'W' :'E'; |
| 92 | + sprintf(scratchBuffer, "Loc %s%c %s%c", String(lat,1).c_str(), dirLat, String(lng,1).c_str(), dirLong); |
| 93 | + lcdMenu.printMenu(scratchBuffer); |
67 | 94 | }
|
68 |
| - } |
69 |
| - break; |
70 |
| - |
71 |
| - case 2: { |
72 |
| - if (subIndex == 0) { |
73 |
| - lcdMenu.printMenu("TRK Stepr:" + String(mount.getCurrentStepperPosition(TRACKING))); |
| 95 | + break; |
| 96 | + |
| 97 | + case 4: { |
| 98 | + #if GYRO_LEVEL == 1 |
| 99 | + int celsius = (int)round(Gyro::getCurrentTemperature()); |
| 100 | + int fahrenheit = (int)round(32.0 + 9.0 * Gyro::getCurrentTemperature() / 5.0); |
| 101 | + |
| 102 | + sprintf(scratchBuffer, "Temp: %d@C %d@F", celsius, fahrenheit); |
| 103 | + lcdMenu.printMenu(scratchBuffer); |
| 104 | + #else |
| 105 | + infoIndex++; |
| 106 | + #endif |
74 | 107 | }
|
75 |
| - else { |
76 |
| - sprintf(scratchBuffer, "TRK Spd:"); |
77 |
| - dtostrf(mount.getSpeed(TRACKING), 8, 6, &scratchBuffer[8]); |
| 108 | + break; |
| 109 | + |
| 110 | + case 5: { |
| 111 | + sprintf(scratchBuffer, "MemAvail: %d", freeMemory()); |
78 | 112 | lcdMenu.printMenu(scratchBuffer);
|
79 | 113 | }
|
80 |
| - } |
81 |
| - break; |
82 |
| - |
83 |
| - case 3: { |
84 |
| - float lat = fabs(mount.latitude()); |
85 |
| - float lng = fabs(mount.longitude()); |
86 |
| - const char dirLat = (mount.latitude() < 0) ? 'S' : 'N'; |
87 |
| - const char dirLong = (mount.longitude() < 0) ? 'W' :'E'; |
88 |
| - sprintf(scratchBuffer, "Loc %s%c %s%c", String(lat,1).c_str(), dirLat, String(lng,1).c_str(), dirLong); |
89 |
| - lcdMenu.printMenu(scratchBuffer); |
90 |
| - } |
91 |
| - break; |
| 114 | + break; |
92 | 115 |
|
93 |
| - case 4: { |
94 |
| - sprintf(scratchBuffer, "MemAvail: %d", freeMemory()); |
95 |
| - lcdMenu.printMenu(scratchBuffer); |
96 |
| - } |
97 |
| - break; |
98 |
| - |
99 |
| - case 5: { |
100 |
| - long now = millis(); |
101 |
| - long msPerDay = 60L * 60 * 24 * 1000; |
102 |
| - int days = (int)(now / msPerDay); |
103 |
| - now -= days * msPerDay; |
104 |
| - DayTime elapsed(now); |
105 |
| - sprintf(scratchBuffer, "Up: %dd %02d:%02d:%02d", days, elapsed.getHours(), elapsed.getMinutes(), elapsed.getSeconds()); |
106 |
| - lcdMenu.printMenu(scratchBuffer); |
107 |
| - } |
108 |
| - break; |
| 116 | + case 6: { |
| 117 | + long now = millis(); |
| 118 | + long msPerDay = 60L * 60 * 24 * 1000; |
| 119 | + int days = (int)(now / msPerDay); |
| 120 | + now -= days * msPerDay; |
| 121 | + DayTime elapsed(now); |
| 122 | + sprintf(scratchBuffer, "Up: %dd %02d:%02d:%02d", days, elapsed.getHours(), elapsed.getMinutes(), elapsed.getSeconds()); |
| 123 | + lcdMenu.printMenu(scratchBuffer); |
| 124 | + } |
| 125 | + break; |
109 | 126 |
|
110 |
| - case 6: { |
111 |
| - lcdMenu.printMenu("Firmw.: " + version); |
| 127 | + case 7: { |
| 128 | + lcdMenu.printMenu("Firmw.: " + version); |
| 129 | + } |
| 130 | + break; |
112 | 131 | }
|
113 |
| - break; |
| 132 | + lastInfoUpdate = millis(); |
114 | 133 | }
|
115 | 134 | }
|
116 | 135 |
|
|
0 commit comments