diff options
| author | cpldcpu <cpldcpu@gmail.com> | 2014-02-02 16:47:01 +0100 |
|---|---|---|
| committer | cpldcpu <cpldcpu@gmail.com> | 2014-02-02 16:47:01 +0100 |
| commit | d62cd9f9453c128819a81cdf3e5ece82454b0c04 (patch) | |
| tree | 4c90c9e7c27b086ab6607ba2fee7a41653c94b95 | |
| parent | a6d2d3151498284efe8241ea1a6e300973038698 (diff) | |
| download | micronucleus-d62cd9f9453c128819a81cdf3e5ece82454b0c04.tar.gz micronucleus-d62cd9f9453c128819a81cdf3e5ece82454b0c04.tar.bz2 micronucleus-d62cd9f9453c128819a81cdf3e5ece82454b0c04.zip | |
small fixed
| -rw-r--r-- | firmware/main.c | 2 | ||||
| -rw-r--r-- | firmware/osccalASM.S | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/firmware/main.c b/firmware/main.c index be31176..aab826c 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -99,8 +99,6 @@ USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) { return 0; "r" ((uint8_t)(__BOOT_PAGE_FILL | (1 << CTPB))) \ ); \ })) -// : "i" (_SFR_MEM_ADDR(__SPM_REG)), \ - // erase any existing application and write in jumps for usb interrupt and reset to bootloader // - Because flash can be erased once and programmed several times, we can write the bootloader diff --git a/firmware/osccalASM.S b/firmware/osccalASM.S index 9c3b45a..69bad9f 100644 --- a/firmware/osccalASM.S +++ b/firmware/osccalASM.S @@ -123,6 +123,9 @@ usbCOloop: #elif (F_CPU == 16000000) ldi cnt16L, lo8(3197) ldi cnt16H, hi8(3197) +#elif (F_CPU == 15000000) + ldi cnt16L, lo8(2998) + ldi cnt16H, hi8(2998) #else #error "calibrateOscillatorASM: no delayvalues defined for this F_CPU setting" #endif |