W1CDN/vulpes
1
0
Fork 0
Code Issues 20 Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: W1CDN:prettify
Branches Tags
W1CDN:main W1CDN:w1cdn-patch-1 W1CDN:voltage W1CDN:prettify
..
compare: W1CDN:e942576fd8113e99dffe2f70942a7235eadef566
Branches Tags
W1CDN:main W1CDN:w1cdn-patch-1 W1CDN:voltage W1CDN:prettify

3 Commits
prettify ... e942576fd8

Author SHA1 Message Date
W1CDN
e942576fd8 Merge pull request 'Make sure RTC is counting time on battery' (#51) from rtc-fix01 into main 
Reviewed-on: #51
 2023-09-25 21:14:57 -05:00
mattbk
c14215d42f Wait for RTC before querying on boot. 2023-09-25 21:12:25 -05:00
mattbk
99f6ebfe93 Add delay before reading RTC. 2023-09-19 11:11:46 -05:00
1 changed files with 22 additions and 64 deletions
Expand all files Collapse all files

66
vulpes/src/main.cpp
View File

@ -72,15 +72,7 @@ long pause_until_millis = 0;
const char index_html[] PROGMEM = R"rawliteral( const char index_html[] PROGMEM = R"rawliteral(
<!DOCTYPE HTML><html><head> <!DOCTYPE HTML><html><head>
<link rel="icon" href="data:,"> <link rel="icon" href="data:,">
<title>Vulpes Radio Orienteering Controller</title> <title>ESP Input Form</title>
<style>
.inv_message {
display: none;
}
.inv_program {
display: none;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<script type="text/javascript"> <script type="text/javascript">
// Utility from https://webreflection.medium.com/using-the-input-datetime-local-9503e7efdce // Utility from https://webreflection.medium.com/using-the-input-datetime-local-9503e7efdce
@ -131,7 +123,7 @@ const char index_html[] PROGMEM = R"rawliteral(
<h2>General Settings</h2> <h2>General Settings</h2>
<p>Sending program: <p>Sending program:
<select name="inputSend" id="send-program"> <select name="inputSend" id="send-program">
<option value="0">0 - Off</option> <option value="0" >0 - Off</option>
<option value="1">1 - Continuous</option> <option value="1">1 - Continuous</option>
<option value="2">2 - Cycle</option> <option value="2">2 - Cycle</option>
</select><br> </select><br>
@ -146,29 +138,24 @@ const char index_html[] PROGMEM = R"rawliteral(
<option value="5">5 - MO5</option> <option value="5">5 - MO5</option>
</select><br> </select><br>
<!-- Hidden unless "0 - Custom Message" is selected -->
<span id="message0" class="inv_message">
Custom message: <input type="text" name="inputCustomMsg" value = "%inputCustomMsg%"><br> Custom message: <input type="text" name="inputCustomMsg" value = "%inputCustomMsg%"><br>
</span>
Speed: <input type="number" name="inputWPM" value = %inputWPM%> WPM Speed: <input type="number" name="inputWPM" value = %inputWPM%> WPM
</p> </p>
<!-- Hidden unless "2 - Cycle" is selected -->
<span id="program2" class="inv_program">
<h2>Cycle Settings</h2> <h2>Cycle Settings</h2>
<p>Only applies when <em>Sending Program</em> is set to "2 - Cycle". You cannot set a cycle start date more than a month in advance.<br> <p>Only applies when <em>Sending Program</em> is set to "2 - Cycle". You cannot set a cycle start date more than a month in advance.</p>
Cycle start time <input type="datetime-local" id="js_start_time_unix_entry" /><br> <p>Cycle start time <input type="datetime-local" id="js_start_time_unix_entry" /><br>
Current value: <b><span id=current-start></span></b><br> Current value: <b><span id=current-start></span></b>
<!-- JS converts the entered start time to a unix timestamp, and copies that value <!-- JS converts the entered start time to a unix timestamp, and copies that value
to this hidden field so the user doesn't have to see it. --> to this hidden field so the user doesn't have to see it. -->
<input type="hidden" name="inputStartTimeUnix" id="js_start_time_unix" /></p> <input type="hidden" name="inputStartTimeUnix" id="js_start_time_unix" /></p>
<p>
Step length: <input type="number" name="inputStepLength" min=1000 step=1000 value = %inputStepLength%> milliseconds <br> Step length: <input type="number" name="inputStepLength" min=1000 step=1000 value = %inputStepLength%> milliseconds <br>
Cycle ID: <input type="number" name="inputCycleID" min=1 value = %inputCycleID%><br> Cycle ID: <input type="number" name="inputCycleID" min=1 value = %inputCycleID%><br>
Number of transmitters: <input type="number" name="inputNtransmitters" min=1 value = %inputNtransmitters%><br> Number of transmitters: <input type="number" name="inputNtransmitters" min=1 value = %inputNtransmitters%><br>
</p> </p>
</span>
<!-- This field is hidden so people don't change the submit time (it will be wrong). <!-- This field is hidden so people don't change the submit time (it will be wrong).
The value is automatically filled in with JS. --> The value is automatically filled in with JS. -->
@ -179,41 +166,9 @@ const char index_html[] PROGMEM = R"rawliteral(
<input type="submit" value="Submit""> <input type="submit" value="Submit"">
</form> </form>
<iframe style="display:none" name="hidden-form" id="hidden-form"></iframe> <iframe style="display:none" name="hidden-form" id="hidden-form"></iframe>
<script type="text/javascript"> <script type="text/javascript">
// Show more stuff depending on selected values
// https://stackoverflow.com/a/24849350
show_message = function () {
'use strict';
var vis_message = document.querySelector('.vis_message'),
target = document.getElementById("message"+this.value);
if (vis_message !== null) {
vis_message.className = 'inv_message';
}
if (target !== null ) {
target.className = 'vis_message';
}
}
show_program = function () {
'use strict';
var vis_program = document.querySelector('.vis_program'),
target = document.getElementById("program"+this.value);
if (vis_program !== null) {
vis_program.className = 'inv_program';
}
if (target !== null ) {
target.className = 'vis_program';
}
}
document
.getElementById('message')
.addEventListener('change', show_message);
document
.getElementById('send-program')
.addEventListener('change', show_program);
</script> </script>
</body></html>)rawliteral"; </body></html>)rawliteral";
@ -324,8 +279,11 @@ void setup() {
//rtc.adjust(DateTime(2023, 9, 2, 17, 32, 0)); //rtc.adjust(DateTime(2023, 9, 2, 17, 32, 0));
} }
// Report the RTC time // Report the RTC time after waiting two seconds
Serial.print("RTC time on startup: "); // https://amiok.net/gitea/W1CDN/vulpes/issues/50#issuecomment-1376
Serial.println("Wait 2s for RTC");
delay(2000);
Serial.println("RTC time on startup: ");
Serial.println(rtc.now().unixtime()); Serial.println(rtc.now().unixtime());
Serial.println(rtc.now().timestamp()); Serial.println(rtc.now().timestamp());