aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2019-06-30 08:10:33 +0200
committerAndreas Eversberg <jolly@eversberg.eu>2019-06-30 14:51:01 +0200
commit1eac0879352d169e450671c95f25e8322445f8fc (patch)
tree557af6086b826a6b2433ae38cfcc6020772b00cf /src
parent13245c56f64ddee03fda5bca7723dffa1360c4a1 (diff)
Output ASCII art image after all init functions (inside main_mobile.c)
Diffstat (limited to 'src')
-rw-r--r--src/amps/amps_tacs_main.c3
-rw-r--r--src/amps/image.c2
-rw-r--r--src/anetz/image.c2
-rw-r--r--src/anetz/image.h3
-rw-r--r--src/anetz/main.c4
-rw-r--r--src/bnetz/image.c2
-rw-r--r--src/bnetz/image.h3
-rw-r--r--src/bnetz/main.c4
-rw-r--r--src/cnetz/image.c2
-rw-r--r--src/cnetz/image.h3
-rw-r--r--src/cnetz/main.c4
-rw-r--r--src/jolly/main.c2
-rw-r--r--src/jtacs/image.c2
-rw-r--r--src/jtacs/image.h3
-rw-r--r--src/libhagelbarger/hagelbarger.c4
-rw-r--r--src/libmobile/image.h (renamed from src/amps/image.h)0
-rw-r--r--src/libmobile/main_mobile.c4
-rw-r--r--src/nmt/image.c2
-rw-r--r--src/nmt/image.h3
-rw-r--r--src/nmt/main.c4
-rw-r--r--src/r2000/image.c2
-rw-r--r--src/r2000/image.h3
-rw-r--r--src/r2000/main.c4
-rw-r--r--src/tacs/image.c2
-rw-r--r--src/tacs/image.h3
-rw-r--r--src/test/test_dms.c2
-rw-r--r--src/test/test_sms.c2
27 files changed, 20 insertions, 54 deletions
diff --git a/src/amps/amps_tacs_main.c b/src/amps/amps_tacs_main.c
index a4eef2f..d6b0e5a 100644
--- a/src/amps/amps_tacs_main.c
+++ b/src/amps/amps_tacs_main.c
@@ -31,7 +31,6 @@
#include "amps.h"
#include "dsp.h"
#include "frame.h"
-#include "image.h"
#include "stations.h"
#include "main.h"
@@ -326,8 +325,6 @@ int main_amps_tacs(int argc, char *argv[])
exit(0);
}
- if (!loopback)
- print_image();
sid_stations(sid);
/* inits */
diff --git a/src/amps/image.c b/src/amps/image.c
index 61b6edf..66df182 100644
--- a/src/amps/image.c
+++ b/src/amps/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"",
diff --git a/src/anetz/image.c b/src/anetz/image.c
index 15a24f6..c6f66f8 100644
--- a/src/anetz/image.c
+++ b/src/anetz/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"@w",
diff --git a/src/anetz/image.h b/src/anetz/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/anetz/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/anetz/main.c b/src/anetz/main.c
index bc28897..470bda7 100644
--- a/src/anetz/main.c
+++ b/src/anetz/main.c
@@ -35,7 +35,6 @@
#include "anetz.h"
#include "dsp.h"
#include "stations.h"
-#include "image.h"
/* settings */
static char operator[32] = "010";
@@ -174,9 +173,6 @@ int main(int argc, char *argv[])
exit(0);
}
- if (!loopback)
- print_image();
-
/* inits */
fm_init(fast_math);
dsp_init();
diff --git a/src/bnetz/image.c b/src/bnetz/image.c
index b8d75a6..d3368c6 100644
--- a/src/bnetz/image.c
+++ b/src/bnetz/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"@g",
diff --git a/src/bnetz/image.h b/src/bnetz/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/bnetz/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/bnetz/main.c b/src/bnetz/main.c
index 2222bff..88cd700 100644
--- a/src/bnetz/main.c
+++ b/src/bnetz/main.c
@@ -33,7 +33,6 @@
#include "bnetz.h"
#include "dsp.h"
#include "stations.h"
-#include "image.h"
#include "ansage.h"
int gfs = 2;
@@ -173,9 +172,6 @@ int main(int argc, char *argv[])
exit(0);
}
- if (!loopback)
- print_image();
-
/* inits */
fm_init(fast_math);
dsp_init();
diff --git a/src/cnetz/image.c b/src/cnetz/image.c
index 1d30682..b2313c8 100644
--- a/src/cnetz/image.c
+++ b/src/cnetz/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"@g _\n"
diff --git a/src/cnetz/image.h b/src/cnetz/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/cnetz/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/cnetz/main.c b/src/cnetz/main.c
index 1001a9c..50f7e9b 100644
--- a/src/cnetz/main.c
+++ b/src/cnetz/main.c
@@ -35,7 +35,6 @@
#include "sysinfo.h"
#include "dsp.h"
#include "telegramm.h"
-#include "image.h"
#include "ansage.h"
/* settings */
@@ -493,9 +492,6 @@ int main(int argc, char *argv[])
return 0;
}
- if (!loopback)
- print_image();
-
/* inits */
fm_init(fast_math);
scrambler_init();
diff --git a/src/jolly/main.c b/src/jolly/main.c
index ac25191..3ec19b7 100644
--- a/src/jolly/main.c
+++ b/src/jolly/main.c
@@ -48,6 +48,8 @@ static double squelch_db = -INFINITY;
int nbfm = 0;
int repeater = 0;
+void print_image(void) {}
+
void print_help(const char *arg0)
{
main_mobile_print_help(arg0, "[-F <downlink MHz>,<uplink MHz>] ");
diff --git a/src/jtacs/image.c b/src/jtacs/image.c
index c7b96b7..740f5f0 100644
--- a/src/jtacs/image.c
+++ b/src/jtacs/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
void print_image(void)
{
diff --git a/src/jtacs/image.h b/src/jtacs/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/jtacs/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/libhagelbarger/hagelbarger.c b/src/libhagelbarger/hagelbarger.c
index 7d42bbc..92774a0 100644
--- a/src/libhagelbarger/hagelbarger.c
+++ b/src/libhagelbarger/hagelbarger.c
@@ -5,8 +5,8 @@
* another burst of corrupted bits.
*
* There is no parity check, so it is required to check all information
- * elements of each message. Messages that contain signals or digits are
- * protected by repeating the digits in the information element.
+ * elements of each message. With NMT System: Messages that contain signals
+ * or digits are protected by repeating the digits in the information element.
*
* (C) 2017 by Andreas Eversberg <jolly@eversberg.eu>
* All Rights Reserved
diff --git a/src/amps/image.h b/src/libmobile/image.h
index 08a6f5b..08a6f5b 100644
--- a/src/amps/image.h
+++ b/src/libmobile/image.h
diff --git a/src/libmobile/main_mobile.c b/src/libmobile/main_mobile.c
index 9cf0d74..e516afe 100644
--- a/src/libmobile/main_mobile.c
+++ b/src/libmobile/main_mobile.c
@@ -42,6 +42,7 @@
#endif
#include "../liboptions/options.h"
#include "../libfm/fm.h"
+#include "image.h"
#define DEFAULT_LO_OFFSET -1000000.0
@@ -494,6 +495,9 @@ void main_mobile(int *quit, int latency, int interval, void (*myhandler)(void),
if (console_open_audio(latspl))
return;
+ if (!loopback)
+ print_image();
+
/* real time priority */
if (rt_prio > 0) {
struct sched_param schedp;
diff --git a/src/nmt/image.c b/src/nmt/image.c
index 15d933f..db9d3e8 100644
--- a/src/nmt/image.c
+++ b/src/nmt/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"",
diff --git a/src/nmt/image.h b/src/nmt/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/nmt/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/nmt/main.c b/src/nmt/main.c
index 7478c64..4ec931b 100644
--- a/src/nmt/main.c
+++ b/src/nmt/main.c
@@ -33,7 +33,6 @@
#include "nmt.h"
#include "frame.h"
#include "dsp.h"
-#include "image.h"
#include "tones.h"
#include "announcement.h"
#include "countries.h"
@@ -381,9 +380,6 @@ int main(int argc, char *argv[])
}
}
- if (!loopback)
- print_image();
-
/* inits */
fm_init(fast_math);
rc = init_frame();
diff --git a/src/r2000/image.c b/src/r2000/image.c
index 53cdf66..003daf2 100644
--- a/src/r2000/image.c
+++ b/src/r2000/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"",
diff --git a/src/r2000/image.h b/src/r2000/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/r2000/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/r2000/main.c b/src/r2000/main.c
index cf30690..926ff21 100644
--- a/src/r2000/main.c
+++ b/src/r2000/main.c
@@ -34,7 +34,6 @@
#include "dsp.h"
#include "frame.h"
#include "tones.h"
-#include "image.h"
/* settings */
static int band = 1;
@@ -332,9 +331,6 @@ int main(int argc, char *argv[])
getchar();
}
- if (!loopback && crins != 3)
- print_image();
-
/* inits */
fm_init(fast_math);
dsp_init();
diff --git a/src/tacs/image.c b/src/tacs/image.c
index 949b068..909f2b1 100644
--- a/src/tacs/image.c
+++ b/src/tacs/image.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "image.h"
+#include "../libmobile/image.h"
const char *image[] = {
"",
diff --git a/src/tacs/image.h b/src/tacs/image.h
deleted file mode 100644
index 08a6f5b..0000000
--- a/src/tacs/image.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void print_image(void);
-
diff --git a/src/test/test_dms.c b/src/test/test_dms.c
index 5a29543..379eaa6 100644
--- a/src/test/test_dms.c
+++ b/src/test/test_dms.c
@@ -253,3 +253,5 @@ int main(void)
return 0;
}
+void print_image(void) {}
+
diff --git a/src/test/test_sms.c b/src/test/test_sms.c
index b64d44c..7f901ad 100644
--- a/src/test/test_sms.c
+++ b/src/test/test_sms.c
@@ -162,3 +162,5 @@ int main(void)
return 0;
}
+void print_image(void) {}
+