Skip to content

Commit

Permalink
Steele pdb (#600)
Browse files Browse the repository at this point in the history
* SteelePDB support
  • Loading branch information
ShikOfTheRa authored Apr 20, 2020
1 parent ffea52f commit a21ad20
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 30 deletions.
1 change: 1 addition & 0 deletions MW_OSD/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
//#define HOLYBROPDB // Uncomment this if using a HOLYBRO PDB (Using A6 as VOLTAGEPIN) http://www.holybro.com/
//#define IMPULSERC_HELIX // Uncomment this if using an ImpulseRC integrated OSD/VTX (STILL UNDER DEVELOPMENT PENDING TESTING)
//#define FFPV_INNOVA // Uncomment this if using a FURIOUS FPV Innova integrated OSD/VTX (STILL UNDER DEVELOPMENT PENDING TESTING)
//#define STEELEPDB // Uncomment this if using STEELEPDB

// NOTE-some boards have swapped bat1/bat2 pins and alternative voltage measuring resistors
// If having difficulties, first select default MINIMOSD as above, then use the following to correct:
Expand Down
31 changes: 24 additions & 7 deletions MW_OSD/Def.h
Original file line number Diff line number Diff line change
Expand Up @@ -572,12 +572,13 @@
#define MENU_KISS
#define MENU_VOLTAGE
#define MENU_RSSI
#define MENU_CURRENT
#define MENU_DISPLAY
#define MENU_ADVANCED
//#define MENU_CURRENT
//#define MENU_DISPLAY
//#define MENU_ADVANCED
#define MENU_ALARMS
#define PROTOCOL_KISS
#define AMPERAGE_DIV 10
#undef MAPMODE
#endif

#ifdef SKYTRACK
Expand Down Expand Up @@ -1026,6 +1027,20 @@ enum {
# define LEDINIT pinMode(LEDPIN,OUTPUT);
# define LEDON digitalWrite(LEDPIN,HIGH);
# define LEDOFF digitalWrite(LEDPIN,LOW);
#elif defined STEELEPDB //
# define DATAOUT 11 // MOSI
# define DATAIN 12 // MISO
# define SPICLOCK 13 // sck
# define VSYNC 2 // INT0
# define MAX7456SELECT 10 // ss
# define MAX7456RESET 2 // RESET
# define MAX7456SETHARDWAREPORTS pinMode(MAX7456RESET,OUTPUT);pinMode(MAX7456SELECT,OUTPUT);pinMode(DATAOUT, OUTPUT);pinMode(DATAIN, INPUT);pinMode(SPICLOCK,OUTPUT);pinMode(VSYNC, INPUT);
# define MAX7456HWRESET digitalWrite(MAX7456RESET,LOW);delay(60);digitalWrite(MAX7456RESET,HIGH);delay(40);
# define MAX7456ENABLE digitalWrite(MAX7456SELECT,LOW);
# define MAX7456DISABLE digitalWrite(MAX7456SELECT,HIGH);
# define LEDINIT pinMode(LEDPIN,OUTPUT);
# define LEDON digitalWrite(LEDPIN,HIGH);
# define LEDOFF digitalWrite(LEDPIN,LOW);
#else
# define MAX7456ENABLE PORTD&=B10111111;
# define MAX7456DISABLE PORTD|=B01000000;
Expand Down Expand Up @@ -1266,7 +1281,7 @@ enum {
#ifdef iNAV
#define INFO_CONTROLLER 12
#endif
#ifdef KISS
#ifdef KISS
#define INFO_CONTROLLER 13
#endif
#ifdef APM
Expand Down Expand Up @@ -1342,10 +1357,12 @@ enum {
#ifdef ANDROMEDA
#define INFO_HARDWARE 9
#endif
#ifdef ANDROMEDA
#define HOLYBROPDB 10
#ifdef HOLYBROPDB
#define INFO_HARDWARE 10
#endif
#ifdef STEELEPDB
#define INFO_HARDWARE 11
#endif


#if defined (SUBMARINE) || defined(GPSSUBMARINE)
#define INFO_AIRCRAFT 3
Expand Down
2 changes: 1 addition & 1 deletion MW_OSD/GlobalVariables.h
Original file line number Diff line number Diff line change
Expand Up @@ -2456,7 +2456,7 @@ struct __Kvar {
uint8_t framelength;
uint16_t cksumtmp;
uint8_t crc8;
uint8_t version = 0;
uint8_t version;
}
Kvar;

Expand Down
2 changes: 1 addition & 1 deletion MW_OSD/Screen.ino
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,7 @@ void updateVtxStatus(void)
}
#endif

#ifdef KISS
#ifdef MENU_KISS
void displaySubMenuConfig(void) {
if (configPage == MENU_KISS) {
MAX7456_WriteString_P(PGMSTR(&(menutitle_item[configPage])), 38);
Expand Down
Binary file added OTHER/STEELEPDB_KISS/SteelePDB.zip
Binary file not shown.
40 changes: 19 additions & 21 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@ framework = arduino
board = pro16MHzatmega328
src_build_flags = -DMINIMOSD -DMULTIWII

[env:minim.kiss.multirotor]
[env:minim.kiss.standard]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DMINIMOSD -DKISS

[env:minim.kissgps.multirotor]
[env:minim.kiss.gps]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
Expand Down Expand Up @@ -273,13 +273,13 @@ framework = arduino
board = pro16MHzatmega328
src_build_flags = -DMICROMINIMOSD -DMULTIWII

[env:microminim.kiss.multirotor]
[env:microminim.kiss.standard]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DMICROMINIMOSD -DKISS

[env:microminim.kissgps.multirotor]
[env:microminim.kiss.gps]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
Expand Down Expand Up @@ -399,18 +399,6 @@ framework = arduino
board = pro16MHzatmega328
src_build_flags = -DHOLYBROPDB -DMULTIWII

[env:holybropdb.kiss.multirotor]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DHOLYBROPDB -DKISS

[env:holybropdb.kissgps.multirotor]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DHOLYBROPDB -DKISSGPS

[env:holybropdb.dronin.multirotor]
platform = atmelavr
framework = arduino
Expand Down Expand Up @@ -518,13 +506,13 @@ framework = arduino
board = pro16MHzatmega328
src_build_flags = -DAEROMAX -DMULTIWII

[env:aeromax.kiss.multirotor]
[env:aeromax.kiss.standard]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DAEROMAX -DKISS

[env:aeromax.kissgps.multirotor]
[env:aeromax.kiss.gps]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
Expand Down Expand Up @@ -644,9 +632,6 @@ src_build_flags = -DAEROMAX -DNOCONTROLLER



# ANDROMEDA BOARDS ############################################################
# AEROMAX BOARDS ###############################################################

# ANDROMEDA BOARDS #############################################################
[env:andromeda.betaflight.multirotor]
platform = atmelavr
Expand Down Expand Up @@ -691,6 +676,19 @@ board = pro16MHzatmega328
src_build_flags = -DANDROMEDA -DiNAV -DFIXEDWING


# STEELEPDB BOARDS #############################################################
[env:steelepdb.kiss.standard]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DSTEELEPDB -DKISS

[env:steelepdb.kiss.gps]
platform = atmelavr
framework = arduino
board = pro16MHzatmega328
src_build_flags = -DSTEELEPDB -DKISSGPS


# NOT WORKING YET DUE TO PLATFORMIO COMPILE ERROR ########################################################################
#[env:minim.naza]
Expand Down

0 comments on commit a21ad20

Please sign in to comment.