diff options
Diffstat (limited to 'firmware/osccalASM.S')
| -rw-r--r-- | firmware/osccalASM.S | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/firmware/osccalASM.S b/firmware/osccalASM.S index 9a317f1..c0c8803 100644 --- a/firmware/osccalASM.S +++ b/firmware/osccalASM.S @@ -90,7 +90,7 @@ .global calibrateOscillatorASM calibrateOscillatorASM: - cli +; cli ldi opD, 255 ldi try, 128 ; calibration start value @@ -105,13 +105,19 @@ usbCOloop: ; Delay values = F_CPU * 999e-6 / 5 + 0.5 #if (F_CPU == 16500000) - ldi cnt16L, lo8(3297) - ldi cnt16H, hi8(3297) + ldi cnt16L, lo8(3297) + ldi cnt16H, hi8(3297) #elif (F_CPU == 12800000) - ldi cnt16L, lo8(2557) - ldi cnt16H, hi8(2557) + ldi cnt16L, lo8(2557) + ldi cnt16H, hi8(2557) +#elif (F_CPU == 12000000) + ldi cnt16L, lo8(2398) + ldi cnt16H, hi8(2398) +#elif (F_CPU == 16000000) + ldi cnt16L, lo8(3197) + ldi cnt16H, hi8(3197) #else - #error "calibrateOscillatorASM: no delayvalues defined for this F_CPU setting" + #error "calibrateOscillatorASM: no delayvalues defined for this F_CPU setting" #endif usbCOWaitStrobe: ; first wait for D- == 0 (idle strobe) @@ -147,8 +153,8 @@ usbCOnoneighborhoodsearch: out OSCCAL, opV nop - sei - ret +; sei + ret #undef i #undef opV |