amr
/
rotl_quotes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed .h files, formatted all code with astyle -A14 

I now have a post-build step which formats all the code using
astyle -n -z2 -Z -A14 *.hpp *.cpp
The options are to preserve the dates of each file, force the
Linux line endings, and format the files directly omitting the
creation of the .orig file. The -A14 is "Google" style which
happens to be the style I've always personally used, which is
handy.
This commit is contained in:
A.M. Rowsell 2020-10-06 12:01:34 -04:00
parent d9b5b15b96
commit f8eab9ebd9
Signed by: amr
GPG Key ID: 0B6E2D8375CF79A9
10 changed files with 343 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FlashStorage.cpp
View File

@ -35,14 +35,11 @@ uint8_t FlashStorage::readStatusRegister(void) {
if(statusReg & 0x01) { if(statusReg & 0x01) {
return FLASH_BUSY; return FLASH_BUSY;
} } else if(statusReg & 0x20) {
else if(statusReg & 0x20) {
return FLASH_ERASE_ERROR; return FLASH_ERASE_ERROR;
} } else if(statusReg & 0x40) {
else if(statusReg & 0x40) {
return FLASH_PROG_ERROR; return FLASH_PROG_ERROR;
} } else {
else {
return FLASH_OKAY; return FLASH_OKAY;
} }
} }

0
fuses.h → fuses.hpp
View File

0
i2c.h → i2c.hpp
View File

8
main.cpp
View File

@ -13,7 +13,7 @@
#include <sys/attribs.h> #include <sys/attribs.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "i2c.h" #include "i2c.hpp"
#include "FIFO.hpp" #include "FIFO.hpp"
#include "FlashStorage.hpp" #include "FlashStorage.hpp"
#include "UART.hpp" #include "UART.hpp"
@ -35,10 +35,12 @@ volatile uint8_t currentClip = 0;
const uint32_t audioSize[16] = {0x0000ba8d, 0x0000d063, 0x000069fa, 0x00007c3e, const uint32_t audioSize[16] = {0x0000ba8d, 0x0000d063, 0x000069fa, 0x00007c3e,
0x000030b4, 0x0000c676, 0x000020fd, 0x00005314, 0x00002db8, 0x00002fbd, 0x000030b4, 0x0000c676, 0x000020fd, 0x00005314, 0x00002db8, 0x00002fbd,
0x000046c0, 0x0000bc92, 0x0000a257, 0x00002830, 0x00011790, 0x0000a5b7}; 0x000046c0, 0x0000bc92, 0x0000a257, 0x00002830, 0x00011790, 0x0000a5b7
};
const uint32_t audioAddress[16] = {0x00, 0x0000ba8d, 0x00018af0, 0x0001f4ea, const uint32_t audioAddress[16] = {0x00, 0x0000ba8d, 0x00018af0, 0x0001f4ea,
0x00027128, 0x0002a1dc, 0x00036852, 0x0003894f, 0x0003dc63, 0x00040a1b, 0x00027128, 0x0002a1dc, 0x00036852, 0x0003894f, 0x0003dc63, 0x00040a1b,
0x000439d8, 0x00048098, 0x00053d2a, 0x0005df81, 0x000607b1, 0x00071f41}; 0x000439d8, 0x00048098, 0x00053d2a, 0x0005df81, 0x000607b1, 0x00071f41
};
#define dacAddress 0x62 #define dacAddress 0x62