projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Have single radio_to_frequency function
[fw/altos]
/
altosui
/
AltosConvert.java
diff --git
a/altosui/AltosConvert.java
b/altosui/AltosConvert.java
index 6a9b699cfe158c025d275fe1bc99767a9eb24e97..c2ae9a507897079970036ebef8cca8505b306e66 100644
(file)
--- a/
altosui/AltosConvert.java
+++ b/
altosui/AltosConvert.java
@@
-190,30
+190,24
@@
public class AltosConvert {
return ignite / 32767 * 15.0;
}
return ignite / 32767 * 15.0;
}
- static double
- radio_setting_to_frequency(int setting, int cal) {
+ static double radio_to_frequency(int setting, int cal, int channel) {
double f;
double f;
+ if (setting <= 0)
+ setting = cal;
f = 434.550 * setting / cal;
/* Round to nearest 50KHz */
f = Math.floor (20.0 * f + 0.5) / 20.0;
f = 434.550 * setting / cal;
/* Round to nearest 50KHz */
f = Math.floor (20.0 * f + 0.5) / 20.0;
- return f;
+ return f
+ channel * 0.100
;
}
}
- static int
- radio_frequency_to_setting(double frequency, int cal) {
+ static int radio_frequency_to_setting(double frequency, int cal) {
double set = frequency / 434.550 * cal;
return (int) Math.floor (set + 0.5);
}
double set = frequency / 434.550 * cal;
return (int) Math.floor (set + 0.5);
}
- static double
- radio_channel_to_frequency(int channel) {
- return 434.550 + channel * 0.100;
- }
-
- static int
- radio_frequency_to_channel(double frequency) {
+ static int radio_frequency_to_channel(double frequency) {
int channel = (int) Math.floor ((frequency - 434.550) / 0.100 + 0.5);
if (channel < 0)
int channel = (int) Math.floor ((frequency - 434.550) / 0.100 + 0.5);
if (channel < 0)
@@
-222,4
+216,8
@@
public class AltosConvert {
channel = 9;
return channel;
}
channel = 9;
return channel;
}
+
+ static double radio_channel_to_frequency(int channel) {
+ return 434.550 + channel * 0.100;
+ }
}
}