Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Rename FLASHFS to USE_FLASHFS

Browse source
This commit is contained in:
Nicholas Sherlock 2015-02-14 09:45:56 +13:00
parent 3b8e05fb46
commit 6423ac7db1
7 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/blackbox/blackbox.c
View file

@ -606,7 +606,7 @@ static void validateBlackboxConfig()
masterConfig.blackbox_rate_denom /= div; masterConfig.blackbox_rate_denom /= div;
} }
if (!(masterConfig.blackbox_device == BLACKBOX_DEVICE_SERIAL || masterConfig.blackbox_device == BLACKBOX_DEVICE_FLASH)) { if (masterConfig.blackbox_device >= BLACKBOX_DEVICE_END) {
masterConfig.blackbox_device = BLACKBOX_DEVICE_SERIAL; masterConfig.blackbox_device = BLACKBOX_DEVICE_SERIAL;
} }
} }

14
src/main/blackbox/blackbox_io.c
View file

@ -71,7 +71,7 @@ static uint32_t previousBaudRate;
void blackboxWrite(uint8_t value) void blackboxWrite(uint8_t value)
{ {
switch (masterConfig.blackbox_device) { switch (masterConfig.blackbox_device) {
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
flashfsWriteByte(value); // Write byte asynchronously flashfsWriteByte(value); // Write byte asynchronously
break; break;
@ -106,7 +106,7 @@ int blackboxPrint(const char *s)
switch (masterConfig.blackbox_device) { switch (masterConfig.blackbox_device) {
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
length = strlen(s); length = strlen(s);
flashfsWrite((const uint8_t*) s, length, false); // Write asynchronously flashfsWrite((const uint8_t*) s, length, false); // Write asynchronously
@ -412,7 +412,7 @@ void blackboxDeviceFlush(void)
case BLACKBOX_DEVICE_SERIAL: case BLACKBOX_DEVICE_SERIAL:
//Presently a no-op on serial, as serial is continuously being drained out of its buffer //Presently a no-op on serial, as serial is continuously being drained out of its buffer
break; break;
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
flashfsFlushSync(); flashfsFlushSync();
break; break;
@ -455,7 +455,7 @@ bool blackboxDeviceOpen(void)
return blackboxPort != NULL; return blackboxPort != NULL;
break; break;
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
if (flashfsGetSize() == 0 || isBlackboxDeviceFull()) { if (flashfsGetSize() == 0 || isBlackboxDeviceFull()) {
return false; return false;
@ -486,7 +486,7 @@ void blackboxDeviceClose(void)
mspAllocateSerialPorts(&masterConfig.serialConfig); mspAllocateSerialPorts(&masterConfig.serialConfig);
} }
break; break;
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
flashfsFlushSync(); flashfsFlushSync();
break; break;
@ -500,7 +500,7 @@ bool isBlackboxDeviceIdle(void)
case BLACKBOX_DEVICE_SERIAL: case BLACKBOX_DEVICE_SERIAL:
return isSerialTransmitBufferEmpty(blackboxPort); return isSerialTransmitBufferEmpty(blackboxPort);
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
flashfsFlushSync(); flashfsFlushSync();
return true; return true;
@ -517,7 +517,7 @@ bool isBlackboxDeviceFull(void)
case BLACKBOX_DEVICE_SERIAL: case BLACKBOX_DEVICE_SERIAL:
return false; return false;
#ifdef FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
return flashfsIsEOF(); return flashfsIsEOF();
#endif #endif

13
src/main/blackbox/blackbox_io.h
View file

@ -20,8 +20,17 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#define BLACKBOX_DEVICE_SERIAL 0 #include "target.h"
#define BLACKBOX_DEVICE_FLASH 1
typedef enum BlackboxDevice {
BLACKBOX_DEVICE_SERIAL = 0,
#ifdef USE_FLASHFS
BLACKBOX_DEVICE_FLASH,
#endif
BLACKBOX_DEVICE_END
} BlackboxDevice;
uint8_t blackboxWriteChunkSize; uint8_t blackboxWriteChunkSize;

6
src/main/io/serial_cli.c
View file

@ -112,7 +112,7 @@ static void cliColor(char *cmdline);
static void cliMixer(char *cmdline); static void cliMixer(char *cmdline);
#endif #endif
#ifdef FLASHFS #ifdef USE_FLASHFS
static void cliFlashIdent(char *cmdline); static void cliFlashIdent(char *cmdline);
static void cliFlashErase(char *cmdline); static void cliFlashErase(char *cmdline);
static void cliFlashWrite(char *cmdline); static void cliFlashWrite(char *cmdline);
@ -174,7 +174,7 @@ const clicmd_t cmdTable[] = {
{ "dump", "print configurable settings in a pastable form", cliDump }, { "dump", "print configurable settings in a pastable form", cliDump },
{ "exit", "", cliExit }, { "exit", "", cliExit },
{ "feature", "list or -val or val", cliFeature }, { "feature", "list or -val or val", cliFeature },
#ifdef FLASHFS #ifdef USE_FLASHFS
{ "flash_erase", "erase flash chip", cliFlashErase }, { "flash_erase", "erase flash chip", cliFlashErase },
{ "flash_ident", "get flash chip details", cliFlashIdent }, { "flash_ident", "get flash chip details", cliFlashIdent },
{ "flash_read", "read text from the given address", cliFlashRead }, { "flash_read", "read text from the given address", cliFlashRead },
@ -745,7 +745,7 @@ static void cliColor(char *cmdline)
} }
#endif #endif
#ifdef FLASHFS #ifdef USE_FLASHFS
static void cliFlashIdent(char *cmdline) static void cliFlashIdent(char *cmdline)
{ {

8
src/main/io/serial_msp.c
View file

@ -534,7 +534,7 @@ reset:
static void serializeDataflashSummaryReply(void) static void serializeDataflashSummaryReply(void)
{ {
headSerialReply(1 + 3 * 4); headSerialReply(1 + 3 * 4);
#ifdef FLASHFS #ifdef USE_FLASHFS
const flashGeometry_t *geometry = flashfsGetGeometry(); const flashGeometry_t *geometry = flashfsGetGeometry();
serialize8(flashfsIsReady() ? 1 : 0); serialize8(flashfsIsReady() ? 1 : 0);
serialize32(geometry->sectors); serialize32(geometry->sectors);
@ -548,7 +548,7 @@ static void serializeDataflashSummaryReply(void)
#endif #endif
} }
#ifdef FLASHFS #ifdef USE_FLASHFS
static void serializeDataflashReadReply(uint32_t address, uint8_t size) static void serializeDataflashReadReply(uint32_t address, uint8_t size)
{ {
uint8_t buffer[128]; uint8_t buffer[128];
@ -1201,7 +1201,7 @@ static bool processOutCommand(uint8_t cmdMSP)
serializeDataflashSummaryReply(); serializeDataflashSummaryReply();
break; break;
#ifdef FLASHFS #ifdef USE_FLASHFS
case MSP_DATAFLASH_READ: case MSP_DATAFLASH_READ:
{ {
uint32_t readAddress = read32(); uint32_t readAddress = read32();
@ -1421,7 +1421,7 @@ static bool processInCommand(void)
readEEPROM(); readEEPROM();
break; break;
#ifdef FLASHFS #ifdef USE_FLASHFS
case MSP_DATAFLASH_ERASE: case MSP_DATAFLASH_ERASE:
flashfsEraseCompletely(); flashfsEraseCompletely();
break; break;

2
src/main/main.c
View file

@ -351,7 +351,7 @@ void init(void)
initTelemetry(); initTelemetry();
#endif #endif
#ifdef FLASHFS #ifdef USE_FLASHFS
#ifdef NAZE #ifdef NAZE
// naze32 rev5 and above have 16mbit of flash available // naze32 rev5 and above have 16mbit of flash available
m25p16_init(); m25p16_init();

2
src/main/target/NAZE/target.h
View file

@ -65,7 +65,7 @@
#define MPU6500_CS_PIN NAZE_SPI_CS_PIN #define MPU6500_CS_PIN NAZE_SPI_CS_PIN
#define MPU6500_SPI_INSTANCE NAZE_SPI_INSTANCE #define MPU6500_SPI_INSTANCE NAZE_SPI_INSTANCE
#define FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16