Merge remote-tracking branch 'upstream/dev' into magic

This commit is contained in:
Ben V. Brown
2022-07-25 21:08:00 +10:00
22 changed files with 81 additions and 65 deletions

View File

@@ -49,7 +49,7 @@ uint32_t availableW10(uint8_t sample) {
// R = R*10
// P therefore is in V^2*100/R*10 = W*10.
uint32_t v = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), sample); // 100 = 10v
uint32_t tipResistance = getTipResitanceX10();
uint32_t tipResistance = getTipResistanceX10();
if (tipResistance == 0) {
return 100; // say 100 watt to force scale down
}