Rename dump1090 source code files. Remove faup source.

Mictronics · Sep 2, 2019 · 08963e8 · 08963e8
1 parent dffff3d
commit 08963e8
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 279 deletions.
diff --git a/Makefile b/Makefile
@@ -54,22 +54,19 @@ ifeq ($(PLUTOSDR), yes)
  LIBS_SDR += $(shell pkg-config --libs libiio libad9361)
 endif
 
-all: dump1090 view1090
+all: readsb viewadsb
 
 %.o: %.c *.h
  $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o sdr_ifile.o sdr_beast.o sdr.o ais_charset.o $(SDR_OBJ) $(COMPAT)
+readsb: readsb.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o sdr_ifile.o sdr_beast.o sdr.o ais_charset.o $(SDR_OBJ) $(COMPAT)
  $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_SDR) -lncurses
 
-view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o ais_charset.o $(COMPAT)
+viewadsb: viewadsb.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o ais_charset.o $(COMPAT)
  $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS) -lncurses
 
-faup1090: faup1090.o anet.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o ais_charset.o $(COMPAT)
- $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
-
 clean:
- rm -f *.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dump1090 view1090 faup1090 cprtests crctests convert_benchmark
+ rm -f *.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dump1090 viewadsb convadsb cprtests crctests convert_benchmark
 
 test: cprtests
  ./cprtests

diff --git a/comm_b.c b/comm_b.c
@@ -22,7 +22,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
-#include "dump1090.h"
+#include "readsb.h"
 #include "ais_charset.h"
 
 typedef int (*CommBDecoderFn)(struct modesMessage *, bool);

diff --git a/convert.c b/convert.c
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
-#include "dump1090.h"
+#include "readsb.h"
 
 struct converter_state {
  float dc_a;

diff --git a/crc.c b/crc.c
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
-#include "dump1090.h"
+#include "readsb.h"
 #include <assert.h>
 
 // Errorinfo for "no errors"

diff --git a/demod_2400.c b/demod_2400.c
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
-#include "dump1090.h"
+#include "readsb.h"
 #include <assert.h>
 
 #ifdef MODEAC_DEBUG

diff --git a/faup1090.c b/faup1090.c
diff --git a/icao_filter.c b/icao_filter.c
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
-#include "dump1090.h"
+#include "readsb.h"
 
 // hash table size, must be a power of two:
 #define ICAO_FILTER_SIZE 4096

diff --git a/interactive.c b/interactive.c
@@ -51,7 +51,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "dump1090.h"
+#include "readsb.h"
 
 #include <curses.h>
 

diff --git a/mode_ac.c b/mode_ac.c
@@ -48,7 +48,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "dump1090.h"
+#include "readsb.h"
 #include <assert.h>
 //
 //=========================================================================

diff --git a/mode_s.c b/mode_s.c
@@ -52,7 +52,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-#include "dump1090.h"
+#include "readsb.h"
 #include "ais_charset.h"
 
 /* for PRIX64 */

diff --git a/net_io.c b/net_io.c
@@ -51,7 +51,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "dump1090.h"
+#include "readsb.h"
 
 /* for PRIX64 */
 #include <inttypes.h>

diff --git a/dump1090.c → readsb.c b/dump1090.c → readsb.c
@@ -1,6 +1,6 @@
 // Part of readsb, a Mode-S/ADSB/TIS message decoder.
 //
-// dump1090.c: main program & miscellany
+// readsb.c: main program & miscellany
 //
 // Copyright (c) 2019 Michael Wolf <[email protected]>
 //
@@ -52,7 +52,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define DUMP1090
-#include "dump1090.h"
+#include "readsb.h"
 #include "help.h"
 
 #include <stdarg.h>

diff --git a/dump1090.h → readsb.h b/dump1090.h → readsb.h
@@ -1,6 +1,6 @@
 // Part of readsb, a Mode-S/ADSB/TIS message decoder.
 //
-// dump1090.h: main program header
+// readsb.h: main program header
 //
 // Copyright (c) 2019 Michael Wolf <[email protected]>
 //

diff --git a/sdr.c b/sdr.c
@@ -22,7 +22,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
-#include "dump1090.h"
+#include "readsb.h"
 
 #include "sdr_ifile.h"
 #ifdef ENABLE_RTLSDR

diff --git a/sdr_beast.c b/sdr_beast.c
@@ -18,7 +18,7 @@
 // along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include <termios.h>
-#include "dump1090.h"
+#include "readsb.h"
 #include "sdr_beast.h"
 
 static struct {