fixed embarrassing typos

Makefile

@@ -37,7 +37,7 @@ MOVE          = mv -f
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 DISTNAME      = pigbin1.0.0
-DISTDIR = /home/pi/share/projects.nxt/libPiGPIO/.tmp/pigbin1.0.0
+DISTDIR = /home/pi/gitea.current/libpigpio/.tmp/pigbin1.0.0
 LINK          = g++
 LFLAGS        = -Wl,-O1
 LIBS          = $(SUBLIBS) -lpigpiod_if2 -lrt -pthread /usr/lib/arm-linux-gnueabihf/libQt5Widgets.so /usr/lib/arm-linux-gnueabihf/libQt5Gui.so /usr/lib/arm-linux-gnueabihf/libQt5Network.so /usr/lib/arm-linux-gnueabihf/libQt5Core.so -lGLESv2 -lpthread -latomic   
@@ -146,12 +146,6 @@ DIST          = /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_printsupport.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qml.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmltest.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_quick.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_sql.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_sql_private.pri \
@@ -161,11 +155,11 @@ DIST          = /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_widgets.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_x11extras.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xml.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_Qt5Keychain.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/qt_functions.prf \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/qt_config.prf \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake.conf \
@@ -290,12 +284,6 @@ Makefile: libPiGPIO.pro /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_printsupport.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qml.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmltest.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_quick.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_sql.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_sql_private.pri \
@@ -305,11 +293,11 @@ Makefile: libPiGPIO.pro /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_widgets.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_x11extras.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xml.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_Qt5Keychain.pri \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/qt_functions.prf \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/qt_config.prf \
 		/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake.conf \
@@ -380,12 +368,6 @@ Makefile: libPiGPIO.pro /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_printsupport.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qml.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmlmodels.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmltest.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_quick.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_quickwidgets.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_service_support_private.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_sql.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_sql_private.pri:
@@ -395,11 +377,11 @@ Makefile: libPiGPIO.pro /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_widgets.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
-/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_x11extras.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xml.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/modules/qt_Qt5Keychain.pri:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/qt_functions.prf:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/features/qt_config.prf:
 /usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++/qmake.conf:
@@ -501,7 +483,7 @@ moc_QtGPIOMain.cpp: QtGPIOMain.h \
 		pigpin.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/pi/share/projects.nxt/libPiGPIO/moc_predefs.h -I/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++ -I/home/pi/share/projects.nxt/libPiGPIO -I/home/pi/share/projects.nxt/libPiGPIO -I/home/pi/share/projects.nxt/libPiGPIO/sigslot/include/sigslot -I/usr/include/arm-linux-gnueabihf/qt5 -I/usr/include/arm-linux-gnueabihf/qt5/QtWidgets -I/usr/include/arm-linux-gnueabihf/qt5/QtGui -I/usr/include/arm-linux-gnueabihf/qt5/QtNetwork -I/usr/include/arm-linux-gnueabihf/qt5/QtCore -I/usr/include/c++/10 -I/usr/include/arm-linux-gnueabihf/c++/10 -I/usr/include/c++/10/backward -I/usr/lib/gcc/arm-linux-gnueabihf/10/include -I/usr/local/include -I/usr/include/arm-linux-gnueabihf -I/usr/include QtGPIOMain.h -o moc_QtGPIOMain.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/pi/gitea.current/libpigpio/moc_predefs.h -I/usr/lib/arm-linux-gnueabihf/qt5/mkspecs/linux-g++ -I/home/pi/gitea.current/libpigpio -I/home/pi/gitea.current/libpigpio -I/home/pi/gitea.current/libpigpio/sigslot/include/sigslot -I/usr/include/arm-linux-gnueabihf/qt5 -I/usr/include/arm-linux-gnueabihf/qt5/QtWidgets -I/usr/include/arm-linux-gnueabihf/qt5/QtGui -I/usr/include/arm-linux-gnueabihf/qt5/QtNetwork -I/usr/include/arm-linux-gnueabihf/qt5/QtCore -I/usr/include/c++/10 -I/usr/include/arm-linux-gnueabihf/c++/10 -I/usr/include/c++/10/backward -I/usr/lib/gcc/arm-linux-gnueabihf/10/include -I/usr/local/include -I/usr/include/arm-linux-gnueabihf -I/usr/include QtGPIOMain.h -o moc_QtGPIOMain.cpp
 
 compiler_moc_objc_header_make_all:
 compiler_moc_objc_header_clean:

QtGPIOMain.h

@@ -17,7 +17,6 @@
 
 #include <QMainWindow>
 #include <ui_QtGPIOMain.h>
-#include <iostream>
 #include <pigrotarydial.h>
 
 

libpigcore.h

@@ -27,7 +27,6 @@
 
 
 #include <string>
-#include <iostream>
 #include <signal.hpp>
 
 #include <libpigpio.h>

libpiglinux.cpp

@@ -113,7 +113,6 @@ int pigLinux::set_level( bcm_t bcm , level_t level )
 //This function sends a trigger pulse to a GPIO. The GPIO is set to level for pulseLen microseconds and then reset to not level.
 int pigLinux::trigger_level( bcm_t bcm ,  level_t level, uint32_t pulseLen )
 {
-    //int trigger_level(int pi, unsigned user_gpio, unsigned pulseLen, unsigned level)
     int result = ::gpio_trigger( _Pi, (unsigned) bcm, pulseLen, level ); ;
     if( result < 0 )
         return show_error( result );
@@ -123,8 +122,6 @@ int pigLinux::trigger_level( bcm_t bcm ,  level_t level, uint32_t pulseLen )
 
 int pigLinux::wait_for_edge( bcm_t bcm , edge_t edge, double tout )
 {
-    //std::cout  << " --pigLinux::wait_for_edge: " << (uint32_t) bcm << " : " << (uint32_t) edge << std::endl;
-
     int result = ::wait_for_edge( _Pi, (unsigned) bcm, (unsigned) edge, tout );
     if( result < 0 )
         return show_error( result );
@@ -135,13 +132,6 @@ int pigLinux::wait_for_edge( bcm_t bcm , edge_t edge, double tout )
 
 int pigLinux::set_callback( bcm_t bcm, pigCall* fn, edge_t edge )
 {
-    //std::cout  << " --pigLinux::set_callback: " << (uint32_t) bcm << " : " << (uint32_t) edge << std::endl;
-
-    /// typedef int (*CBFuncEx_t)(int pi, unsigned user_gpio, unsigned level, uint32_t tick, int * userdata );
-    ///int callback_ex(int pi, unsigned user_gpio, unsigned edge, CBFuncEx_t f, int *userdata)
-    //int result = cbId = ::callback_ex( _Pi, (unsigned) bcm, (unsigned) edge, trigger, widget );
-    //int result = ::callback_ex( _Pi, (unsigned) bcm, (unsigned) edge, trigger, widget );
-
     int result = ::callback_ex( _Pi, (unsigned) bcm, (unsigned) edge, trigger, fn );
     if( result < 0 )
        return show_error( result );
@@ -229,7 +219,6 @@ int pigLinux::i2c_write_i2c_block_data( pigI2C& i2c, unsigned reg, char* buf, un
         return show_error( result );
     return result;
 }
-
 */
 
 int pigLinux::i2c_write_device( pigI2C& i2c, char* buf, unsigned count )
@@ -265,8 +254,6 @@ int pigLinux::i2c_read_word_data( pigI2C& i2c, unsigned reg )
     return result;
 }
 
-
-
 int pigLinux::i2c_read_block_data( pigI2C& i2c, unsigned reg, char* buf )
 {
     int result = ::i2c_read_block_data( _Pi, i2c.handle, reg, buf );
@@ -361,7 +348,6 @@ uint32_t pigLinux::get_current_tick()
 
 int pigLinux::show_error( int error )
 {
-
     std::cout << "Error: " << ::pigpio_error( error ) << std::endl;
     return error;
 }

libpigpio.cpp

@@ -167,6 +167,7 @@ namespace pigpio
         return get_instance().
     }
     */
+
     int i2c_write_device( pigI2C& i2c, char* buf, unsigned count )
     {
         return get_instance().i2c_write_device( i2c,  buf, count );

libpigpio.h

@@ -39,8 +39,6 @@
 #  define LIBPIGPIO_EXPORT Q_DECL_IMPORT
 #endif
 
-#include <chrono>
-#include <thread>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
@@ -48,7 +46,6 @@
 #include <cstdint>
 #include <string>
 #include <signal.hpp>
-#include <time.h>
 
 struct pigI2C;
 class pigCall;
@@ -95,10 +92,10 @@ namespace pigpio
 
         bcm05   =  5,
         bcm06   =  6,
-        bcm13   =  7,
+        bcm13   = 13,
 
         bcm19   = 19,
-        bcm26   =  9,
+        bcm26   = 26,
 
         /// right side, pin 2,4 .. 40
 
@@ -111,7 +108,7 @@ namespace pigpio
 
         bcm25   = 25,
         bcm08   =  8,
-        bcm07   = 07,
+        bcm07   =  7,
 
         bcm12   = 12,
 
@@ -174,13 +171,13 @@ namespace pigpio
 
     [[maybe_unused]] constexpr static bcm_t bcm05   = bcm_t::bcm05;
     [[maybe_unused]] constexpr static bcm_t bcm06   = bcm_t::bcm06;
-    [[maybe_unused]] constexpr static bcm_t bcm13   = bcm_t::bcm07;
+    [[maybe_unused]] constexpr static bcm_t bcm13   = bcm_t::bcm13;
 
     [[maybe_unused]] constexpr static bcm_t bcm19   = bcm_t::bcm19;
-    [[maybe_unused]] constexpr static bcm_t bcm26   = bcm_t::bcm09;
+    [[maybe_unused]] constexpr static bcm_t bcm26   = bcm_t::bcm26;
 
     /// right side, pin 2,4 .. 40
-    [[maybe_unused]] constexpr static bcm_t bcm14   = bcm_t::bcm04;
+    [[maybe_unused]] constexpr static bcm_t bcm14   = bcm_t::bcm14;
     [[maybe_unused]] constexpr static bcm_t bcm15   = bcm_t::bcm15;
     [[maybe_unused]] constexpr static bcm_t bcm18   = bcm_t::bcm18;
 

main.cpp

@@ -81,9 +81,9 @@ int main( int argc, char** argv )
     // It usually does nothing more than flash an LED or 2.
     //                                    (Gordon Henderson, WiringPi )
 
-    pigLCD lcd( 0x27 );
+    //pigLCD lcd( 0x27 );
-    lcd.set_backlight( on );
+    //lcd.set_backlight( on );
-    lcd.write( 0, 0, "blink!" );
+    //lcd.write( 0, 0, "blink!" );
 
     /*
     on_level( 1 );
@@ -118,10 +118,10 @@ int main( int argc, char** argv )
     //pigRotaryDial dial( board17, board27, board22 );
 
     // für die raDIYo-Verdrahtung:
-    pigRotaryDial dialA( bcm16, bcm20, bcm21 );
+    //pigRotaryDial dialA( bcm16, bcm20, bcm21 );
     pigRotaryDial dialB( bcm05, bcm13, bcm06 );
 
-    dialA.sigValue.connect( [&](int value){  cout << "Dial A: " << value << endl; } );
+    //dialA.sigValue.connect( [&](int value){  cout << "Dial A: " << value << endl; } );
     dialB.sigValue.connect( [&](int value){  cout << "Dial B: " << value << endl; } );
 
 

pigpin.cpp

@@ -26,9 +26,6 @@
 #include <libpigcore.h>
 
 
-//using namespace pigpio;
-
-
 pigPin::pigPin( bcm_t bcmNo, io_t modeNo, pud_t pudType )
 {
     init( bcmNo, modeNo, pudType );

pigrotarydial.cpp

@@ -46,7 +46,7 @@ pigRotaryDial::pigRotaryDial()
 
 pigRotaryDial::pigRotaryDial( pigpio::bcm_t bcmButton, pigpio::bcm_t bcmUp, pigpio::bcm_t bcmDown )
 {
-    init( bcmButton, bcmDown, bcmUp );
+    init( bcmButton, bcmUp, bcmDown );
 }
 
 
@@ -60,19 +60,14 @@ void pigRotaryDial::init( pigpio::bcm_t bcmButton, pigpio::bcm_t bcmUp, pigpio::
 {
 
     pigButton::init( bcmButton );
-    /*
-    _pinButton.init( bcmButton, pull_up );
-    _pinButton.set_callback( this, falling );
-    _pinButton.set_glitch_filter( 500 );
-    */
 
     _pinUp.init( bcmUp, pull_up );
     _pinUp.set_callback( this );
-    _pinUp.set_glitch_filter( 500 );
+    _pinUp.set_glitch_filter( 1000 );
 
     _pinDown.init( bcmDown, pull_up );
     _pinDown.set_callback( this );
-    _pinDown.set_glitch_filter( 500 );
+    _pinDown.set_glitch_filter( 1000 );
 
     _oldState = ( _pinUp.get_level() << 1 ) | _pinDown.get_level();
 
@@ -89,15 +84,11 @@ void pigRotaryDial::reset()
 
 void pigRotaryDial::trigger( pigpio::bcm_t bcm, uint32_t level )
 {
-
-    //std::cout  << " -- pigRotaryDial::trigger: " << (uint32_t) bcm << " : " << level << std::endl;
-
      if( level == pigpio::TimeOut )
          return;
 
      if( bcm ==_pinIn.bcm  )
      {
-         //std::cout << "pigButton::trigger " << (uint32_t) bcm << " : " << level << std::endl;
          // simply on/off
          toggle_state();
          return;
@@ -113,7 +104,6 @@ void pigRotaryDial::trigger( pigpio::bcm_t bcm, uint32_t level )
 
      if( inc )
      {
-         //std::cout << "dial: " << inc << std::endl;
          _oldState = newState;
          //int detent = _value / 4;
          _value += inc;
@@ -122,7 +112,6 @@ void pigRotaryDial::trigger( pigpio::bcm_t bcm, uint32_t level )
          //    handlePulse( _step / 4 );
          //handlePulse( _step );
 
-
          sigValue( _value );
      }