Stephan/thhor_crs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Stephan:8c6784387e7ad83bedcbd9e744ba7346038f759d
Branches Tags
Stephan:master
Stephan:csa_mirror
Stephan:falbala
..
compare: Stephan:6960009b361e5f31a25dcb39ba3fe47d0971b3ca
Branches Tags
Stephan:master
Stephan:csa_mirror
Stephan:falbala

No commits in common. "8c6784387e7ad83bedcbd9e744ba7346038f759d" and "6960009b361e5f31a25dcb39ba3fe47d0971b3ca" have entirely different histories.
8c6784387e ... 6960009b36

2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/flash.c
View file

@ -220,7 +220,7 @@ static inline
uint8_t flash_erase_next_page() uint8_t flash_erase_next_page()
{ {
uint16_t mode = 0x81; // Page Erase uint16_t mode = 0x81; // Page Erase
if (~fs.block & 8) if (~b & 8)
fs.npages++; fs.npages++;
uint8_t n = 0; uint8_t n = 0;
if (fs.page && !(fs.page & 0xff) && fs.npages & 0xff00) { if (fs.page && !(fs.page & 0xff) && fs.npages & 0xff00) {

4
src/rtc.c
View file

@ -81,7 +81,7 @@ ISR(RTC_CNT_vect, ISR_NAKED)
"subi r24, -1" "\n\t" "subi r24, -1" "\n\t"
"sts clockh, r24" "\n\t" "sts clockh, r24" "\n\t"
"lds r24, clockh+1" "\n\t" "lds r24, clockh+1" "\n\t"
"sbci r24, 0" "\n\t" "sbci r24, -1" "\n\t"
"sts clockh+1, r24" "\n\t" "sts clockh+1, r24" "\n\t"
"2:" "\n\t" "2:" "\n\t"
"pop r24" "\n\t" "pop r24" "\n\t"
@ -109,7 +109,7 @@ ISR(RTC_CNT_vect)
if (flag & RTC_CNT_bm) if (flag & RTC_CNT_bm)
RTC.CMP += rtc_config[1].val | rtc_config[2].val << 8; RTC.CMP += rtc_config[1].val | rtc_config[2].val << 8;
if (flag & RTC_OVF_bm) if (flag & RTC_OVF_bm)
clockh += 1; clock += 1;
return; return;
} }
#endif #endif