diff --git a/ChronoReader b/ChronoReader
index c9611c9..3c768fb 160000
--- a/ChronoReader
+++ b/ChronoReader
@@ -1 +1 @@
-Subproject commit c9611c93c53e031abff068ed694ad677b10453bc
+Subproject commit 3c768fbc3dc8f8a39e5703d0325735e8bb25ce08
diff --git a/FenPrincipale.cpp b/FenPrincipale.cpp
index d81a4ca..473b1db 100644
--- a/FenPrincipale.cpp
+++ b/FenPrincipale.cpp
@@ -127,6 +127,8 @@ FenPrincipale::FenPrincipale(Serial* _com) {
     connect(myDecoder,SIGNAL(newValue(int,int,double)), sensormgr, SLOT(newValue(int,int,double)));
     connect(myDecoder,SIGNAL(message(QString)),this,SLOT(log_decoder(QString)));
     connect(myDecoder,SIGNAL(trame_erreur(int)),this, SLOT(incrementStatTramesEchouees(int)));
+    connect(myDecoder,SIGNAL(trame_increment(int)),this,SLOT(incrementStatTramesRecues(int)));
+    connect(myDecoder,SIGNAL(trame_corrigee(int)),this,SLOT(incrementStatTramesCorrigees(int)));
     log_logger("[INFO] All started !");
     // -----------------------------
     // Prise en charge du port série
@@ -168,6 +170,7 @@ FenPrincipale::FenPrincipale(Serial* _com) {
     nTramesRecues = 0;
     nTramesEchouees = 0;
     nBytesRecus = 0;
+    nTramesCorrigees = 0;
     QTimer* teemo = new QTimer();
     connect(teemo, SIGNAL(timeout()), stmgr, SLOT(render()));
     teemo->setSingleShot(true);
@@ -236,9 +239,8 @@ void FenPrincipale::syncTime() {
  * Gestion des données
  */
 void FenPrincipale::informationsReceived(QList<QByteArray> trames) {
-    incrementStatTramesRecues(trames.size());
-
     if(trames.size() > 0) {
+
         for(int i=0;i<trames.size();i++) {
             myDecoder->decodeString(trames[i]);
         }
@@ -350,7 +352,10 @@ void FenPrincipale::incrementStatTramesEchouees(int n) {
     nTramesEchouees += n;
     stats_trames_echouees->setText("Trames échouées: "+QString::number(nTramesEchouees));
 }
-
+void FenPrincipale::incrementStatTramesCorrigees(int n) {
+    nTramesCorrigees += n;
+    stats_trames_corrigees->setText("Trames corrigées: "+QString::number(nTramesCorrigees));
+}
 
 /*
  * Gestion des actions du menu supérieur (tout comme le jambon)
@@ -405,6 +410,26 @@ void FenPrincipale::on_action9600_triggered() {com->setBaudrate(9600);}
 void FenPrincipale::on_action137050_triggered() {com->setChannel(21);}
 void FenPrincipale::on_action137500_triggered(){ com->setChannel(30);}
 
+void FenPrincipale::on_actionEntrer_le_canal_manuellement_triggered()
+{
+    QStringList canaux;
+    for(int i=0;i<=30;i++) {
+        canaux.append(QString::number(136.000 + 0.050*i, 'f', 3) + " MHz");
+    }
+    QString item = QInputDialog::getItem(this,"Choisir le canal","", canaux, 21, false);
+
+    int index = canaux.indexOf(item);
+    com->setChannel(index);
+
+    action137050->setChecked(false);
+    action137500->setChecked(false);
+
+    if(index == 21)
+        action137050->setChecked(true);
+    else if(index == 30)
+        action137500->setChecked(true);
+}
+
 /*
  * Gestion des boutons du menu de gauche
  */
@@ -869,3 +894,4 @@ void FenPrincipale::on_actionPasser_l_tape_pr_c_dente_triggered()
 {
     stmgr->goToPreviousStage();
 }
+
diff --git a/FenPrincipale.h b/FenPrincipale.h
index 4485090..b6dd337 100644
--- a/FenPrincipale.h
+++ b/FenPrincipale.h
@@ -16,6 +16,7 @@
 #include <QPair>
 #include <QMdiSubWindow>
 #include <QMessageBox>
+#include <QInputDialog>
 
 #include "ui_FenPrincipale.h"
 #include "InPut/sensormanager.h"
@@ -106,6 +107,7 @@ class FenPrincipale : public QMainWindow, public Ui::FenPrincipale
 
         int                     nTramesRecues;
         int                     nTramesEchouees;
+        int                     nTramesCorrigees;
         int                     nBytesRecus;
         StagesManager* stmgr;
 
@@ -134,7 +136,7 @@ class FenPrincipale : public QMainWindow, public Ui::FenPrincipale
         void incrementStatBytesRecus(int n);
         void incrementStatTramesRecues(int n);
         void incrementStatTramesEchouees(int n);
-
+        void incrementStatTramesCorrigees(int n);
 
 
         // Slots de type event sur ui
@@ -178,6 +180,7 @@ private slots:
         void on_actionPasser_l_tape_suivante_triggered();
         void on_actionRemettre_z_ro_triggered();
         void on_actionPasser_l_tape_pr_c_dente_triggered();
+        void on_actionEntrer_le_canal_manuellement_triggered();
 };
 
 #endif // FENPRINCIPALE_H
diff --git a/FenPrincipale.ui b/FenPrincipale.ui
index 8bc5277..36a9a42 100644
--- a/FenPrincipale.ui
+++ b/FenPrincipale.ui
@@ -577,6 +577,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="stats_trames_corrigees">
+            <property name="text">
+             <string>Trames corrigées: 0</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>
@@ -624,6 +631,7 @@
      </property>
      <addaction name="action137050"/>
      <addaction name="action137500"/>
+     <addaction name="actionEntrer_le_canal_manuellement"/>
     </widget>
     <addaction name="actionOuvrir"/>
     <addaction name="menuFrequence"/>
@@ -746,6 +754,11 @@
     <string>Passer à l'étape précédente</string>
    </property>
   </action>
+  <action name="actionEntrer_le_canal_manuellement">
+   <property name="text">
+    <string>Canal manuel</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/InPut/cookiedecoder.cpp b/InPut/cookiedecoder.cpp
index 802579c..e83e152 100644
--- a/InPut/cookiedecoder.cpp
+++ b/InPut/cookiedecoder.cpp
@@ -1,13 +1,67 @@
 #include "cookiedecoder.h"
+#include "ReedSalomon/char.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include <iostream>
 
 CookieDecoder::CookieDecoder(){}
 
 
 void CookieDecoder::decodeString(QByteArray(&data)) {
+    qDebug() << "data size: " << data.size() ;
+    if(data.size() < 41)
+        return;
+
+    char trame[19];
+    char code_correcteur[20];
+
+
+
+
+    qDebug() << "trame:" << trame << "code correcteur:" << code_correcteur;
+    emit trame_increment(1);
+
+
+    char to_decode [255];
+    char backup_decode [255];
+
+    for(int i=0;i<255;i++) {
+        to_decode[i] = 0;
+    }
+
+    void* rs = init_rs_char(8, 285, 1, 1, 20);
+
+    if (rs == NULL) {
+        qDebug() << "RS_INIT_FAILED";
+    } else {
+        qDebug() << "RS_INIT_OK";
+    }
+
+    for(int i=0;i<19;i++) {
+        to_decode[i] = data.at(i);
+    }
+
+    for(int i=0;i<20;i++) {
+        to_decode[235+i] = data.at(19+i);
+    }
 
-    QString str(data);
+    strcpy(backup_decode, to_decode);
+
+    int result = decode_rs_char(rs, (unsigned char*)to_decode, NULL, 0);
+    if(result == -1)
+        qDebug() << "ERREUR DE CORRECTION";
+
+    if(strcmp(backup_decode, to_decode) != 0) { //gg, code corrigé
+        emit trame_corrigee(1);
+    }
+
+    QString str;
+    for(int i=1;i<19;i++)
+        str.push_back(to_decode[i]);
 
     QStringList elements = str.split("$");
+
     emit message("Trame: "+str);
     if(elements.size() < 6) {
         if(elements.size()>1) {
@@ -54,3 +108,357 @@ char CookieDecoder::get_checksum(QByteArray trame) {
 
     return XOR;
 }
+
+
+
+#define NULL ((void *)0)
+
+void FREE_RS(void *p){
+  struct rs *rs = (struct rs *)p;
+
+  free(rs->alpha_to);
+  free(rs->index_of);
+  free(rs->genpoly);
+  free(rs);
+}
+
+/* Initialize a Reed-Solomon codec
+ * symsize = symbol size, bits (1-8)
+ * gfpoly = Field generator polynomial coefficients
+ * fcr = first root of RS code generator polynomial, index form
+ * prim = primitive element to generate polynomial roots
+ * nroots = RS code generator polynomial degree (number of roots)
+ */
+void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned fcr,unsigned prim,
+        unsigned int nroots){
+  struct rs *rs;
+  int i, j, sr,root,iprim;
+
+  if(symsize > 8*sizeof(DTYPE))
+    return NULL; /* Need version with ints rather than chars */
+
+  if(fcr >= (1<<symsize))
+    return NULL;
+  if(prim == 0 || prim >= (1<<symsize))
+    return NULL;
+  if(nroots >= (1<<symsize))
+    return NULL; /* Can't have more roots than symbol values! */
+
+  rs = (struct rs *)calloc(1,sizeof(struct rs));
+  rs->mm = symsize;
+  rs->nn = (1<<symsize)-1;
+
+  rs->alpha_to = (DTYPE *)malloc(sizeof(DTYPE)*(rs->nn+1));
+  if(rs->alpha_to == NULL){
+    free(rs);
+    return NULL;
+  }
+  rs->index_of = (DTYPE *)malloc(sizeof(DTYPE)*(rs->nn+1));
+  if(rs->index_of == NULL){
+    free(rs->alpha_to);
+    free(rs);
+    return NULL;
+  }
+
+  /* Generate Galois field lookup tables */
+  rs->index_of[0] = A0; /* log(zero) = -inf */
+  rs->alpha_to[A0] = 0; /* alpha**-inf = 0 */
+  sr = 1;
+  for(i=0;i<rs->nn;i++){
+    rs->index_of[sr] = i;
+    rs->alpha_to[i] = sr;
+    sr <<= 1;
+    if(sr & (1<<symsize))
+      sr ^= gfpoly;
+    sr &= rs->nn;
+  }
+  if(sr != 1){
+    /* field generator polynomial is not primitive! */
+    free(rs->alpha_to);
+    free(rs->index_of);
+    free(rs);
+    return NULL;
+  }
+
+  /* Form RS code generator polynomial from its roots */
+  rs->genpoly = (DTYPE *)malloc(sizeof(DTYPE)*(nroots+1));
+  if(rs->genpoly == NULL){
+    free(rs->alpha_to);
+    free(rs->index_of);
+    free(rs);
+    return NULL;
+  }
+  rs->fcr = fcr;
+  rs->prim = prim;
+  rs->nroots = nroots;
+
+  /* Find prim-th root of 1, used in decoding */
+  for(iprim=1;(iprim % prim) != 0;iprim += rs->nn)
+    ;
+  rs->iprim = iprim / prim;
+
+  rs->genpoly[0] = 1;
+  for (i = 0,root=fcr*prim; i < nroots; i++,root += prim) {
+    rs->genpoly[i+1] = 1;
+
+    /* Multiply rs->genpoly[] by  @**(root + x) */
+    for (j = i; j > 0; j--){
+      if (rs->genpoly[j] != 0)
+    rs->genpoly[j] = rs->genpoly[j-1] ^ rs->alpha_to[modnn(rs,rs->index_of[rs->genpoly[j]] + root)];
+      else
+    rs->genpoly[j] = rs->genpoly[j-1];
+    }
+    /* rs->genpoly[0] can never be zero */
+    rs->genpoly[0] = rs->alpha_to[modnn(rs,rs->index_of[rs->genpoly[0]] + root)];
+  }
+  /* convert rs->genpoly[] to index form for quicker encoding */
+  for (i = 0; i <= nroots; i++)
+    rs->genpoly[i] = rs->index_of[rs->genpoly[i]];
+
+  return rs;
+}
+
+#define NULL ((void *)0)
+#define	min(a,b)	((a) < (b) ? (a) : (b))
+
+int DECODE_RS(
+#ifndef FIXED
+void *p,
+#endif
+DTYPE *data, int *eras_pos, int no_eras){
+
+#ifndef FIXED
+  struct rs *rs = (struct rs *)p;
+#endif
+  int deg_lambda, el, deg_omega;
+  int i, j, r,k;
+  DTYPE u,q,tmp,num1,num2,den,discr_r;
+  DTYPE lambda[NROOTS+1], s[NROOTS];	/* Err+Eras Locator poly
+                     * and syndrome poly */
+  DTYPE b[NROOTS+1], t[NROOTS+1], omega[NROOTS+1];
+  DTYPE root[NROOTS], reg[NROOTS+1], loc[NROOTS];
+  int syn_error, count;
+
+  /* form the syndromes; i.e., evaluate data(x) at roots of g(x) */
+  for(i=0;i<NROOTS;i++)
+    s[i] = data[0];
+
+  for(j=1;j<NN;j++){
+    for(i=0;i<NROOTS;i++){
+      if(s[i] == 0){
+    s[i] = data[j];
+      } else {
+    s[i] = data[j] ^ ALPHA_TO[MODNN(INDEX_OF[s[i]] + (FCR+i)*PRIM)];
+      }
+    }
+  }
+
+  /* Convert syndromes to index form, checking for nonzero condition */
+  syn_error = 0;
+  for(i=0;i<NROOTS;i++){
+    syn_error |= s[i];
+    s[i] = INDEX_OF[s[i]];
+  }
+
+  if (!syn_error) {
+    /* if syndrome is zero, data[] is a codeword and there are no
+     * errors to correct. So return data[] unmodified
+     */
+    count = 0;
+    goto finish;
+  }
+  memset(&lambda[1],0,NROOTS*sizeof(lambda[0]));
+  lambda[0] = 1;
+
+  if (no_eras > 0) {
+    /* Init lambda to be the erasure locator polynomial */
+    lambda[1] = ALPHA_TO[MODNN(PRIM*(NN-1-eras_pos[0]))];
+    for (i = 1; i < no_eras; i++) {
+      u = MODNN(PRIM*(NN-1-eras_pos[i]));
+      for (j = i+1; j > 0; j--) {
+    tmp = INDEX_OF[lambda[j - 1]];
+    if(tmp != A0)
+      lambda[j] ^= ALPHA_TO[MODNN(u + tmp)];
+      }
+    }
+
+#if DEBUG >= 1
+    /* Test code that verifies the erasure locator polynomial just constructed
+       Needed only for decoder debugging. */
+
+    /* find roots of the erasure location polynomial */
+    for(i=1;i<=no_eras;i++)
+      reg[i] = INDEX_OF[lambda[i]];
+
+    count = 0;
+    for (i = 1,k=IPRIM-1; i <= NN; i++,k = MODNN(k+IPRIM)) {
+      q = 1;
+      for (j = 1; j <= no_eras; j++)
+    if (reg[j] != A0) {
+      reg[j] = MODNN(reg[j] + j);
+      q ^= ALPHA_TO[reg[j]];
+    }
+      if (q != 0)
+    continue;
+      /* store root and error location number indices */
+      root[count] = i;
+      loc[count] = k;
+      count++;
+    }
+    if (count != no_eras) {
+      printf("count = %d no_eras = %d\n lambda(x) is WRONG\n",count,no_eras);
+      count = -1;
+      goto finish;
+    }
+#if DEBUG >= 2
+    printf("\n Erasure positions as determined by roots of Eras Loc Poly:\n");
+    for (i = 0; i < count; i++)
+      printf("%d ", loc[i]);
+    printf("\n");
+#endif
+#endif
+  }
+  for(i=0;i<NROOTS+1;i++)
+    b[i] = INDEX_OF[lambda[i]];
+
+  /*
+   * Begin Berlekamp-Massey algorithm to determine error+erasure
+   * locator polynomial
+   */
+  r = no_eras;
+  el = no_eras;
+  while (++r <= NROOTS) {	/* r is the step number */
+    /* Compute discrepancy at the r-th step in poly-form */
+    discr_r = 0;
+    for (i = 0; i < r; i++){
+      if ((lambda[i] != 0) && (s[r-i-1] != A0)) {
+    discr_r ^= ALPHA_TO[MODNN(INDEX_OF[lambda[i]] + s[r-i-1])];
+      }
+    }
+    discr_r = INDEX_OF[discr_r];	/* Index form */
+    if (discr_r == A0) {
+      /* 2 lines below: B(x) <-- x*B(x) */
+      memmove(&b[1],b,NROOTS*sizeof(b[0]));
+      b[0] = A0;
+    } else {
+      /* 7 lines below: T(x) <-- lambda(x) - discr_r*x*b(x) */
+      t[0] = lambda[0];
+      for (i = 0 ; i < NROOTS; i++) {
+    if(b[i] != A0)
+      t[i+1] = lambda[i+1] ^ ALPHA_TO[MODNN(discr_r + b[i])];
+    else
+      t[i+1] = lambda[i+1];
+      }
+      if (2 * el <= r + no_eras - 1) {
+    el = r + no_eras - el;
+    /*
+     * 2 lines below: B(x) <-- inv(discr_r) *
+     * lambda(x)
+     */
+    for (i = 0; i <= NROOTS; i++)
+      b[i] = (lambda[i] == 0) ? A0 : MODNN(INDEX_OF[lambda[i]] - discr_r + NN);
+      } else {
+    /* 2 lines below: B(x) <-- x*B(x) */
+    memmove(&b[1],b,NROOTS*sizeof(b[0]));
+    b[0] = A0;
+      }
+      memcpy(lambda,t,(NROOTS+1)*sizeof(t[0]));
+    }
+  }
+
+  /* Convert lambda to index form and compute deg(lambda(x)) */
+  deg_lambda = 0;
+  for(i=0;i<NROOTS+1;i++){
+    lambda[i] = INDEX_OF[lambda[i]];
+    if(lambda[i] != A0)
+      deg_lambda = i;
+  }
+  /* Find roots of the error+erasure locator polynomial by Chien search */
+  memcpy(&reg[1],&lambda[1],NROOTS*sizeof(reg[0]));
+  count = 0;		/* Number of roots of lambda(x) */
+  for (i = 1,k=IPRIM-1; i <= NN; i++,k = MODNN(k+IPRIM)) {
+    q = 1; /* lambda[0] is always 0 */
+    for (j = deg_lambda; j > 0; j--){
+      if (reg[j] != A0) {
+    reg[j] = MODNN(reg[j] + j);
+    q ^= ALPHA_TO[reg[j]];
+      }
+    }
+    if (q != 0)
+      continue; /* Not a root */
+    /* store root (index-form) and error location number */
+#if DEBUG>=2
+    printf("count %d root %d loc %d\n",count,i,k);
+#endif
+    root[count] = i;
+    loc[count] = k;
+    /* If we've already found max possible roots,
+     * abort the search to save time
+     */
+    if(++count == deg_lambda)
+      break;
+  }
+  if (deg_lambda != count) {
+    /*
+     * deg(lambda) unequal to number of roots => uncorrectable
+     * error detected
+     */
+    count = -1;
+    goto finish;
+  }
+  /*
+   * Compute err+eras evaluator poly omega(x) = s(x)*lambda(x) (modulo
+   * x**NROOTS). in index form. Also find deg(omega).
+   */
+  deg_omega = 0;
+  for (i = 0; i < NROOTS;i++){
+    tmp = 0;
+    j = (deg_lambda < i) ? deg_lambda : i;
+    for(;j >= 0; j--){
+      if ((s[i - j] != A0) && (lambda[j] != A0))
+    tmp ^= ALPHA_TO[MODNN(s[i - j] + lambda[j])];
+    }
+    if(tmp != 0)
+      deg_omega = i;
+    omega[i] = INDEX_OF[tmp];
+  }
+  omega[NROOTS] = A0;
+
+  /*
+   * Compute error values in poly-form. num1 = omega(inv(X(l))), num2 =
+   * inv(X(l))**(FCR-1) and den = lambda_pr(inv(X(l))) all in poly-form
+   */
+  for (j = count-1; j >=0; j--) {
+    num1 = 0;
+    for (i = deg_omega; i >= 0; i--) {
+      if (omega[i] != A0)
+    num1  ^= ALPHA_TO[MODNN(omega[i] + i * root[j])];
+    }
+    num2 = ALPHA_TO[MODNN(root[j] * (FCR - 1) + NN)];
+    den = 0;
+
+    /* lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] */
+    for (i = min(deg_lambda,NROOTS-1) & ~1; i >= 0; i -=2) {
+      if(lambda[i+1] != A0)
+    den ^= ALPHA_TO[MODNN(lambda[i+1] + i * root[j])];
+    }
+    if (den == 0) {
+#if DEBUG >= 1
+      printf("\n ERROR: denominator = 0\n");
+#endif
+      count = -1;
+      goto finish;
+    }
+    /* Apply error to data */
+    if (num1 != 0) {
+      data[loc[j]] ^= ALPHA_TO[MODNN(INDEX_OF[num1] + INDEX_OF[num2] + NN - INDEX_OF[den])];
+    }
+  }
+ finish:
+  if(eras_pos != NULL){
+    for(i=0;i<count;i++)
+      eras_pos[i] = loc[i];
+  }
+  return count;
+}
+
diff --git a/InPut/cookiedecoder.h b/InPut/cookiedecoder.h
index c9aa918..47aa337 100644
--- a/InPut/cookiedecoder.h
+++ b/InPut/cookiedecoder.h
@@ -6,8 +6,10 @@
 #include <QByteArray>
 #include <QDebug>
 #include <QStringList>
+#include <QChar>
 
 #include "../defines.h"
+#include "ReedSalomon/rs.h"
 
 class CookieDecoder : public QObject
 {
@@ -21,6 +23,8 @@ class CookieDecoder : public QObject
     void    newValue            (int id_capteur, int id_valeur, double valeur);
     void    message(QString);
     void    trame_erreur(int);
+    void    trame_increment(int);
+    void    trame_corrigee(int);
 
 private:
     char    get_checksum        (QByteArray trame);
diff --git a/InPut/serial.cpp b/InPut/serial.cpp
index 4d14c36..f2e4348 100644
--- a/InPut/serial.cpp
+++ b/InPut/serial.cpp
@@ -183,7 +183,7 @@ void Serial::readData() {
     skipped_buf.clear();
 
     trames = data.split('#');
-    if(trames.last().size() < 19) {
+    if(trames.last().size() < 40) {
         skipped_buf = trames.last();
         trames.removeLast();
     }
@@ -191,6 +191,8 @@ void Serial::readData() {
     for(int i=0;i<trames.size();i++) {
         if(trames.at(i).isEmpty())
             trames.removeAt(i);
+        else
+            trames[i] = "#" + trames[i];
     }
     emit dataRead(trames);
 }
diff --git a/Logger21.pro b/Logger21.pro
index 696cfac..198f511 100644
--- a/Logger21.pro
+++ b/Logger21.pro
@@ -13,7 +13,6 @@ TARGET = Logger21
 TEMPLATE = app
 
 QMAKE_CXXFLAGS += -std=c++0x
-QMAKE_CXX = ccache g++
 
 ICON = icone.ico
 
@@ -40,7 +39,9 @@ SOURCES += \
     UI/timerangeselector.cpp \
     webservicesmanager.cpp \
     UI/stagesmanager.cpp \
-    UI/mygraphicsview.cpp
+    UI/mygraphicsview.cpp \
+    ReedSalomon/decode_rs.c \
+    ReedSalomon/init_rs.c
 
 HEADERS  += \
     tablemgr.h \
@@ -68,7 +69,9 @@ HEADERS  += \
     exprtk.hpp \
     webservicesmanager.h \
     UI/stagesmanager.h \
-    UI/mygraphicsview.h
+    UI/mygraphicsview.h \
+    ReedSalomon/char.h \
+    ReedSalomon/rs.h
 
 FORMS += \
     FenPrincipale.ui \
diff --git a/ReedSalomon/char.h b/ReedSalomon/char.h
new file mode 100644
index 0000000..2fbcb50
--- /dev/null
+++ b/ReedSalomon/char.h
@@ -0,0 +1,56 @@
+/* Include file to configure the RS codec for character symbols
+ *
+ * Copyright 2002, Phil Karn, KA9Q
+ * May be used under the terms of the GNU General Public License (GPL)
+ */
+
+#define DTYPE unsigned char
+
+/* Reed-Solomon codec control block */
+struct rs {
+  unsigned int mm;              /* Bits per symbol */
+  unsigned int nn;              /* Symbols per block (= (1<<mm)-1) */
+  unsigned char *alpha_to;      /* log lookup table */
+  unsigned char *index_of;      /* Antilog lookup table */
+  unsigned char *genpoly;       /* Generator polynomial */
+  unsigned int nroots;     /* Number of generator roots = number of parity symbols */
+  unsigned char fcr;        /* First consecutive root, index form */
+  unsigned char prim;       /* Primitive element, index form */
+  unsigned char iprim;      /* prim-th root of 1, index form */
+};
+
+static inline int modnn(struct rs *rs,int x){
+  while (x >= rs->nn) {
+    x -= rs->nn;
+    x = (x >> rs->mm) + (x & rs->nn);
+  }
+  return x;
+}
+#define MODNN(x) modnn(rs,x)
+
+#define MM (rs->mm)
+#define NN (rs->nn)
+#define ALPHA_TO (rs->alpha_to) 
+#define INDEX_OF (rs->index_of)
+#define GENPOLY (rs->genpoly)
+#define NROOTS (rs->nroots)
+#define FCR (rs->fcr)
+#define PRIM (rs->prim)
+#define IPRIM (rs->iprim)
+#define A0 (NN)
+
+#define ENCODE_RS encode_rs_char
+#define DECODE_RS decode_rs_char
+#define INIT_RS init_rs_char
+#define FREE_RS free_rs_char
+
+void ENCODE_RS(void *p,DTYPE *data,DTYPE *parity);
+int DECODE_RS(void *p,DTYPE *data,int *eras_pos,int no_eras);
+void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
+		   unsigned int prim,unsigned int nroots);
+void FREE_RS(void *p);
+
+
+
+
+
diff --git a/ReedSalomon/decode_rs.c b/ReedSalomon/decode_rs.c
new file mode 100644
index 0000000..37ee943
--- /dev/null
+++ b/ReedSalomon/decode_rs.c
@@ -0,0 +1,256 @@
+/* Reed-Solomon decoder
+ * Copyright 2002 Phil Karn, KA9Q
+ * May be used under the terms of the GNU General Public License (GPL)
+ */
+
+#ifdef DEBUG
+#include <stdio.h>
+#endif
+
+#include <string.h>
+
+#define NULL ((void *)0)
+#define	min(a,b)	((a) < (b) ? (a) : (b))
+
+#include "char.h"
+
+int DECODE_RS(
+#ifndef FIXED
+void *p,
+#endif
+DTYPE *data, int *eras_pos, int no_eras){
+
+#ifndef FIXED
+  struct rs *rs = (struct rs *)p;
+#endif
+  int deg_lambda, el, deg_omega;
+  int i, j, r,k;
+  DTYPE u,q,tmp,num1,num2,den,discr_r;
+  DTYPE lambda[NROOTS+1], s[NROOTS];	/* Err+Eras Locator poly
+					 * and syndrome poly */
+  DTYPE b[NROOTS+1], t[NROOTS+1], omega[NROOTS+1];
+  DTYPE root[NROOTS], reg[NROOTS+1], loc[NROOTS];
+  int syn_error, count;
+
+  /* form the syndromes; i.e., evaluate data(x) at roots of g(x) */
+  for(i=0;i<NROOTS;i++)
+    s[i] = data[0];
+
+  for(j=1;j<NN;j++){
+    for(i=0;i<NROOTS;i++){
+      if(s[i] == 0){
+	s[i] = data[j];
+      } else {
+	s[i] = data[j] ^ ALPHA_TO[MODNN(INDEX_OF[s[i]] + (FCR+i)*PRIM)];
+      }
+    }
+  }
+
+  /* Convert syndromes to index form, checking for nonzero condition */
+  syn_error = 0;
+  for(i=0;i<NROOTS;i++){
+    syn_error |= s[i];
+    s[i] = INDEX_OF[s[i]];
+  }
+
+  if (!syn_error) {
+    /* if syndrome is zero, data[] is a codeword and there are no
+     * errors to correct. So return data[] unmodified
+     */
+    count = 0;
+    goto finish;
+  }
+  memset(&lambda[1],0,NROOTS*sizeof(lambda[0]));
+  lambda[0] = 1;
+
+  if (no_eras > 0) {
+    /* Init lambda to be the erasure locator polynomial */
+    lambda[1] = ALPHA_TO[MODNN(PRIM*(NN-1-eras_pos[0]))];
+    for (i = 1; i < no_eras; i++) {
+      u = MODNN(PRIM*(NN-1-eras_pos[i]));
+      for (j = i+1; j > 0; j--) {
+	tmp = INDEX_OF[lambda[j - 1]];
+	if(tmp != A0)
+	  lambda[j] ^= ALPHA_TO[MODNN(u + tmp)];
+      }
+    }
+
+#if DEBUG >= 1
+    /* Test code that verifies the erasure locator polynomial just constructed
+       Needed only for decoder debugging. */
+    
+    /* find roots of the erasure location polynomial */
+    for(i=1;i<=no_eras;i++)
+      reg[i] = INDEX_OF[lambda[i]];
+
+    count = 0;
+    for (i = 1,k=IPRIM-1; i <= NN; i++,k = MODNN(k+IPRIM)) {
+      q = 1;
+      for (j = 1; j <= no_eras; j++)
+	if (reg[j] != A0) {
+	  reg[j] = MODNN(reg[j] + j);
+	  q ^= ALPHA_TO[reg[j]];
+	}
+      if (q != 0)
+	continue;
+      /* store root and error location number indices */
+      root[count] = i;
+      loc[count] = k;
+      count++;
+    }
+    if (count != no_eras) {
+      printf("count = %d no_eras = %d\n lambda(x) is WRONG\n",count,no_eras);
+      count = -1;
+      goto finish;
+    }
+#if DEBUG >= 2
+    printf("\n Erasure positions as determined by roots of Eras Loc Poly:\n");
+    for (i = 0; i < count; i++)
+      printf("%d ", loc[i]);
+    printf("\n");
+#endif
+#endif
+  }
+  for(i=0;i<NROOTS+1;i++)
+    b[i] = INDEX_OF[lambda[i]];
+  
+  /*
+   * Begin Berlekamp-Massey algorithm to determine error+erasure
+   * locator polynomial
+   */
+  r = no_eras;
+  el = no_eras;
+  while (++r <= NROOTS) {	/* r is the step number */
+    /* Compute discrepancy at the r-th step in poly-form */
+    discr_r = 0;
+    for (i = 0; i < r; i++){
+      if ((lambda[i] != 0) && (s[r-i-1] != A0)) {
+	discr_r ^= ALPHA_TO[MODNN(INDEX_OF[lambda[i]] + s[r-i-1])];
+      }
+    }
+    discr_r = INDEX_OF[discr_r];	/* Index form */
+    if (discr_r == A0) {
+      /* 2 lines below: B(x) <-- x*B(x) */
+      memmove(&b[1],b,NROOTS*sizeof(b[0]));
+      b[0] = A0;
+    } else {
+      /* 7 lines below: T(x) <-- lambda(x) - discr_r*x*b(x) */
+      t[0] = lambda[0];
+      for (i = 0 ; i < NROOTS; i++) {
+	if(b[i] != A0)
+	  t[i+1] = lambda[i+1] ^ ALPHA_TO[MODNN(discr_r + b[i])];
+	else
+	  t[i+1] = lambda[i+1];
+      }
+      if (2 * el <= r + no_eras - 1) {
+	el = r + no_eras - el;
+	/*
+	 * 2 lines below: B(x) <-- inv(discr_r) *
+	 * lambda(x)
+	 */
+	for (i = 0; i <= NROOTS; i++)
+	  b[i] = (lambda[i] == 0) ? A0 : MODNN(INDEX_OF[lambda[i]] - discr_r + NN);
+      } else {
+	/* 2 lines below: B(x) <-- x*B(x) */
+	memmove(&b[1],b,NROOTS*sizeof(b[0]));
+	b[0] = A0;
+      }
+      memcpy(lambda,t,(NROOTS+1)*sizeof(t[0]));
+    }
+  }
+
+  /* Convert lambda to index form and compute deg(lambda(x)) */
+  deg_lambda = 0;
+  for(i=0;i<NROOTS+1;i++){
+    lambda[i] = INDEX_OF[lambda[i]];
+    if(lambda[i] != A0)
+      deg_lambda = i;
+  }
+  /* Find roots of the error+erasure locator polynomial by Chien search */
+  memcpy(&reg[1],&lambda[1],NROOTS*sizeof(reg[0]));
+  count = 0;		/* Number of roots of lambda(x) */
+  for (i = 1,k=IPRIM-1; i <= NN; i++,k = MODNN(k+IPRIM)) {
+    q = 1; /* lambda[0] is always 0 */
+    for (j = deg_lambda; j > 0; j--){
+      if (reg[j] != A0) {
+	reg[j] = MODNN(reg[j] + j);
+	q ^= ALPHA_TO[reg[j]];
+      }
+    }
+    if (q != 0)
+      continue; /* Not a root */
+    /* store root (index-form) and error location number */
+#if DEBUG>=2
+    printf("count %d root %d loc %d\n",count,i,k);
+#endif
+    root[count] = i;
+    loc[count] = k;
+    /* If we've already found max possible roots,
+     * abort the search to save time
+     */
+    if(++count == deg_lambda)
+      break;
+  }
+  if (deg_lambda != count) {
+    /*
+     * deg(lambda) unequal to number of roots => uncorrectable
+     * error detected
+     */
+    count = -1;
+    goto finish;
+  }
+  /*
+   * Compute err+eras evaluator poly omega(x) = s(x)*lambda(x) (modulo
+   * x**NROOTS). in index form. Also find deg(omega).
+   */
+  deg_omega = 0;
+  for (i = 0; i < NROOTS;i++){
+    tmp = 0;
+    j = (deg_lambda < i) ? deg_lambda : i;
+    for(;j >= 0; j--){
+      if ((s[i - j] != A0) && (lambda[j] != A0))
+	tmp ^= ALPHA_TO[MODNN(s[i - j] + lambda[j])];
+    }
+    if(tmp != 0)
+      deg_omega = i;
+    omega[i] = INDEX_OF[tmp];
+  }
+  omega[NROOTS] = A0;
+  
+  /*
+   * Compute error values in poly-form. num1 = omega(inv(X(l))), num2 =
+   * inv(X(l))**(FCR-1) and den = lambda_pr(inv(X(l))) all in poly-form
+   */
+  for (j = count-1; j >=0; j--) {
+    num1 = 0;
+    for (i = deg_omega; i >= 0; i--) {
+      if (omega[i] != A0)
+	num1  ^= ALPHA_TO[MODNN(omega[i] + i * root[j])];
+    }
+    num2 = ALPHA_TO[MODNN(root[j] * (FCR - 1) + NN)];
+    den = 0;
+    
+    /* lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] */
+    for (i = min(deg_lambda,NROOTS-1) & ~1; i >= 0; i -=2) {
+      if(lambda[i+1] != A0)
+	den ^= ALPHA_TO[MODNN(lambda[i+1] + i * root[j])];
+    }
+    if (den == 0) {
+#if DEBUG >= 1
+      printf("\n ERROR: denominator = 0\n");
+#endif
+      count = -1;
+      goto finish;
+    }
+    /* Apply error to data */
+    if (num1 != 0) {
+      data[loc[j]] ^= ALPHA_TO[MODNN(INDEX_OF[num1] + INDEX_OF[num2] + NN - INDEX_OF[den])];
+    }
+  }
+ finish:
+  if(eras_pos != NULL){
+    for(i=0;i<count;i++)
+      eras_pos[i] = loc[i];
+  }
+  return count;
+}
diff --git a/ReedSalomon/exercise.c b/ReedSalomon/exercise.c
new file mode 100644
index 0000000..e75566b
--- /dev/null
+++ b/ReedSalomon/exercise.c
@@ -0,0 +1,121 @@
+/* Exercise an RS codec a specified number of times using random
+ * data and error patterns
+ *
+ * Copyright 2002 Phil Karn, KA9Q
+ * May be used under the terms of the GNU General Public License (GPL)
+ */
+#define FLAG_ERASURE 1 /* Randomly flag 50% of errors as erasures */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef FIXED
+#include "fixed.h"
+#define EXERCISE exercise_8
+#elif defined(CCSDS)
+#include "fixed.h"
+#include "ccsds.h"
+#define EXERCISE exercise_ccsds
+#elif defined(BIGSYM)
+#include "int.h"
+#define EXERCISE exercise_int
+#else
+#include "char.h"
+#define EXERCISE exercise_char
+#endif
+
+#ifdef FIXED
+#define PRINTPARM printf("(255,223):");
+#elif defined(CCSDS)
+#define PRINTPARM printf("CCSDS (255,223):");
+#else
+#define PRINTPARM printf("(%d,%d):",rs->nn,rs->nn-rs->nroots);
+#endif
+
+/* Exercise the RS codec passed as an argument */
+int EXERCISE(
+#if !defined(CCSDS) && !defined(FIXED)
+void *p,
+#endif
+int trials){
+#if !defined(CCSDS) && !defined(FIXED)
+  struct rs *rs = (struct rs *)p;
+#endif
+  DTYPE block[NN],tblock[NN];
+  int i;
+  int errors;
+  int errlocs[NN];
+  int derrlocs[NROOTS];
+  int derrors;
+  int errval,errloc;
+  int erasures;
+  int decoder_errors = 0;
+
+  while(trials-- != 0){
+    /* Test up to the error correction capacity of the code */
+    for(errors=0;errors <= NROOTS/2;errors++){
+
+      /* Load block with random data and encode */
+      for(i=0;i<NN-NROOTS;i++)
+	block[i] = random() & NN;
+      
+#if defined(CCSDS) || defined(FIXED)
+      ENCODE_RS(&block[0],&block[NN-NROOTS]);
+#else
+      ENCODE_RS(rs,&block[0],&block[NN-NROOTS]);
+#endif
+
+      /* Make temp copy, seed with errors */
+      memcpy(tblock,block,sizeof(tblock));
+      memset(errlocs,0,sizeof(errlocs));
+      memset(derrlocs,0,sizeof(derrlocs));
+      erasures=0;
+      for(i=0;i<errors;i++){
+	do {
+	  errval = random() & NN;
+	} while(errval == 0); /* Error value must be nonzero */
+
+	do {
+	  errloc = random() % NN;
+	} while(errlocs[errloc] != 0); /* Must not choose the same location twice */
+
+	errlocs[errloc] = 1;
+
+#if FLAG_ERASURE
+	if(random() & 1) /* 50-50 chance */
+	  derrlocs[erasures++] = errloc;
+#endif
+	tblock[errloc] ^= errval;
+      }
+
+      /* Decode the errored block */
+#if defined(CCSDS) || defined(FIXED)
+      derrors = DECODE_RS(tblock,derrlocs,erasures);
+#else
+      derrors = DECODE_RS(rs,tblock,derrlocs,erasures);
+#endif
+
+      if(derrors != errors){
+	PRINTPARM
+	printf(" decoder says %d errors, true number is %d\n",derrors,errors);
+	decoder_errors++;
+      }
+      for(i=0;i<derrors;i++){
+	if(errlocs[derrlocs[i]] == 0){
+	  PRINTPARM
+	  printf(" decoder indicates error in location %d without error\n",i);
+	  decoder_errors++;
+	}
+      }
+      if(memcmp(tblock,block,sizeof(tblock)) != 0){
+	PRINTPARM
+	printf(" uncorrected errors! output ^ input:");
+	decoder_errors++;
+	for(i=0;i<NN;i++)
+	  printf(" %02x",tblock[i] ^ block[i]);
+	printf("\n");
+      }
+    }
+  }
+  return decoder_errors;
+}
diff --git a/ReedSalomon/init_rs.c b/ReedSalomon/init_rs.c
new file mode 100644
index 0000000..5beed07
--- /dev/null
+++ b/ReedSalomon/init_rs.c
@@ -0,0 +1,116 @@
+/* Initialize a RS codec
+ *
+ * Copyright 2002 Phil Karn, KA9Q
+ * May be used under the terms of the GNU General Public License (GPL)
+ */
+#include <stdlib.h>
+
+
+#include "char.h"
+
+#define NULL ((void *)0)
+
+void FREE_RS(void *p){
+  struct rs *rs = (struct rs *)p;
+
+  free(rs->alpha_to);
+  free(rs->index_of);
+  free(rs->genpoly);
+  free(rs);
+}
+
+/* Initialize a Reed-Solomon codec
+ * symsize = symbol size, bits (1-8)
+ * gfpoly = Field generator polynomial coefficients
+ * fcr = first root of RS code generator polynomial, index form
+ * prim = primitive element to generate polynomial roots
+ * nroots = RS code generator polynomial degree (number of roots)
+ */
+void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned fcr,unsigned prim,
+		unsigned int nroots){
+  struct rs *rs;
+  int i, j, sr,root,iprim;
+
+  if(symsize > 8*sizeof(DTYPE))
+    return NULL; /* Need version with ints rather than chars */
+
+  if(fcr >= (1<<symsize))
+    return NULL;
+  if(prim == 0 || prim >= (1<<symsize))
+    return NULL;
+  if(nroots >= (1<<symsize))
+    return NULL; /* Can't have more roots than symbol values! */
+
+  rs = (struct rs *)calloc(1,sizeof(struct rs));
+  rs->mm = symsize;
+  rs->nn = (1<<symsize)-1;
+
+  rs->alpha_to = (DTYPE *)malloc(sizeof(DTYPE)*(rs->nn+1));
+  if(rs->alpha_to == NULL){
+    free(rs);
+    return NULL;
+  }
+  rs->index_of = (DTYPE *)malloc(sizeof(DTYPE)*(rs->nn+1));
+  if(rs->index_of == NULL){
+    free(rs->alpha_to);
+    free(rs);
+    return NULL;
+  }
+
+  /* Generate Galois field lookup tables */
+  rs->index_of[0] = A0; /* log(zero) = -inf */
+  rs->alpha_to[A0] = 0; /* alpha**-inf = 0 */
+  sr = 1;
+  for(i=0;i<rs->nn;i++){
+    rs->index_of[sr] = i;
+    rs->alpha_to[i] = sr;
+    sr <<= 1;
+    if(sr & (1<<symsize))
+      sr ^= gfpoly;
+    sr &= rs->nn;
+  }
+  if(sr != 1){
+    /* field generator polynomial is not primitive! */
+    free(rs->alpha_to);
+    free(rs->index_of);
+    free(rs);
+    return NULL;
+  }
+
+  /* Form RS code generator polynomial from its roots */
+  rs->genpoly = (DTYPE *)malloc(sizeof(DTYPE)*(nroots+1));
+  if(rs->genpoly == NULL){
+    free(rs->alpha_to);
+    free(rs->index_of);
+    free(rs);
+    return NULL;
+  }
+  rs->fcr = fcr;
+  rs->prim = prim;
+  rs->nroots = nroots;
+
+  /* Find prim-th root of 1, used in decoding */
+  for(iprim=1;(iprim % prim) != 0;iprim += rs->nn)
+    ;
+  rs->iprim = iprim / prim;
+
+  rs->genpoly[0] = 1;
+  for (i = 0,root=fcr*prim; i < nroots; i++,root += prim) {
+    rs->genpoly[i+1] = 1;
+
+    /* Multiply rs->genpoly[] by  @**(root + x) */
+    for (j = i; j > 0; j--){
+      if (rs->genpoly[j] != 0)
+	rs->genpoly[j] = rs->genpoly[j-1] ^ rs->alpha_to[modnn(rs,rs->index_of[rs->genpoly[j]] + root)];
+      else
+	rs->genpoly[j] = rs->genpoly[j-1];
+    }
+    /* rs->genpoly[0] can never be zero */
+    rs->genpoly[0] = rs->alpha_to[modnn(rs,rs->index_of[rs->genpoly[0]] + root)];
+  }
+  /* convert rs->genpoly[] to index form for quicker encoding */
+  for (i = 0; i <= nroots; i++)
+    rs->genpoly[i] = rs->index_of[rs->genpoly[i]];
+
+  return rs;
+}
diff --git a/ReedSalomon/rs.h b/ReedSalomon/rs.h
new file mode 100644
index 0000000..9e731d9
--- /dev/null
+++ b/ReedSalomon/rs.h
@@ -0,0 +1,30 @@
+/* User include file for the Reed-Solomon codec
+ * Copyright 2002, Phil Karn KA9Q
+ * May be used under the terms of the GNU General Public License (GPL)
+ */
+
+/* General purpose RS codec, 8-bit symbols */
+void encode_rs_char(void *rs,unsigned char *data,unsigned char *parity);
+int decode_rs_char(void *rs,unsigned char *data,int *eras_pos,
+		   int no_eras);
+void *init_rs_char(unsigned int symsize,unsigned int gfpoly,
+		   unsigned int fcr,unsigned int prim,unsigned int nroots);
+void free_rs_char(void *rs);
+
+/* General purpose RS codec, integer symbols */
+void encode_rs_int(void *rs,int *data,int *parity);
+int decode_rs_int(void *rs,int *data,int *eras_pos,int no_eras);
+void *init_rs_int(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
+		  unsigned int prim,unsigned int nroots);
+void free_rs_int(void *rs);
+
+/* CCSDS standard (255,223) RS codec with conventional (*not* dual-basis)
+ * symbol representation
+ */
+void encode_rs_8(unsigned char *data,unsigned char *parity);
+int decode_rs_8(unsigned char *data,int *eras_pos,int no_eras);
+
+/* Tables to map from conventional->dual (Taltab) and
+ * dual->conventional (Tal1tab) bases
+ */
+extern unsigned char Taltab[],Tal1tab[];
diff --git a/dialog.cpp b/dialog.cpp
index 2c92607..83dfa68 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -4,6 +4,7 @@ using namespace std;
 AskDialog::AskDialog()
 {
     nItems = 0;
+    com = 0;
     setupUi(this);
 
     settings = new QSettings("Cookie Project","Logger");
diff --git a/main.cpp b/main.cpp
index 43fe28c..fc2eb4c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,6 +23,7 @@ int main(int argc, char *argv[])
     d->show();
     //------------------------------------------------------------------------------
     int rc = a.exec();
-    delete d->getSerial();
+    if(d->getSerial() != 0)
+        delete d->getSerial();
     return rc;
 }