Skip to content

Commit

Permalink
Mask LIS2DH12 clone support for TS101 only (#1894)
Browse files Browse the repository at this point in the history
* Mask LIS2DH12 clone support for TS101 only

* Also mask the probe
  • Loading branch information
Ralim authored Jul 31, 2024
1 parent 95eb154 commit 56d8082
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion source/Core/BSP/Miniware/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,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
Expand Down
10 changes: 8 additions & 2 deletions source/Core/Drivers/LIS2DH12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -45,15 +45,21 @@ bool LIS2DH12::detect() {
// Read chip id to ensure its not an address collision
uint8_t id = 0;
if (ACCEL_I2C_CLASS::Mem_Read(LIS2DH_I2C_ADDRESS, LIS2DH_WHOAMI_REG, &id, 1)) {
#ifdef ACCEL_LIS_CLONE
return (id == LIS2DH_WHOAMI_ID) || (id == LIS2DH_CLONE_WHOAMI_ID);
#else
return (id == LIS2DH_WHOAMI_ID);
#endif
}
return false; // cant read ID
}

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;
}

0 comments on commit 56d8082

Please sign in to comment.