waf and compiler gcc6 work in progress

libpsk/include/libpsk/psk/varicode.hpp

@@ -5,18 +5,18 @@
  *      Author: lucck
  */
 
-/* ------------------------------------------------------------------------- */
+
 #ifndef HAM_PSK_INTERNAL_VARICODE_HPP_
 #define HAM_PSK_INTERNAL_VARICODE_HPP_
 
-/* ------------------------------------------------------------------------- */
+
 #include <cstdint>
-/* ------------------------------------------------------------------------- */
+
 namespace ham {
 namespace psk {
 namespace _internal {
 
-/* ------------------------------------------------------------------------- */
+
 class varicode
 {
 	    static constexpr uint8_t code_00_FF[] =
@@ -344,7 +344,7 @@ class varicode
 	    		0xB5B0	// ASCII = 255	101101011011
 	    	};
 public:
-	   constexpr uint8_t reverse( const uint16_t code )
+	   constexpr uint8_t reverse( const uint16_t code ) const
 	   {
 	       return ( code <= 0xFF)?( code_00_FF[code] ) :
 	             (( code >= 0x150 && code <= 0x1FF )?( code_150_1FF[ code - 0x150 ]) :
@@ -352,17 +352,17 @@ public:
 	             ((code >= 0x350 && code <=0x3FF)?(code_350_3FF[ code - 0x350 ]) :
 	             ((code >= 0x550 && code <=0x5AF)?(code_550_5AF[ code - 0x550 ]) :(0)))));
 	   }
-	   constexpr uint16_t forward( const uint8_t idx )
+	   constexpr uint16_t forward( const uint8_t idx ) const
 	   {
 		   return fwd_code_tbl[idx];
 	   }
 };
-/* ------------------------------------------------------------------------- */
+
 } /* namespace _internal */
-/* ------------------------------------------------------------------------- */
+
 } /* namespace psk */
-/* ------------------------------------------------------------------------- */
+
 } /* namespace ham */
-/* ------------------------------------------------------------------------- */
+
 #endif /* VARICODE_HPP_ */
-/* ------------------------------------------------------------------------- */
+

libpsk/src/ham/ham_digi.cpp

@@ -6,7 +6,7 @@
  */
 /* ------------------------------------------------------------------------- */
 #include "libpsk/ham/ham_digi.hpp"
-#ifndef COMPILED_UNDER_ISIX
+#ifndef __arm__
 #include "libpsk/port/pulse/pulse_device.hpp"
 #else
 #include "libpsk/port/isix/stm32adac_device.hpp"
@@ -28,7 +28,7 @@ namespace {
 		std::abort();
 #endif
 	}
-#ifndef COMPILED_UNDER_ISIX
+#ifndef __arm__
 	inline trx_device_base* create_default_device( ham_digi::handler_t h )
 	{
 		static constexpr auto sys_idx = ham_digi::SYS_CALLBACK_ID;

libpsk/src/port/isix/stm32adac_device.cpp

@@ -26,7 +26,7 @@ namespace psk {
 namespace {
 namespace ptt {
 	namespace gpio {
-		static constexpr auto port = CONFIG_LIBPSK_PTT_PORT;
+		static const auto port = CONFIG_LIBPSK_PTT_PORT;
 		static constexpr auto pin = CONFIG_LIBPSK_PTT_PIN;
 	};
 		//! Init PTT ports

wscript

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+def options(opt):
+    pass
+
+def configure(conf):
+    pass
+
+def build(bld):
+    src =  bld.path.ant_glob( 'libpsk/src/codec/*.cpp' )
+    src += bld.path.ant_glob( 'libpsk/src/ham/*.cpp' )
+    src += bld.path.ant_glob( 'libpsk/src/psk/*.cpp' )
+    src += bld.path.ant_glob( 'libpsk/src/port/isix/*.cpp' )
+    inc = ['libpsk/include' ]
+    bld.stlib( source=src,
+            includes = inc, export_includes=inc,
+            target='psk', use=['foundation', 'stm32' ]
+    )