Merge b5bf6ecacd into ad15a53cd9

Merge pull request #1902 from PockyBum522/patch-1
Add description of fix for around common error under Windows section...
2024-04-10 22:44:45 +02:00 · 2024-04-10 12:49:32 +02:00 · 2024-04-10 06:17:53 -04:00 · 2024-03-18 12:57:01 +11:00
3 changed files with 7 additions and 3 deletions
--- a/Documentation/Flashing/TS80(P).md
+++ b/Documentation/Flashing/TS80(P).md
@ -39,6 +39,8 @@ Officially the bootloader on the devices only works under Windows (use the built
 7. If it didn't work the first time, try copying the file again without disconnecting the device, often it will work on the second shot.
 8. Disconnect the USB and power up the device. You're good to go.

+If you get a message when copying: "Are you sure you want to move this file without its properties?" then this can cause an issue where the iron thinks that the file has finished copying before it actually has and can cause a .ERR file. Since this dialog prompt is caused by copying a file from NTFS to FAT (the iron's filesystem) in windows, you can fix this by formatting a thumbdrive as FAT32 and then storing the hex file on that before copying the file to the iron. As there will be no NTFS properties on the file when stored on a FAT32 filesystem, there will be no prompt, and the copy will then proceed normally.
+
 For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer, for easier installation follow the guide at the end of this document.

 On the USB port, `USB_D+` is shorted to `SWDIO` and `USB_D-` is shorted to `SWCLK` so debugging works without disassembly (attach while staying in the bootloader). Installing [IronOS-dfu](https://github.com/Ralim/IronOS-dfu) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/).
--- a/source/Core/BSP/Miniware/configuration.h
+++ b/source/Core/BSP/Miniware/configuration.h
@ -193,7 +193,7 @@
 #define POWER_LIMIT_STEPS  5
 #define OP_AMP_GAIN_STAGE  OP_AMP_GAIN_STAGE_TS100
 #define TEMP_uV_LOOKUP_HAKKO
-
+#define ACCEL_LIS_CLONE 1
 #define HARDWARE_MAX_WATTAGE_X10 1000
 #define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
 #define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for ts100 tips
--- a/source/Core/Drivers/LIS2DH12.cpp
+++ b/source/Core/Drivers/LIS2DH12.cpp
@ -5,10 +5,10 @@
 *      Author: Ralim
 */

-#include <array>
-
 #include "LIS2DH12.hpp"
 #include "cmsis_os.h"
+#include "configuration.h"
+#include <array>

 static const ACCEL_I2C_CLASS::I2C_REG i2c_registers[] = {
    {    LIS_CTRL_REG1,       0x17, 0}, // 25Hz
@ -51,9 +51,11 @@ bool LIS2DH12::detect() {
 }

 bool LIS2DH12::isClone() {
+#ifdef ACCEL_LIS_CLONE
  uint8_t id = 0;
  if (ACCEL_I2C_CLASS::Mem_Read(LIS2DH_I2C_ADDRESS, LIS2DH_WHOAMI_REG, &id, 1)) {
    return (id == LIS2DH_CLONE_WHOAMI_ID);
  }
+#endif
  return false;
 }
Author	SHA1	Message	Date
Ben V. Brown	1ba8c85bc6	Merge `b5bf6ecacd` into `ad15a53cd9`	2024-04-10 22:44:45 +02:00
discip	ad15a53cd9	Merge pull request #1902 from PockyBum522/patch-1 Add description of fix for around common error under Windows section...	2024-04-10 12:49:32 +02:00
DSikes	ac0cd2a61d	Added description of how to get around common error under Windows section of installation guide Added a message about how to get around windows dialog prompt when copying from NTFS filesystems (Most of what Windows users will be copying from) to FAT which the iron uses. This is an extremely common problem for Windows users, and I'd like to put in a tested workaround in the guide as it would have saved me about 15 minutes on what would have been a 20 second install. I believe this will be of similar benefit to most Windows users.	2024-04-10 06:17:53 -04:00
Ben V. Brown	b5bf6ecacd	Mask LIS2DH12 clone support for TS101 only	2024-03-18 12:57:01 +11:00