Updated version display. Added user manual.

diff --git a/Makefile b/Makefile
index 896a946ddbc8d03ba91f6379a565a5f3921e5fe5..70c7c5f949011fdbd3c2926d69ed1098df7bd00b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Get git commit version and date
-GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
+#GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
 GIT_DATE := $(firstword $(shell git --no-pager show --date=short --format="%ai" --name-only))
+GIT_VERSION := $(shell git describe --abbrev=0 --tags)
 
 # uncomment the line below to include support for psk31
 PSK_INCLUDE=PSK
@@ -253,5 +254,6 @@ clean:
 install:
        cp pihpsdr ../pihpsdr
        cp pihpsdr ./release/pihpsdr
+       cd release; tar cvf pihpsdr_$(GIT_VERSION).tar pihpsdr
        cd release; tar cvf pihpsdr.tar pihpsdr
 

diff --git a/main.c b/main.c
index fbcb6388c076053b1df09e2cc3b46778395ac148..090950954b23ccfad083518c273eff90f94a647c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -886,7 +886,7 @@ gint init(void* arg) {
 int main (int   argc, char *argv[]) {
   gtk_init (&argc, &argv);
 
-  fprintf(stderr,"Build: %s %s\n",build_date,build_version);
+  fprintf(stderr,"Build: %s %s\n",build_date,version);
 
   uname(&unameData);
   fprintf(stderr,"sysname: %s\n",unameData.sysname);

diff --git a/meter.c b/meter.c
index 0cb961a9fa2a873630267d87ad4d3929e42782d3..7da827745d5366b0aecb7d189994e64c681ecb40 100644 (file)
--- a/meter.c
+++ b/meter.c
@@ -215,7 +215,7 @@ void meter_update(int meter_type,double value,double reverse,double exciter,doub
   cairo_set_source_rgb (cr, 0, 0, 0);
   cairo_paint (cr);
 
-  //sprintf(text,"Version: %s %s", build_date, build_version);
+  //sprintf(text,"Version: %s %s", build_date, version);
   sprintf(text,"Version: %s", version);
   cairo_select_font_face(cr, "FreeMono",
                 CAIRO_FONT_SLANT_NORMAL,

diff --git a/pihpsdr b/pihpsdr
index c318b99f7d4688774b9265ee71b90a55d4947c5c..9936bdd378467b124ab85d130ce81e7a5adbd3e9 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/documentation/piHPSDR-Controller-Users-Guide-v21.odt b/release/documentation/piHPSDR-Controller-Users-Guide-v21.odt
new file mode 100644 (file)
index 0000000..81a1031
Binary files /dev/null and b/release/documentation/piHPSDR-Controller-Users-Guide-v21.odt differ

diff --git a/release/documentation/piHPSDR-Controller-Users-Guide-v21.pdf b/release/documentation/piHPSDR-Controller-Users-Guide-v21.pdf
new file mode 100644 (file)
index 0000000..d17bbfa
Binary files /dev/null and b/release/documentation/piHPSDR-Controller-Users-Guide-v21.pdf differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index fb325c904a7f70b83c89f5d9fd448186e7863b10..7461c19e8fecfd408a0859dc21c4fbe24c9be87b 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index c318b99f7d4688774b9265ee71b90a55d4947c5c..9936bdd378467b124ab85d130ce81e7a5adbd3e9 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ

diff --git a/splash.c b/splash.c
index c021c992b225c8c98876a596054b9ef01d014e57..9dded3e14a36541173af3ec16ace03db80e4b854 100644 (file)
--- a/splash.c
+++ b/splash.c
@@ -69,7 +69,7 @@ void splash_show(char* image_name,int width,int height,int full_screen)
             G_CALLBACK (splash_configure_event_cb), NULL);
 
   char build[64];
-  sprintf(build,"build: %s %s",build_date, build_version);
+  sprintf(build,"build: %s %s",build_date, version);
 
   GtkWidget *pi_label=gtk_label_new("pihpsdr by John Melton g0orx/n6lyt");
   gtk_label_set_justify(GTK_LABEL(pi_label),GTK_JUSTIFY_LEFT);

diff --git a/version.c b/version.c
index c9ca9a94fe0efbecb03ac5c8680e1d4ba2427210..ea575533ac745e8a3e98a4d25e6fc5d7e15d3a99 100644 (file)
--- a/version.c
+++ b/version.c
@@ -20,4 +20,4 @@
 char build_date[]=GIT_DATE;
 char build_version[]=GIT_VERSION;
 
-char version[]="1.0.2";
+char version[]=GIT_VERSION;