Version 5.2.0 update

CTCaer · Apr 23, 2018 · 3294abb · 3294abb
1 parent 9d0c463
commit 3294abb
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 54 deletions.
diff --git a/jctool/FormJoy.h b/jctool/FormJoy.h
@@ -3570,9 +3570,9 @@ public ref class FormJoy : public System::Windows::Forms::Form
             this->lbl_editStickDevHelp->Font = (gcnew System::Drawing::Font(L"Segoe UI", 8.25F, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point,
                 static_cast<System::Byte>(161)));
             this->lbl_editStickDevHelp->ForeColor = System::Drawing::Color::Tomato;
-            this->lbl_editStickDevHelp->Location = System::Drawing::Point(4, 338);
+            this->lbl_editStickDevHelp->Location = System::Drawing::Point(4, 336);
             this->lbl_editStickDevHelp->Name = L"lbl_editStickDevHelp";
-            this->lbl_editStickDevHelp->Size = System::Drawing::Size(211, 44);
+            this->lbl_editStickDevHelp->Size = System::Drawing::Size(211, 46);
             this->lbl_editStickDevHelp->TabIndex = 53;
             this->lbl_editStickDevHelp->Text = L"Warning: The Stick Device Parameters are factory values. Change only when you hav"
                 L"e drifting problems.";
@@ -3944,7 +3944,7 @@ public ref class FormJoy : public System::Windows::Forms::Form
             this->Name = L"FormJoy";
             this->SizeGripStyle = System::Windows::Forms::SizeGripStyle::Hide;
             this->StartPosition = System::Windows::Forms::FormStartPosition::CenterScreen;
-            this->Text = L"Joy-Con Toolkit v5.0.0";
+            this->Text = L"Joy-Con Toolkit v5.2.0";
             this->FormClosing += gcnew System::Windows::Forms::FormClosingEventHandler(this, &FormJoy::Form1_FormClosing);
             this->SizeChanged += gcnew System::EventHandler(this, &FormJoy::fixToolstripOverlap);
             this->grpBox_Color->ResumeLayout(false);
@@ -4665,7 +4665,7 @@ public ref class FormJoy : public System::Windows::Forms::Form
         if (option_is_on != 7) {
             reset_window_option(false);
             this->Controls->Add(this->grpBox_editCalModel);
-            this->lbl_editStickDevHelp->Size = System::Drawing::Size(211, 44);
+            this->lbl_editStickDevHelp->Size = System::Drawing::Size(211, 46);
             this->grpBox_editCalModel->BringToFront();
             option_is_on = 7;
             this->AutoScaleDimensions = System::Drawing::SizeF(96, 96);
@@ -6394,10 +6394,10 @@ public ref class FormJoy : public System::Windows::Forms::Form
         get_spi_data(0x8026, sizeof(user_sensor_cal), user_sensor_cal);
         Sleep(100);
         get_spi_data(0x6089, sizeof(stick_model_main_left), stick_model_main_left);
-        //if (handle_ok == 3) {
+        if (handle_ok == 3) {
             Sleep(100);
             get_spi_data(0x609B, sizeof(stick_model_pro_right), stick_model_pro_right);
-        //}
+        }
 
         // Left stick user cal
         if (handle_ok != 2) {
@@ -6477,14 +6477,14 @@ public ref class FormJoy : public System::Windows::Forms::Form
         this->numeric_StickParamDeadzone2->Enabled   = false;
         this->numeric_StickParamRangeRatio2->Enabled = false;
         this->lbl_proStickHelp->Enabled              = false;
-        //if (handle_ok == 3) {
+        if (handle_ok == 3) {
             decode_stick_params(decoded_stick_pair + 14, stick_model_pro_right);
             this->numeric_StickParamDeadzone2->Value   = decoded_stick_pair[14];
             this->numeric_StickParamRangeRatio2->Value = decoded_stick_pair[15];
             this->numeric_StickParamDeadzone2->Enabled   = true;
             this->numeric_StickParamRangeRatio2->Enabled = true;
             this->lbl_proStickHelp->Enabled              = true;
-        //}
+        }
         grpBox_StickDevParam->Enabled = true;
 
         // Enable write buttons
@@ -6602,8 +6602,8 @@ public ref class FormJoy : public System::Windows::Forms::Form
 
             int res = write_spi_data(0x6089, sizeof(stick_model_main_left), stick_model_main_left);
             if (res == 0 && handle_ok == 3) {
-            Sleep(100);
-            res = write_spi_data(0x609B, sizeof(stick_model_pro_right), stick_model_pro_right);
+                Sleep(100);
+                res = write_spi_data(0x609B, sizeof(stick_model_pro_right), stick_model_pro_right);
             }
             if (res == 0)
                 MessageBox::Show(L"The Stick Device Parameters were written to SPI!", L"CTCaer's Joy-Con Toolkit - Write Success!", MessageBoxButtons::OK, MessageBoxIcon::Asterisk);

diff --git a/jctool/FormJoy.resx b/jctool/FormJoy.resx
@@ -129,7 +129,51 @@
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>731, 17</value>
   </metadata>
+  <data name="toolStripLabel_temp.ToolTipText" xml:space="preserve">
+    <value>It shows the temperature inside the controller's body.
+If you want to see the ambient temperature, let it rest for some minutes without touching and warming it.
+
+Click to change between Celsius and Fahrenheit </value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripBtn_refresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripBtn_Disconnect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="label_sn_change_warning.Text" xml:space="preserve">
+    <value>Make a backup first!
+If you lose your serial number, bad things will happen!
+
+If you currently have the stock S/N, this will create a backup of it inside SPI.
+
+Restore it either here from the SPI backed up S/N or through Restore option.</value>
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABIXAAASFwAAAAAAAAAA
@@ -209,51 +253,7 @@
   <metadata name="errorProvider2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>504, 17</value>
   </metadata>
-  <data name="label_sn_change_warning.Text" xml:space="preserve">
-    <value>Make a backup first!
-If you lose your serial number, bad things will happen!
-
-If you currently have the stock S/N, this will create a backup of it inside SPI.
-
-Restore it either here from the SPI backed up S/N or through Restore option.</value>
-  </data>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>634, 17</value>
   </metadata>
-  <data name="toolStripLabel_temp.ToolTipText" xml:space="preserve">
-    <value>It shows the temperature inside the controller's body.
-If you want to see the ambient temperature, let it rest for some minutes without touching and warming it.
-
-Click to change between Celsius and Fahrenheit </value>
-  </data>
-  <data name="toolStripBtn_refresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripBtn_Disconnect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
 </root>