gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-mdb] branch master updated: updated readme


From: gnunet
Subject: [taler-taler-mdb] branch master updated: updated readme
Date: Tue, 24 Dec 2019 17:12:18 +0100

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

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

The following commit(s) were added to refs/heads/master by this push:
     new d53044f  updated readme
d53044f is described below

commit d53044f1fe2e0bb8d30a8895f826aa2cc75272bb
Author: Boss Marco <address@hidden>
AuthorDate: Tue Dec 24 17:12:12 2019 +0100

    updated readme
---
 README     | 49 ++++++++++++++++++++++++++++---------------------
 src/main.c | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/README b/README
index 0d991cf..3afe614 100644
--- a/README
+++ b/README
@@ -1,43 +1,50 @@
-# Project: GNU Taler snack machine
+# GNU Taler snack machine
 
 #### Author(s)
   * BOSS Marco
   * HOFER Dominik
   * GROTHOFF Christian
 
-#### Prerequisite
+#### Prequisites
   * GNU gcc tool-chain
   * C standard libraries
   * libnfc
-  * libcurl
-  * pthread
+  * libcurl/libgnurl
+  * libjansson
   * GNU make
-  * GNUnet
+  * GNUNet
   * GNU Taler (exchange + merchant)
+  * libqrencode (optional)
 
 #### Tested on
   * Ubuntu LTS (18.04)
+  * Raspian Lite (4.19)
 
-#### Description
-  This is a app to run a snack machine as Taler merchant with NFC payment 
interface.
+#### Hardware used for prototype
+  * Raspberry Pi 3B+
+  * ACR122U NFC USB reader
+  * MDB/ICP Converter from Shanghai Wafer Microelectronics
+  * Adafruit PiTFT 3.5" display
 
-#### Tasks
-  Improve documentation
-  Integration testing
+#### Description
+This is a app to run a snack machine as Taler merchant with NFC payment 
interface.
+Optionally there can a QRCode be shown on a display to get the payment link.
 
 #### Remarks
-  * When using an ACR122 device there may be problems with libnfc, see libnfc 
for further information
+  * When using an ACR122 device there may be problems with libnfc.
+    [see here](https://github.com/nfc-tools/libnfc) for further information 
+  * At the moment there is no option to cross compile
 
-#### Noticeable points
-  * Taler wallet does not receive a second message when the payment was 
aborted, the wallet
-    has to be started again to receive a message via nfc
-  * Wallet does not show succes url string
+#### Build
+Building should be easily done with the following three commands:
 
+  ```bash
+  ./bootstrap
+  ./configure
+  make
+  ```
 
-===================
+#### Configuration
+To configure the merchants backend and the product numbers of the snack 
machine edit
+taler.conf file.
 
-TODO:
-- generate upper-case URLs once wallet supports TALER://
-- document your functions Doxygen-style, in particular
-  you must document every function, every argument,
-  every struct, every member of every struct
diff --git a/src/main.c b/src/main.c
index 6b2955d..c62c352 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,7 @@ along with
 /**
 * @file main.c
 * @brief main functionality of the application
-* @author Boss Marco
+* @author Marco Boss
 * @author Christian Grothoff
 * @author Dominik Hofer
 *
@@ -1756,7 +1756,7 @@ write_mdb_command (void *cls)
       chkSum += mdb.txBuffer[idx] = mdb.cmd->cmd.bin[idx];
     for (size_t idx = 0; idx < mdb.cmd->data.bin_size; idx++)
       chkSum += mdb.txBuffer[idx + mdb.cmd->cmd.bin_size] =
-        mdb.cmd->data.bin[idx];
+                  mdb.cmd->data.bin[idx];
     mdb.txBuffer[mdb.cmd->cmd.bin_size + mdb.cmd->data.bin_size] =
       (uint8_t) (chkSum & 0xFF);
   }
@@ -1930,9 +1930,9 @@ handle_command (const char *hex,
       }
       break;
     }
-       case VMC_REVALUE:
-       {       
-                       unsigned int subcmd;
+  case VMC_REVALUE:
+    {
+      unsigned int subcmd;
 
       if (4 > hex_len)
       {
@@ -1955,27 +1955,27 @@ handle_command (const char *hex,
       case VMC_REVALUE_REQUEST:
         {
           GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Received request for revalue via MDB\n");
-                       mdb.cmd = &revalueApproved;
+                      "Received request for revalue via MDB\n");
+          mdb.cmd = &revalueApproved;
+          break;
+        }
+      case VMC_REVALUE_LIMIT_REQUEST:
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                      "Received request for revalue limit amount via MDB\n");
+          mdb.cmd = &revalueAmount;
           break;
         }
-                       case VMC_REVALUE_LIMIT_REQUEST:
-                               {
-                                       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Received request for revalue limit amount via MDB\n");
-                       mdb.cmd = &revalueAmount;
-                                       break;
-                               }
-                       default:
+      default:
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                     "Unknown MDB sub-command %X of command %X\n",
                     subcmd,
                     cmd);
         break;
-                       }
-               break; 
-       }
-       case VMC_CONF:
+      }
+      break;
+    }
+  case VMC_CONF:
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Received request for configuration via MDB\n");
     mdb.cmd = &readerConfigData;
@@ -2728,13 +2728,13 @@ main (int argc,
   endSession = setup_mdb_cmd ("End Session",
                               READER_END_SESSION,
                               NULL);
-       revalueApproved = setup_mdb_cmd ("Reader Approve Revalue",
-                              READER_REVALUE_APPROVED,
-                              NULL);
+  revalueApproved = setup_mdb_cmd ("Reader Approve Revalue",
+                                   READER_REVALUE_APPROVED,
+                                   NULL);
 
-       revalueAmount = setup_mdb_cmd ("Send Revalue Limit Amount",
-                              READER_REVALUE_LIMIT,
-                              READER_REVALUE_LIMIT_AMOUNT);
+  revalueAmount = setup_mdb_cmd ("Send Revalue Limit Amount",
+                                 READER_REVALUE_LIMIT,
+                                 READER_REVALUE_LIMIT_AMOUNT);
 
   ret = GNUNET_PROGRAM_run (argc,
                             argv,

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]