sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Handle tip connect & disconnect in detection

Browse Source
This commit is contained in:
Ben V. Brown
2021-05-02 16:47:33 +10:00
parent 7a5c0ad20f
commit 1ad00aa8b2
4 changed files with 381 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Core/BSP/BSP.h
View File

@@ -76,6 +76,18 @@ void log_system_state(int32_t PWMWattsx10);
// Returns true if the tip is disconnected // Returns true if the tip is disconnected
bool isTipDisconnected(); bool isTipDisconnected();
// Status LED controls
enum StatusLED {
LED_OFF = 0, // Turn off status led
LED_STANDBY, // unit is in sleep /standby
LED_HEATING, // The unit is heating up to temperature
LED_HOT, // The unit is at operating temperature
LED_COOLING_STILL_HOT, // The unit is off and cooling but still hot
};
void setStatusLED(const enum StatusLED state);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

700
source/Core/BSP/MHP30/BSP.cpp
View File

@@ -12,397 +12,427 @@
#include "main.hpp" #include "main.hpp"
#include <IRQ.h> #include <IRQ.h>
volatile uint16_t PWMSafetyTimer = 0; volatile uint16_t PWMSafetyTimer = 0;
volatile uint8_t pendingPWM = 0; volatile uint8_t pendingPWM = 0;
uint16_t totalPWM = 255; uint16_t totalPWM = 255;
const uint16_t powerPWM = 255; const uint16_t powerPWM = 255;
history<uint16_t, PID_TIM_HZ> rawTempFilter = {{0}, 0, 0}; history<uint16_t, PID_TIM_HZ> rawTempFilter = { { 0 }, 0, 0 };
void resetWatchdog() { HAL_IWDG_Refresh(&hiwdg); } void resetWatchdog() {
HAL_IWDG_Refresh(&hiwdg);
}
#ifdef TEMP_NTC #ifdef TEMP_NTC
// Lookup table for the NTC // Lookup table for the NTC
// Stored as ADCReading,Temp in degC // Stored as ADCReading,Temp in degC
static const uint16_t NTCHandleLookup[] = { static const uint16_t NTCHandleLookup[] = {
// ADC Reading , Temp in Cx10 // ADC Reading , Temp in Cx10
808, 1600, // 808, 1600, //
832, 1590, // 832, 1590, //
848, 1580, // 848, 1580, //
872, 1570, // 872, 1570, //
888, 1560, // 888, 1560, //
912, 1550, // 912, 1550, //
936, 1540, // 936, 1540, //
960, 1530, // 960, 1530, //
984, 1520, // 984, 1520, //
1008, 1510, // 1008, 1510, //
1032, 1500, // 1032, 1500, //
1056, 1490, // 1056, 1490, //
1080, 1480, // 1080, 1480, //
1112, 1470, // 1112, 1470, //
1136, 1460, // 1136, 1460, //
1168, 1450, // 1168, 1450, //
1200, 1440, // 1200, 1440, //
1224, 1430, // 1224, 1430, //
1256, 1420, // 1256, 1420, //
1288, 1410, // 1288, 1410, //
1328, 1400, // 1328, 1400, //
1360, 1390, // 1360, 1390, //
1392, 1380, // 1392, 1380, //
1432, 1370, // 1432, 1370, //
1464, 1360, // 1464, 1360, //
1504, 1350, // 1504, 1350, //
1544, 1340, // 1544, 1340, //
1584, 1330, // 1584, 1330, //
1632, 1320, // 1632, 1320, //
1672, 1310, // 1672, 1310, //
1720, 1300, // 1720, 1300, //
1760, 1290, // 1760, 1290, //
1808, 1280, // 1808, 1280, //
1856, 1270, // 1856, 1270, //
1912, 1260, // 1912, 1260, //
1960, 1250, // 1960, 1250, //
2016, 1240, // 2016, 1240, //
2072, 1230, // 2072, 1230, //
2128, 1220, // 2128, 1220, //
2184, 1210, // 2184, 1210, //
2248, 1200, // 2248, 1200, //
2304, 1190, // 2304, 1190, //
2368, 1180, // 2368, 1180, //
2440, 1170, // 2440, 1170, //
2504, 1160, // 2504, 1160, //
2576, 1150, // 2576, 1150, //
2648, 1140, // 2648, 1140, //
2720, 1130, // 2720, 1130, //
2792, 1120, // 2792, 1120, //
2872, 1110, // 2872, 1110, //
2952, 1100, // 2952, 1100, //
3040, 1090, // 3040, 1090, //
3128, 1080, // 3128, 1080, //
3216, 1070, // 3216, 1070, //
3304, 1060, // 3304, 1060, //
3400, 1050, // 3400, 1050, //
3496, 1040, // 3496, 1040, //
3592, 1030, // 3592, 1030, //
3696, 1020, // 3696, 1020, //
3800, 1010, // 3800, 1010, //
3912, 1000, // 3912, 1000, //
4024, 990, // 4024, 990, //
4136, 980, // 4136, 980, //
4256, 970, // 4256, 970, //
4376, 960, // 4376, 960, //
4504, 950, // 4504, 950, //
4632, 940, // 4632, 940, //
4768, 930, // 4768, 930, //
4904, 920, // 4904, 920, //
5048, 910, // 5048, 910, //
5192, 900, // 5192, 900, //
5336, 890, // 5336, 890, //
5488, 880, // 5488, 880, //
5648, 870, // 5648, 870, //
5808, 860, // 5808, 860, //
5976, 850, // 5976, 850, //
6144, 840, // 6144, 840, //
6320, 830, // 6320, 830, //
6504, 820, // 6504, 820, //
6688, 810, // 6688, 810, //
6872, 800, // 6872, 800, //
7072, 790, // 7072, 790, //
7264, 780, // 7264, 780, //
7472, 770, // 7472, 770, //
7680, 760, // 7680, 760, //
7896, 750, // 7896, 750, //
8112, 740, // 8112, 740, //
8336, 730, // 8336, 730, //
8568, 720, // 8568, 720, //
8800, 710, // 8800, 710, //
9040, 700, // 9040, 700, //
9288, 690, // 9288, 690, //
9536, 680, // 9536, 680, //
9792, 670, // 9792, 670, //
10056, 660, // 10056, 660, //
10320, 650, // 10320, 650, //
10592, 640, // 10592, 640, //
10872, 630, // 10872, 630, //
11152, 620, // 11152, 620, //
11440, 610, // 11440, 610, //
11728, 600, // 11728, 600, //
12024, 590, // 12024, 590, //
12320, 580, // 12320, 580, //
12632, 570, // 12632, 570, //
12936, 560, // 12936, 560, //
13248, 550, // 13248, 550, //
13568, 540, // 13568, 540, //
13888, 530, // 13888, 530, //
14216, 520, // 14216, 520, //
14544, 510, // 14544, 510, //
14880, 500, // 14880, 500, //
15216, 490, // 15216, 490, //
15552, 480, // 15552, 480, //
15888, 470, // 15888, 470, //
16232, 460, // 16232, 460, //
16576, 450, // 16576, 450, //
16920, 440, // 16920, 440, //
17272, 430, // 17272, 430, //
17616, 420, // 17616, 420, //
17968, 410, // 17968, 410, //
18320, 400, // 18320, 400, //
18664, 390, // 18664, 390, //
19016, 380, // 19016, 380, //
19368, 370, // 19368, 370, //
19712, 360, // 19712, 360, //
20064, 350, // 20064, 350, //
20408, 340, // 20408, 340, //
20752, 330, // 20752, 330, //
21088, 320, // 21088, 320, //
21432, 310, // 21432, 310, //
21768, 300, // 21768, 300, //
22096, 290, // 22096, 290, //
22424, 280, // 22424, 280, //
22752, 270, // 22752, 270, //
23072, 260, // 23072, 260, //
23392, 250, // 23392, 250, //
23704, 240, // 23704, 240, //
24008, 230, // 24008, 230, //
24312, 220, // 24312, 220, //
24608, 210, // 24608, 210, //
24904, 200, // 24904, 200, //
25192, 190, // 25192, 190, //
25472, 180, // 25472, 180, //
25744, 170, // 25744, 170, //
26016, 160, // 26016, 160, //
26280, 150, // 26280, 150, //
26536, 140, // 26536, 140, //
26784, 130, // 26784, 130, //
27024, 120, // 27024, 120, //
27264, 110, // 27264, 110, //
27496, 100, // 27496, 100, //
27720, 90, // 27720, 90, //
27936, 80, // 27936, 80, //
28144, 70, // 28144, 70, //
28352, 60, // 28352, 60, //
28544, 50, // 28544, 50, //
28736, 40, // 28736, 40, //
28920, 30, // 28920, 30, //
29104, 20, // 29104, 20, //
29272, 10, // 29272, 10, //
}; };
const int NTCHandleLookupItems = sizeof(NTCHandleLookup) / (2 * sizeof(uint16_t)); const int NTCHandleLookupItems = sizeof(NTCHandleLookup)
/ (2 * sizeof(uint16_t));
#endif #endif
// These are called by the HAL after the corresponding events from the system // These are called by the HAL after the corresponding events from the system
// timers. // timers.
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
// Period has elapsed // Period has elapsed
if (htim->Instance == TIM1) { if (htim->Instance == TIM1) {
// STM uses this for internal functions as a counter for timeouts // STM uses this for internal functions as a counter for timeouts
HAL_IncTick(); HAL_IncTick();
} }
} }
uint16_t getHandleTemperature() { uint16_t getHandleTemperature() {
int32_t result = getADC(0); int32_t result = getADC(0);
return Utils::InterpolateLookupTable(NTCHandleLookup, NTCHandleLookupItems, result); return Utils::InterpolateLookupTable(NTCHandleLookup, NTCHandleLookupItems,
result);
} }
uint16_t getTipInstantTemperature() { return getADC(2); } uint16_t getTipInstantTemperature() {
return getADC(2);
}
uint16_t getTipRawTemp(uint8_t refresh) { uint16_t getTipRawTemp(uint8_t refresh) {
if (refresh) { if (refresh) {
uint16_t lastSample = getTipInstantTemperature(); uint16_t lastSample = getTipInstantTemperature();
rawTempFilter.update(lastSample); rawTempFilter.update(lastSample);
return lastSample; return lastSample;
} else { } else {
return rawTempFilter.average(); return rawTempFilter.average();
} }
} }
uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) { uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
// ADC maximum is 32767 == 3.3V at input == 28.05V at VIN // ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
// Therefore we can divide down from there // Therefore we can divide down from there
// Multiplying ADC max by 4 for additional calibration options, // Multiplying ADC max by 4 for additional calibration options,
// ideal term is 467 // ideal term is 467
static uint8_t preFillneeded = 10; static uint8_t preFillneeded = 10;
static uint32_t samples[BATTFILTERDEPTH]; static uint32_t samples[BATTFILTERDEPTH];
static uint8_t index = 0; static uint8_t index = 0;
if (preFillneeded) { if (preFillneeded) {
for (uint8_t i = 0; i < BATTFILTERDEPTH; i++) for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
samples[i] = getADC(1); samples[i] = getADC(1);
preFillneeded--; preFillneeded--;
} }
if (sample) { if (sample) {
samples[index] = getADC(1); samples[index] = getADC(1);
index = (index + 1) % BATTFILTERDEPTH; index = (index + 1) % BATTFILTERDEPTH;
} }
uint32_t sum = 0; uint32_t sum = 0;
for (uint8_t i = 0; i < BATTFILTERDEPTH; i++) for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
sum += samples[i]; sum += samples[i];
sum /= BATTFILTERDEPTH; sum /= BATTFILTERDEPTH;
if (divisor == 0) { if (divisor == 0) {
divisor = 1; divisor = 1;
} }
return sum * 4 / divisor; return sum * 4 / divisor;
} }
bool tryBetterPWM(uint8_t pwm) { bool tryBetterPWM(uint8_t pwm) {
// We dont need this for the MHP30 // We dont need this for the MHP30
return false; return false;
} }
void setTipPWM(uint8_t pulse) { void setTipPWM(uint8_t pulse) {
// We can just set the timer directly // We can just set the timer directly
htim3.Instance->CCR1 = pulse; htim3.Instance->CCR1 = pulse;
} }
void unstick_I2C() { void unstick_I2C() {
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
int timeout = 100; int timeout = 100;
int timeout_cnt = 0; int timeout_cnt = 0;
// 1. Clear PE bit. // 1. Clear PE bit.
hi2c1.Instance->CR1 &= ~(0x0001); hi2c1.Instance->CR1 &= ~(0x0001);
/**I2C1 GPIO Configuration /**I2C1 GPIO Configuration
PB6 ------> I2C1_SCL PB6 ------> I2C1_SCL
PB7 ------> I2C1_SDA PB7 ------> I2C1_SDA
*/ */
// 2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR). // 2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR).
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
GPIO_InitStruct.Pull = GPIO_PULLUP; GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
GPIO_InitStruct.Pin = SCL_Pin; GPIO_InitStruct.Pin = SCL_Pin;
HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
GPIO_InitStruct.Pin = SDA_Pin; GPIO_InitStruct.Pin = SDA_Pin;
HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) { while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) {
// Move clock to release I2C // Move clock to release I2C
HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET);
asm("nop"); asm("nop");
asm("nop"); asm("nop");
asm("nop"); asm("nop");
asm("nop"); asm("nop");
HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
timeout_cnt++; timeout_cnt++;
if (timeout_cnt > timeout) if (timeout_cnt > timeout)
return; return;
} }
// 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain. // 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
GPIO_InitStruct.Pull = GPIO_PULLUP; GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
GPIO_InitStruct.Pin = SCL_Pin; GPIO_InitStruct.Pin = SCL_Pin;
HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
GPIO_InitStruct.Pin = SDA_Pin; GPIO_InitStruct.Pin = SDA_Pin;
HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
// 13. Set SWRST bit in I2Cx_CR1 register. // 13. Set SWRST bit in I2Cx_CR1 register.
hi2c1.Instance->CR1 |= 0x8000; hi2c1.Instance->CR1 |= 0x8000;
asm("nop"); asm("nop");
// 14. Clear SWRST bit in I2Cx_CR1 register. // 14. Clear SWRST bit in I2Cx_CR1 register.
hi2c1.Instance->CR1 &= ~0x8000; hi2c1.Instance->CR1 &= ~0x8000;
asm("nop"); asm("nop");
// 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register // 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
hi2c1.Instance->CR1 |= 0x0001; hi2c1.Instance->CR1 |= 0x0001;
// Call initialization function. // Call initialization function.
HAL_I2C_Init(&hi2c1); HAL_I2C_Init(&hi2c1);
} }
uint8_t getButtonA() { return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ? 1 : 0; } uint8_t getButtonA() {
uint8_t getButtonB() { return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ? 1 : 0; } return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ?
1 : 0;
}
uint8_t getButtonB() {
return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ?
1 : 0;
}
void BSPInit(void) {} void BSPInit(void) {
}
void reboot() { NVIC_SystemReset(); } void reboot() {
NVIC_SystemReset();
}
void delay_ms(uint16_t count) { HAL_Delay(count); } void delay_ms(uint16_t count) {
HAL_Delay(count);
}
void setPlatePullup(bool pullingUp) { void setPlatePullup(bool pullingUp) {
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
GPIO_InitStruct.Pin = PLATE_SENSOR_PULLUP_Pin; GPIO_InitStruct.Pin = PLATE_SENSOR_PULLUP_Pin;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
if (pullingUp) { if (pullingUp) {
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port, PLATE_SENSOR_PULLUP_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port,
} else { PLATE_SENSOR_PULLUP_Pin, GPIO_PIN_SET);
// Hi-z } else {
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; // Hi-z
HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port, PLATE_SENSOR_PULLUP_Pin, GPIO_PIN_RESET); GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
} HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port,
HAL_GPIO_Init(PLATE_SENSOR_PULLUP_GPIO_Port, &GPIO_InitStruct); PLATE_SENSOR_PULLUP_Pin, GPIO_PIN_RESET);
}
HAL_GPIO_Init(PLATE_SENSOR_PULLUP_GPIO_Port, &GPIO_InitStruct);
} }
uint16_t tipSenseResistancex10Ohms = 0; uint16_t tipSenseResistancex10Ohms = 0;
bool isTipDisconnected() { bool isTipDisconnected() {
static bool lastTipDisconnectedState = true; static bool lastTipDisconnectedState = true;
static uint16_t adcReadingPD1Set = 0; static uint16_t adcReadingPD1Set = 0;
static TickType_t lastMeas = 0; static TickType_t lastMeas = 0;
// For the MHP30 we want to include a little extra logic in here // For the MHP30 we want to include a little extra logic in here
// As when the tip is first connected we want to measure the ~100 ohm resistor on the base of the tip // As when the tip is first connected we want to measure the ~100 ohm resistor on the base of the tip
// And likewise if its removed we want to clear that measurement // And likewise if its removed we want to clear that measurement
/* /*
* plate_sensor_res = ((adc5_value_PD1_set - adc5_value_PD1_cleared) / (adc5_value_PD1_cleared + 4096 - adc5_value_PD1_set)) * 1000.0; * plate_sensor_res = ((adc5_value_PD1_set - adc5_value_PD1_cleared) / (adc5_value_PD1_cleared + 4096 - adc5_value_PD1_set)) * 1000.0;
* */ * */
uint16_t tipDisconnectedThres = TipThermoModel::getTipMaxInC() - 5; bool tipDisconnected = getADC(2) > 4090;
uint32_t tipTemp = TipThermoModel::getTipInC(); // We have to handle here that this ^ will trip while measuring the gain resistor
bool tipDisconnected = tipTemp > tipDisconnectedThres; if (xTaskGetTickCount() - lastMeas
// We have to handle here that this ^ will trip while measuring the gain resistor < (TICKS_100MS * 2 + (TICKS_100MS / 2))) {
if (xTaskGetTickCount() - lastMeas < (TICKS_100MS * 2 + (TICKS_100MS / 2))) { tipDisconnected = false;
tipDisconnected = false; }
}
if (tipDisconnected != lastTipDisconnectedState) { if (tipDisconnected != lastTipDisconnectedState) {
if (tipDisconnected) { if (tipDisconnected) {
// Tip is now disconnected // Tip is now disconnected
tipSenseResistancex10Ohms = 0; // zero out the resistance tipSenseResistancex10Ohms = 0; // zero out the resistance
adcReadingPD1Set = 0; adcReadingPD1Set = 0;
lastMeas = 0; lastMeas = 0;
} }
lastTipDisconnectedState = tipDisconnected; lastTipDisconnectedState = tipDisconnected;
} }
if (!tipDisconnected) { if (!tipDisconnected) {
if (tipSenseResistancex10Ohms == 0) { if (tipSenseResistancex10Ohms == 0) {
if (lastMeas == 0) { if (lastMeas == 0) {
lastMeas = xTaskGetTickCount(); lastMeas = xTaskGetTickCount();
setPlatePullup(true); setPlatePullup(true);
} else if (xTaskGetTickCount() - lastMeas > (TICKS_100MS)) { } else if (xTaskGetTickCount() - lastMeas > (TICKS_100MS)) {
lastMeas = xTaskGetTickCount(); lastMeas = xTaskGetTickCount();
// We are sensing the resistance // We are sensing the resistance
if (adcReadingPD1Set == 0) { if (adcReadingPD1Set == 0) {
// We will record the reading for PD1 being set // We will record the reading for PD1 being set
adcReadingPD1Set = getADC(3); adcReadingPD1Set = getADC(3);
setPlatePullup(false); setPlatePullup(false);
} else { } else {
// We have taken reading one // We have taken reading one
uint16_t adcReadingPD1Cleared = getADC(3); uint16_t adcReadingPD1Cleared = getADC(3);
uint32_t a = ((int)adcReadingPD1Set - (int)adcReadingPD1Cleared); uint32_t a = ((int) adcReadingPD1Set
a *= 10000; - (int) adcReadingPD1Cleared);
uint32_t b = ((int)adcReadingPD1Cleared + (32768 - (int)adcReadingPD1Set)); a *= 10000;
if (b) { uint32_t b = ((int) adcReadingPD1Cleared
tipSenseResistancex10Ohms = a / b; + (32768 - (int) adcReadingPD1Set));
} else { if (b) {
tipSenseResistancex10Ohms = adcReadingPD1Set = lastMeas = 0; tipSenseResistancex10Ohms = a / b;
} } else {
} tipSenseResistancex10Ohms = adcReadingPD1Set =
} lastMeas = 0;
return true; // we fake tip being disconnected until this is measured }
} if (tipSenseResistancex10Ohms > 1100
} || tipSenseResistancex10Ohms < 900) {
tipSenseResistancex10Ohms = 0; // out of range
adcReadingPD1Set = 0;
lastMeas = 0;
}
}
}
return true; // we fake tip being disconnected until this is measured
}
}
return tipDisconnected; return tipDisconnected;
}
void setStatusLED(const enum StatusLED state) {
} }

2
source/Core/BSP/Miniware/BSP.cpp
View File

@@ -347,3 +347,5 @@ bool isTipDisconnected() {
uint32_t tipTemp = TipThermoModel::getTipInC(); uint32_t tipTemp = TipThermoModel::getTipInC();
return tipTemp > tipDisconnectedThres; return tipTemp > tipDisconnectedThres;
} }
void setStatusLED(const enum StatusLED state) {}

2
source/Core/BSP/Pine64/BSP.cpp
View File

@@ -129,3 +129,5 @@ bool isTipDisconnected() {
uint32_t tipTemp = TipThermoModel::getTipInC(); uint32_t tipTemp = TipThermoModel::getTipInC();
return tipTemp > tipDisconnectedThres; return tipTemp > tipDisconnectedThres;
} }
void setStatusLED(const enum StatusLED state) {}