Skip to content

Commit a9c1916

Browse files
committed
v2.7 LIDAR
1 parent f20c7e6 commit a9c1916

File tree

9 files changed

+381
-267
lines changed

9 files changed

+381
-267
lines changed

CHANGELOG

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
SIGNAL SERVER CHANGELOG
2+
2.7 - 03 Jan 2016
3+
Added support for LIDAR data in ASCII grid format with WGS84 bounds
4+
Increased resolution to +54000 pixels per degree (2m)
5+
Removed support for Windows SDF filenames without:colons.
6+
27

38
2.63 - 10 Nov 2015
49
Added sanity check and handicap to ECC33 model when used with low Tx heights in hilly areas = sea of red
@@ -11,10 +16,10 @@ Credit to Nils Lofstad for helping nail this down.
1116
FSPL model floor reduced from 150MHz to 20MHz.
1217

1318
2.6 - 9 June 2015
14-
Multithreading support added by Michael Ramnarine
19+
Multi-threading support added by Michael Ramnarine
1520
PlotPropagation() and PlotLOSMap() use four threads by default
1621
Feature can be disabled with -nothreads flag
17-
Static and global variables have been made threadsafe
22+
Static and global variables have been made thread safe
1823

1924
2.5 - 27 May 2015
2025
Code refactored by Andrew Clayton / ac000 with header files
@@ -109,7 +114,7 @@ New Earth Dielectric range (Permittivity): 80 to 0.1
109114
New Conductivity range (Siemens/m): 0.01 to 0.000001
110115

111116
1.0 - 19 November 2011
112-
SS released.
117+
Signal Server forked from SPLAT!
113118

114119

115120

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ signalserver: $(objects)
3535
@$(CXX) $(objects) -o $@ ${LIBS}
3636
@echo -e " SYMLNK\tsignalserverHD -> $@"
3737
@ln -sf $@ signalserverHD
38-
38+
@echo -e " SYMLNK\tsignalserverLIDAR -> $@"
39+
@ln -sf $@ signalserverLIDAR
40+
3941
main.o: main.cc common.h inputs.hh outputs.hh itwom3.0.hh los.hh
4042

4143
inputs.o: inputs.cc common.h main.hh
@@ -48,4 +50,4 @@ los.o: los.cc common.h main.hh cost.hh ecc33.hh ericsson.hh fspl.hh hata.hh \
4850

4951
.PHONY: clean
5052
clean:
51-
rm -f $(objects) signalserver signalserverHD
53+
rm -f $(objects) signalserver signalserverHD signalserverLIDAR

README.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/****************************************************************************\
2-
* Signal Server: Server optimised SPLAT! by Alex Farrant *
2+
* Signal Server: Server optimised SPLAT! by Alex Farrant, M6ZUJ *
33
******************************************************************************
44
* SPLAT! Project started in 1997 by John A. Magliacane, KD2BD *
55
* *
66
******************************************************************************
7-
* Please consult the SPLAT! documentation for a complete list of *
8-
* individuals who have contributed to this project. *
7+
* Please consult the SPLAT! documentation for a complete list of *
8+
* individuals who have contributed to this project. *
99
******************************************************************************
1010
* *
1111
* This program is free software; you can redistribute it and/or modify it *
@@ -20,7 +20,7 @@
2020
* *
2121
\****************************************************************************/
2222

23-
-- Signal Server 2.6 --
23+
-- Signal Server --
2424
Compiled for 64 tiles at 1200 pixels/degree
2525

2626
-d Directory containing .sdf tiles
@@ -53,5 +53,17 @@
5353
-ng Normalise Path Profile graph
5454
-haf Halve 1 or 2 (optional)
5555
-nothreads Turn off threaded processing (optional)
56+
57+
Example usage:
58+
59+
INPUTS: 900MHz tower at 25m AGL with 5W ERP
60+
OUTPUTS: 1200 resolution, 30km radius, -90dBm receiver threshold, Longley Rice model
61+
./signalserver -d /data/SRTM3 -lat 51.849 -lon -2.2299 -txh 25 -f 900 -erp 5 -rxh 2 -rt -90 -dbm -m -o test1 -R 30 -res 1200 -pm 1
5662

63+
INPUTS: 450MHz tower at 25f AGL with 20W ERP
64+
OUTPUTS: 3600 resolution, 30km radius, 10dBuV receiver threshold, Hata model
65+
./signalserverHD -d /data/SRTM1 -lat 51.849 -lon -2.2299 -txh 25 -f 450 -erp 20 -rxh 2 -rt 10 -o test2 -R 30 -res 3600 -pm 3
5766

67+
INPUTS: 1800MHz tower at 15m AGL with 1W ERP
68+
OUTPUTS: 2m LIDAR resolution, 5km radius, -90dBm receiver threshold, Longley Rice model
69+
./signalserverLIDAR -lid /data/LIDAR2m/Gloucester_2m.asc -lat 51.849 -lon -2.2299 -txh 15 -f 1800 -erp 1 -rxh 2 -rt -90 -dbm -m -o test3 -R 30 -res 5000 -pm 1

common.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define FOUR_THIRDS 1.3333333333333
2424

2525
struct dem {
26-
int min_north;
27-
int max_north;
28-
int min_west;
29-
int max_west;
26+
float min_north;
27+
float max_north;
28+
float min_west;
29+
float max_west;
3030
int max_el;
3131
int min_el;
3232
short **data;
@@ -73,17 +73,19 @@ extern int MAXPAGES;
7373
extern int ARRAYSIZE;
7474
extern int IPPD;
7575

76-
extern int min_north;
77-
extern int max_north;
78-
extern int min_west;
79-
extern int max_west;
76+
extern double min_north;
77+
extern double max_north;
78+
extern double min_west;
79+
extern double max_west;
8080
extern int ippd;
8181
extern int mpi;
8282
extern int max_elevation;
8383
extern int min_elevation;
8484
extern int contour_threshold;
8585
extern int loops;
8686
extern int jgets;
87+
extern int width;
88+
extern int height;
8789

8890
extern double earthradius;
8991
extern double north;
@@ -93,6 +95,7 @@ extern double west;
9395
extern double max_range;
9496
extern double dpp;
9597
extern double ppd;
98+
extern double yppd;
9699
extern double fzone_clearance;
97100
extern double clutter;
98101
extern double dBm;

0 commit comments

Comments
 (0)