Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable preprocessor code indentation

pull/48/head
Alan Dragomirecký 2021-07-07 15:51:27 +02:00 committed by Alan Dragomirecký
parent f95c47638d
commit 9448c04b36
8 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -75,7 +75,7 @@ IncludeCategories:
Priority: 1 Priority: 1
IncludeIsMainRegex: '(Test)?$' IncludeIsMainRegex: '(Test)?$'
IndentCaseLabels: false IndentCaseLabels: false
IndentPPDirectives: BeforeHash IndentPPDirectives: None
IndentWidth: 4 IndentWidth: 4
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave JavaScriptQuotes: Leave

3
src/hal/avr/shr16.cpp
View File

@ -22,8 +22,7 @@ void SHR16::Init() {
void SHR16::Write(uint16_t v) { void SHR16::Write(uint16_t v) {
using namespace hal::gpio; using namespace hal::gpio;
WritePin(SHR16_LATCH, Level::low); WritePin(SHR16_LATCH, Level::low);
for (uint16_t m = 0x8000; m; m >>= 1) for (uint16_t m = 0x8000; m; m >>= 1) {
{
WritePin(SHR16_DATA, (Level)((m & v) != 0)); WritePin(SHR16_DATA, (Level)((m & v) != 0));
WritePin(SHR16_CLOCK, Level::high); WritePin(SHR16_CLOCK, Level::high);
WritePin(SHR16_CLOCK, Level::low); WritePin(SHR16_CLOCK, Level::low);

3
src/hal/progmem.h
View File

@ -13,8 +13,7 @@ namespace hal {
namespace progmem { namespace progmem {
/// read a 16bit word from PROGMEM /// read a 16bit word from PROGMEM
static inline uint16_t read_word(const uint16_t* addr) static inline uint16_t read_word(const uint16_t *addr) {
{
#ifndef __AVR__ #ifndef __AVR__
return *addr; return *addr;
#else #else

3
src/hal/usart.h
View File

@ -88,7 +88,8 @@ public:
husart->UCSRxB &= ~(1 << 5); // disable UDRE interrupt husart->UCSRxB &= ~(1 << 5); // disable UDRE interrupt
} }
USART(hal::usart::USART::USART_TypeDef *husart) : husart(husart) {}; USART(hal::usart::USART::USART_TypeDef *husart)
: husart(husart) {};
private: private:
// IO base address // IO base address