major interface cleanup

api now knows state of rda
get freq works now


git-svn-id: https://svn.spreadspace.org/mur.sat@708 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 17 insertions, 11 deletions

diff --git a/software/rda1846dongle/rda1846.h b/software/rda1846dongle/rda1846.h
index 35246cb..e25a655 100644
--- a/software/rda1846dongle/rda1846.h
+++ b/software/rda1846dongle/rda1846.h
@@ -33,21 +33,29 @@
 #ifndef MURSAT_rda1846_h_INCLUDED
 #define MURSAT_rda1846_h_INCLUDED
 
-void rda1846_init(void);
+typedef enum { b_2m, b_70cm } rf_band_t;
+char* rda1846_rf_band_to_string(rf_band_t);
+typedef enum { bw_12k5, bw_25k } channel_bw_t;
+char* rda1846_channel_bw_to_string(channel_bw_t);
+typedef enum { powerdown, idle, receive, transmit } rda1846_state_t;
+char* rda1846_state_to_string(rda1846_state_t);
 
+void rda1846_init(void);
 void rda1846_reg_init(void);
 void rda1846_soft_reset(void);
-void rda1846_powerdown(void);
-void rda1846_wakeup(void);
-
-void rda1846_set_band_2m(void);
-void rda1846_set_band_70cm(void);
-void rda1846_set_bw_12k5(void);
-void rda1846_set_bw_25k(void);
 
+void rda1846_powerdown(void);
 void rda1846_idle(void);
 void rda1846_receive(void);
 void rda1846_transmit(void);
+rda1846_state_t rda1846_get_state(void);
+
+void rda1846_set_band(rf_band_t);
+rf_band_t rda1846_get_band(void);
+void rda1846_set_bw(channel_bw_t);
+channel_bw_t rda1846_get_bw(void);
+uint8_t rda1846_set_freq_kHz(int32_t freq);
+int32_t rda1846_get_freq_kHz(void);
 
 void rda1846_gpio_default(void);
 void rda1846_gpio_55(void);
@@ -57,12 +65,10 @@ void rda1846_gpio_off(void);
 int16_t rda1846_get_rssi(void);
 int16_t rda1846_get_vssi(void);
 uint16_t rda1846_get_flags(void);
+
 uint16_t rda1846_get_dtmf(uint8_t*, uint8_t*, uint8_t*, uint8_t*);
 void rda1846_clear_int(void);
 
-int32_t rda1846_get_freq_kHz(void);
-uint8_t rda1846_set_freq_kHz(int32_t freq);
-
 void rda1846_dump_register(void);
 
 #endif