Harmonize type definitions (#970)

This commit is contained in:
tekka
2017-11-04 14:38:33 +01:00
committed by GitHub
parent 30516cf87e
commit 9663d4c6b7
11 changed files with 37 additions and 37 deletions
+2 -2
View File
@@ -686,7 +686,7 @@ void _nodeLock(const char* str)
CORE_DEBUG(PSTR("MCO:NLK:TSL\n")); // sleep transport
#endif
setIndication(INDICATION_SLEEP);
(void)hwSleep((unsigned long)1000*60*30); // Sleep for 30 min before resending LOCKED message
(void)hwSleep((uint32_t)1000*60*30); // Sleep for 30 min before resending LOCKED message
setIndication(INDICATION_WAKEUP);
}
#else
@@ -702,7 +702,7 @@ void _checkNodeLock(void)
// Node is locked, check if unlock pin is asserted, else hang the node
hwPinMode(MY_NODE_UNLOCK_PIN, INPUT_PULLUP);
// Make a short delay so we are sure any large external nets are fully pulled
unsigned long enter = hwMillis();
uint32_t enter = hwMillis();
while (hwMillis() - enter < 2) {}
if (hwDigitalRead(MY_NODE_UNLOCK_PIN) == 0) {
// Pin is grounded, reset lock counter