Skip to content

Commit

Permalink
Merge pull request #165 from NordicSemiconductor/release/1.2.2
Browse files Browse the repository at this point in the history
Release/1.2.2
  • Loading branch information
kylebonnici authored May 10, 2024
2 parents 046e11b + 41da46a commit fbe05da
Show file tree
Hide file tree
Showing 7 changed files with 19,429 additions and 19,927 deletions.
10 changes: 4 additions & 6 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
## 1.3.0 - UNRELEASED

### Added

- Charger Battery Limit (BatLim) configuration.
## 1.2.2 - 2024-03-10

### Changed

- Updated firmware to v1.1.1+0.
- Updated firmware to v1.2.0+0
- iBat current < 15 mA will it not rendered on the graph or the Battery status
card
- During profiling, when a battery is considered disconnected (vBat < 1 V), a
warning is now issued instead of a terminating error.
- Moved feedback tab to a dialog which can be opened by going to the about tab
Expand Down
19,887 changes: 0 additions & 19,887 deletions fw/app_signed_1.1.1+0.hex

This file was deleted.

19,397 changes: 19,397 additions & 0 deletions fw/app_signed_1.2.0+0.hex

Large diffs are not rendered by default.

44 changes: 19 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pc-nrfconnect-npm",
"version": "1.3.0",
"version": "1.2.2",
"description": "Evaluate and implement Nordic's PMICs",
"displayName": "nPM PowerUP",
"homepage": "https://github.com/NordicPlayground/pc-nrfconnect-npm",
Expand Down Expand Up @@ -49,7 +49,7 @@
"prepare": "husky install"
},
"devDependencies": {
"@nordicsemiconductor/pc-nrfconnect-shared": "^173.0.0",
"@nordicsemiconductor/pc-nrfconnect-shared": "^176.0.0",
"chart.js": "^4.0.1",
"chartjs-adapter-date-fns": "^2.0.1",
"react-chartjs-2": "^5.0.1",
Expand Down
12 changes: 6 additions & 6 deletions src/components/Cards/Power/PowerCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import { DocumentationTooltip } from '../../../features/pmicControl/npm/documentation/documentation';
import {
Charger,
isFixedListRangeWithLabel,
// isFixedListRangeWithLabel,
ITerm,
ITermValues,
NpmDevice,
Expand Down Expand Up @@ -56,16 +56,16 @@ export default ({

const [internalVTerm, setInternalVTerm] = useState(charger.vTerm);
const [internalIChg, setInternalIChg] = useState(charger.iChg);
const [internalBatLim, setInternalBatLim] = useState(charger.iBatLim);
// const [internalBatLim, setInternalBatLim] = useState(charger.iBatLim);

// NumberInputSliderWithUnit do not use charger.<prop> as value as we send only at on change complete
useEffect(() => {
setInternalVTerm(charger.vTerm);
setInternalIChg(charger.iChg);
setInternalBatLim(charger.iBatLim);
// setInternalBatLim(charger.iBatLim);
}, [charger]);

const chargerIBatLimRange = npmDevice.getChargerIBatLimRange();
// const chargerIBatLimRange = npmDevice.getChargerIBatLimRange();

return (
<Card
Expand Down Expand Up @@ -136,7 +136,7 @@ export default ({

{!summary && (
<>
{isFixedListRangeWithLabel(chargerIBatLimRange) &&
{/* {isFixedListRangeWithLabel(chargerIBatLimRange) &&
chargerIBatLimRange.toLabel !== undefined ? (
<Dropdown
items={[
Expand Down Expand Up @@ -200,7 +200,7 @@ export default ({
}
showSlider
/>
)}
)} */}

<Toggle
label={
Expand Down
2 changes: 1 addition & 1 deletion src/features/pmicControl/npm/npm1300/pmic1300Device.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import setupPof from './pof';
import setupShipMode from './shipMode';
import setupTimer from './timer';

export const npm1300FWVersion = '1.1.1+0';
export const npm1300FWVersion = '1.2.0+0';

export const getNPM1300: INpmDevice = (shellParser, dialogHandler) => {
const eventEmitter = new NpmEventEmitter();
Expand Down

0 comments on commit fbe05da

Please sign in to comment.