Update firmware updater

Author: radiomanV

TL866_Updater/C#/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.51")]
+[assembly: AssemblyFileVersion("2.52")]

TL866_Updater/C#/firmware.cs

@@ -43,6 +43,7 @@ public enum PROGRAMMER_TYPE
         public const int UNENCRYPTED_FIRMWARE_SIZE = 0x1E400;
         public const int FIRMWARE_SIGNATURE_OFFSET = 0x1E3FC;
         public const uint FIRMWARE_SIGNATURE = 0x5AA5AA55;
+        public const uint CP0_ADDRESS = 0x1FFF9;
         public const int DEVCODE_LENGHT = 8;
         public const int SERIALCODE_LENGHT = 24;
 

TL866_Updater/C#/mainform.Designer.cs

@@ -784,6 +784,9 @@ private void SaveHex(byte[] data)
             if (!OptionFull.Checked)
                 for (int i = Firmware.BOOTLOADER_SIZE; i < Firmware.XOR_TABLE_OFFSET; i++)
                     data[i] = 0xFF;
+            //Disable the CP0 bit if necessary
+            if (!cp0.Checked)
+                data[Firmware.CP0_ADDRESS] |= 0x04;
             ////Writing serial code
             byte[] info = new byte[Firmware.BLOCK_SIZE];
             string s1 = TxtDevcode.Text + new string(' ', Firmware.DEVCODE_LENGHT - TxtDevcode.Text.Length);
@@ -871,5 +874,12 @@ private enum led_action
         private delegate void SetProgressBarCallBack(int percentage);
 
         private delegate void SetMessageCallBack(string message);
+
+        private void cp0_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!cp0.Checked)
+                MessageBox.Show("Disabling the CP0 bit will disable switch to bootloader function in the latest firmware versions!\r\nThis bit should be disabled only for debugging purposes.", "TL866",
+            MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        }
     }
 }

TL866_Updater/C#/mainform.cs

@@ -8,6 +8,7 @@
 #define XOR_TABLE_SIZE              0x100
 #define XOR_TABLE_OFFSET            0x1FC00
 #define FIRMWARE_SIGNATURE_OFFSET   0x1E3FC
+#define CP0_ADDRESS                 0x1FFF9
 #define FIRMWARE_SIGNATURE          0x5AA5AA55
 
 #define SERIAL_OFFSET               0x1FD00

TL866_Updater/QT/firmware.h

@@ -338,8 +338,16 @@ void MainWindow::on_btnSave_clicked()
 {
     //Prepare data to be saved.
     QByteArray temp = get_resource(ui->radiofA->isChecked() ? A_FIRMWARE_RESOURCE :  CS_FIRMWARE_RESOURCE, FLASH_SIZE);
+
+    //Writing the main firmware or empty on choice
     if(ui->optionBoot->isChecked())
         memset(&temp.data()[BOOTLOADER_SIZE], 0xFF, UNENCRYPTED_FIRMWARE_SIZE);//if the option bootloader only is selected then clear the main firmware area(0x1800-0x1FBFF)
+
+    //Disable the CP0 bit if necessary
+    if(!ui->cp0->isChecked())
+        temp.data()[CP0_ADDRESS] |= 0x04;
+
+    //Writing serial code
     memset(&temp.data()[SERIAL_OFFSET],' ',32);//add trailing spaces
     memcpy(&temp.data()[SERIAL_OFFSET], ui->txtDevcode->text().toLatin1().data(), static_cast<size_t>(ui->txtDevcode->text().size()));//copy devcode to key array
     memcpy(&temp.data()[SERIAL_OFFSET+8], ui->txtSerial->text().toLatin1().data(), static_cast<size_t>(ui->txtSerial->text().size()));//copy serial to key array
@@ -376,6 +384,14 @@ void MainWindow::on_btnSave_clicked()
     }
 }
 
+//Click the CP0 checkbox
+void MainWindow::on_cp0_stateChanged(int arg1)
+{
+    if(arg1 == Qt::Unchecked)
+        QMessageBox::warning(this, "TL866", "Disabling the CP0 bit will disable switch to bootloader function in the latest firmware versions!\nThis bit should be disabled only for debugging purposes.",
+                             QMessageBox::Ok);
+}
+
 //Helper function to get a binary resource
 QByteArray MainWindow::get_resource(const QString &resource_path, int size)
 {
@@ -683,9 +699,9 @@ void MainWindow::gui_updated(const QString &message, bool eraseLed, bool writeLe
 }
 
 //This procedure is called automatically by the usb device change. Call this function to refresh the info.
- MainWindow::DeviceInfo MainWindow::DeviceChanged(bool arrived)
+MainWindow::DeviceInfo MainWindow::DeviceChanged(bool arrived)
 {
-     DeviceInfo device_info = {"", "", 0};
+    DeviceInfo device_info = {"", "", 0};
 
     if(!arrived && reset_flag)//ignore unplug events if the device was resetted by us.
         return device_info;
@@ -801,14 +817,14 @@ void MainWindow::gui_updated(const QString &message, bool eraseLed, bool writeLe
     else//no device connected
         SetBlank();
     return device_info;
- }
+}
 
 //Helper function to get formated device and serial code
 const QString MainWindow::GetFormatedString(const QString &devcode, const QString &serial)
 {
     return QString("Device code: %1\nSerial number: %2").arg(devcode.trimmed() +
-                  (Firmware::IsBadCrc(devcode, serial) ? " (Bad device code)" : "")) .arg(serial.trimmed() +
-                  (Firmware::IsBadCrc(devcode, serial) ? " (Bad serial code)" : ""));
+                                                             (Firmware::IsBadCrc(devcode, serial) ? " (Bad device code)" : "")) .arg(serial.trimmed() +
+                                                                                                                                     (Firmware::IsBadCrc(devcode, serial) ? " (Bad serial code)" : ""));
 }
 
 
@@ -957,3 +973,4 @@ bool MainWindow::AdvQuestion()
     return(QMessageBox::warning(advdlg, "TL866", "Warning! this operation may brick your device.\nDo you want to continue?",
                                 QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes);
 }
+

TL866_Updater/QT/mainwindow.cpp

@@ -68,6 +68,8 @@ private slots:
     void WriteInfo(const QString &device_code, const QString &serial_number);
 
 
+    void on_cp0_stateChanged(int arg1);
+
 signals:
     void reflash_status(const QString &result);
     void dump_status(const QString &result);
@@ -108,7 +110,7 @@ private slots:
 #define A_FIRMWARE_RESOURCE     ":/firmware/firmwareA.bin"
 #define CS_FIRMWARE_RESOURCE    ":/firmware/firmwareCS.bin"
 #define DUMPER_RESOURCE         ":/firmware/dumper.bin"
-#define VERSION                 "2.5"
+#define VERSION                 "2.52"
 };
 
 #endif // MAINWINDOW_H

TL866_Updater/QT/mainwindow.h

@@ -809,6 +809,43 @@
         </item>
        </layout>
       </widget>
+      <widget class="QCheckBox" name="cp0">
+       <property name="geometry">
+        <rect>
+         <x>273</x>
+         <y>90</y>
+         <width>231</width>
+         <height>17</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Code protection bit(CP0)</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </widget>
+     <widget class="QLabel" name="label_8">
+      <property name="geometry">
+       <rect>
+        <x>210</x>
+        <y>130</y>
+        <width>361</width>
+        <height>16</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>11</pointsize>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">color: rgb(0, 0, 255);</string>
+      </property>
+      <property name="text">
+       <string>Generated firmware version 3.2.82 (Minipro 6.71)</string>
+      </property>
      </widget>
     </widget>
    </widget>