Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix board files #264

Merged
merged 3 commits into from
Nov 3, 2023
Merged

Fix board files #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5579259
delete customDevice definitions from board files
elral Oct 25, 2023
44d1def
not required define deleted
elral Oct 25, 2023
0243053
eeprom size is not required for AVR's, for Pico defined in the code
elral Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CustomDevices
Open in desktop
Submodule CustomDevices added at 9d0fc9
6 changes: 0 additions & 6 deletions _Boards/Atmel/Board_Mega/MFBoards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#define MF_MUX_SUPPORT 1
#define MF_DIGIN_MUX_SUPPORT 1
#endif
#ifndef MF_CUSTOMDEVICE_SUPPORT
#define MF_CUSTOMDEVICE_SUPPORT 1
#endif

#ifndef MAX_OUTPUTS
#define MAX_OUTPUTS 40
Expand Down Expand Up @@ -85,9 +82,6 @@
#ifndef MOBIFLIGHT_NAME
#define MOBIFLIGHT_NAME "MobiFlight Mega"
#endif
#ifndef EEPROM_SIZE
#define EEPROM_SIZE 4096 // EEPROMSizeMega
#endif
#ifndef MEMLEN_CONFIG
#define MEMLEN_CONFIG 1496 // max. size for config which wil be stored in EEPROM
#endif
Expand Down
6 changes: 0 additions & 6 deletions _Boards/Atmel/Board_Nano/MFBoards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#define MF_MUX_SUPPORT 1
#define MF_DIGIN_MUX_SUPPORT 1
#endif
#ifndef MF_CUSTOMDEVICE_SUPPORT
#define MF_CUSTOMDEVICE_SUPPORT 2
#endif

#ifndef MAX_OUTPUTS
#define MAX_OUTPUTS 18
Expand Down Expand Up @@ -85,9 +82,6 @@
#ifndef MOBIFLIGHT_NAME
#define MOBIFLIGHT_NAME "MobiFlight Nano"
#endif
#ifndef EEPROM_SIZE
#define EEPROM_SIZE 1024 // EEPROMSizeUno
#endif
#ifndef MEMLEN_CONFIG
#define MEMLEN_CONFIG 286 // max. size for config which wil be stored in EEPROM
#endif
Expand Down
6 changes: 0 additions & 6 deletions _Boards/Atmel/Board_ProMicro/MFBoards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#define MF_MUX_SUPPORT 1
#define MF_DIGIN_MUX_SUPPORT 1
#endif
#ifndef MF_CUSTOMDEVICE_SUPPORT
#define MF_CUSTOMDEVICE_SUPPORT 2
#endif

#ifndef MAX_OUTPUTS
#define MAX_OUTPUTS 18
Expand Down Expand Up @@ -85,9 +82,6 @@
#ifndef MOBIFLIGHT_NAME
#define MOBIFLIGHT_NAME "MobiFlight Micro"
#endif
#ifndef EEPROM_SIZE
#define EEPROM_SIZE 1024 // EEPROMSizeMicro
#endif
#ifndef MEMLEN_CONFIG
#define MEMLEN_CONFIG 440 // max. size for config which wil be stored in EEPROM
#endif
Expand Down
6 changes: 0 additions & 6 deletions _Boards/Atmel/Board_Uno/MFBoards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#define MF_MUX_SUPPORT 1
#define MF_DIGIN_MUX_SUPPORT 1
#endif
#ifndef MF_CUSTOMDEVICE_SUPPORT
#define MF_CUSTOMDEVICE_SUPPORT 2
#endif

#ifndef MAX_OUTPUTS
#define MAX_OUTPUTS 18
Expand Down Expand Up @@ -85,9 +82,6 @@
#ifndef MOBIFLIGHT_NAME
#define MOBIFLIGHT_NAME "MobiFlight Uno"
#endif
#ifndef EEPROM_SIZE
#define EEPROM_SIZE 1024 // EEPROMSizeUno
#endif
#ifndef MEMLEN_CONFIG
#define MEMLEN_CONFIG 286 // max. size for config which wil be stored in EEPROM
#endif
Expand Down
3 changes: 0 additions & 3 deletions _Boards/RaspberryPi/Pico/MFBoards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@
#ifndef MOBIFLIGHT_NAME
#define MOBIFLIGHT_NAME "MobiFlight RaspiPico"
#endif
#ifndef EEPROM_SIZE
#define EEPROM_SIZE 4096 // EEPROMSizeRaspberryPico
#endif
#ifndef MEMLEN_CONFIG
#define MEMLEN_CONFIG 1496 // MUST be less than EEPROM_SIZE!! MEM_OFFSET_CONFIG + MEM_LEN_CONFIG <= EEPROM_SIZE, see: eeprom_write_block (MEM_OFFSET_CONFIG, configBuffer, MEM_LEN_CONFIG);
#endif
Expand Down
5 changes: 0 additions & 5 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ board = megaatmega2560
framework = arduino
build_flags =
${env.build_flags}
-DMF_CUSTOMDEVICE_SUPPORT=0
'-DMOBIFLIGHT_TYPE="MobiFlight Mega"'
-I./_Boards/Atmel/Board_Mega
build_src_filter =
Expand All @@ -85,7 +84,6 @@ board = sparkfun_promicro16
framework = arduino
build_flags =
${env.build_flags}
-DMF_CUSTOMDEVICE_SUPPORT=0
'-DMOBIFLIGHT_TYPE="MobiFlight Micro"'
-I./_Boards/Atmel/Board_ProMicro
build_src_filter =
Expand All @@ -105,7 +103,6 @@ board = uno
framework = arduino
build_flags =
${env.build_flags}
-DMF_CUSTOMDEVICE_SUPPORT=0
'-DMOBIFLIGHT_TYPE="MobiFlight Uno"'
-I./_Boards/Atmel/Board_Uno
build_src_filter =
Expand All @@ -124,7 +121,6 @@ board = nanoatmega328
framework = arduino
build_flags =
${env.build_flags}
-DMF_CUSTOMDEVICE_SUPPORT=0
'-DMOBIFLIGHT_TYPE="MobiFlight Nano"'
-I./_Boards/Atmel/Board_Nano
build_src_filter =
Expand All @@ -148,7 +144,6 @@ upload_protocol = mbed ; for debugging upoading can be changed to picopr
;debug_tool = picoprobe ; and uncomment this for debugging w/ picoprobe
build_flags =
${env.build_flags}
-DMF_CUSTOMDEVICE_SUPPORT=0
'-DMOBIFLIGHT_TYPE="MobiFlight RaspiPico"'
-I./_Boards/RaspberryPi/Pico
build_src_filter =
Expand Down
2 changes: 1 addition & 1 deletion src/MF_Modules/MFEEPROM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ MFEEPROM::MFEEPROM() {}
void MFEEPROM::init(void)
{
#if defined(ARDUINO_ARCH_RP2040)
EEPROM.begin(EEPROM_SIZE);
EEPROM.begin(4096);
#endif
_eepromLength = EEPROM.length();
}
Expand Down
Loading