mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-12 11:14:28 +05:00
chore: resolve conflicts
This commit is contained in:
@@ -871,6 +871,10 @@ function dec2hex(i) {
|
||||
return hex.toUpperCase();
|
||||
}
|
||||
|
||||
function constrain(amt, low, high) {
|
||||
return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
|
||||
}
|
||||
|
||||
function c2f(value) {
|
||||
return (9 / 5) * value + 32;
|
||||
}
|
||||
@@ -878,7 +882,3 @@ function c2f(value) {
|
||||
function f2c(value) {
|
||||
return (value - 32) * (5 / 9);
|
||||
}
|
||||
|
||||
function constrain(amt, low, high) {
|
||||
return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
|
||||
}
|
||||
Reference in New Issue
Block a user