Skip to content

Commit 644351b

Browse files
committed
add range check for getYear(), getHour(), getMinute(), getSecond()
1 parent 3cdd29b commit 644351b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ds1307.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace DS1307 {
8181
//% weight=99 blockGap=8
8282
//% parts=DS1307 trackArgs=0
8383
export function getYear(): number {
84-
return (HexToDec(getReg(DS1307_REG_YEAR)) + 2000)
84+
return Math.min(HexToDec(getReg(DS1307_REG_YEAR)), 99) + 2000
8585
}
8686

8787
/**
@@ -168,7 +168,7 @@ namespace DS1307 {
168168
//% weight=95 blockGap=8
169169
//% parts=DS1307 trackArgs=0
170170
export function getHour(): number {
171-
return HexToDec(getReg(DS1307_REG_HOUR)) % 24
171+
return Math.min(HexToDec(getReg(DS1307_REG_HOUR)), 23)
172172
}
173173

174174
/**
@@ -190,7 +190,7 @@ namespace DS1307 {
190190
//% weight=94 blockGap=8
191191
//% parts=DS1307 trackArgs=0
192192
export function getMinute(): number {
193-
return HexToDec(getReg(DS1307_REG_MINUTE)) % 60
193+
return Math.min(HexToDec(getReg(DS1307_REG_MINUTE)), 59)
194194
}
195195

196196
/**
@@ -212,7 +212,7 @@ namespace DS1307 {
212212
//% weight=93 blockGap=8
213213
//% parts=DS1307 trackArgs=0
214214
export function getSecond(): number {
215-
return HexToDec(getReg(DS1307_REG_SECOND)) % 60
215+
return Math.min(HexToDec(getReg(DS1307_REG_SECOND)), 59)
216216
}
217217

218218
/**

0 commit comments

Comments
 (0)