josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'MK3' into update_readme

This commit is contained in:
Marek Bel 2019-04-25 07:43:51 +02:00
parent a8e62007ca 238079fc95
commit 6dce7413b6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/config.h
View File

@ -45,7 +45,7 @@
//LANG - Multi-language support //LANG - Multi-language support
//#define LANG_MODE 0 // primary language only //#define LANG_MODE 0 // primary language only
#define LANG_MODE 1 // sec. language support #define LANG_MODE 1 // sec. language support
#define LANG_SIZE_RESERVED 0x2f00 // reserved space for secondary language (12032 bytes) #define LANG_SIZE_RESERVED 0x2b00 // reserved space for secondary language (11008 bytes)
#endif //_CONFIG_H #endif //_CONFIG_H

5
Firmware/timer02.c
View File

@ -2,6 +2,9 @@
// use atmega timer2 as main system timer instead of timer0 // use atmega timer2 as main system timer instead of timer0
// timer0 is used for fast pwm (OC0B output) // timer0 is used for fast pwm (OC0B output)
// original OVF handler is disabled // original OVF handler is disabled
#ifdef SYSTEM_TIMER_2
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include "Arduino.h" #include "Arduino.h"
@ -166,3 +169,5 @@ void noTone2(__attribute__((unused)) uint8_t _pin)
{ {
PIN_CLR(BEEPER); PIN_CLR(BEEPER);
} }
#endif //SYSTEM_TIMER_2