[taler-taler-mdb] 02/02: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-mdb.

commit 5e1227f62cc4814284fc1b0a44b1c8f42418f6b2
Merge: 237dbf9 1e464cb
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 24 12:27:54 2020 +0100

    merge

 src/main.c | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 taler.conf |  82 +++++++--------
 2 files changed, 330 insertions(+), 85 deletions(-)

diff --cc src/main.c
index 3110a13,96c26df..2127a7b
--- a/src/main.c
+++ b/src/main.c
@@@ -433,6 -489,16 +496,18 @@@ struct Displa
    struct fb_fix_screeninfo fix_info;
  };
  
+ /**
+  * Handle for the Cancel Button
+  */
+ struct CancelButton
+ {
+   /**
+    * File descriptor to read the state of the cancel button gpio pin
+    */
+   int cancelbuttonfd;
+ };
++
++
  /**
   * DLL of pending refund operations.
   */
@@@ -617,16 -697,8 +712,11 @@@ static char backlight_on = '1'
   */
  static char backlight_off = '0';
  
 -
 +/**
 + * State for the implementation of the 'cancel' button.
 + */
- struct CancelButton
- {
-   int cancelbuttonfd;
- };
- 
  static struct CancelButton cancelButton;
 +
  /**
   * Name of the UART device with the MDB (i.e. /dev/ttyAMA0).
   */

-- 
To stop receiving notification emails like this one, please contact
address@hidden.