piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all CPUM128/CPUM2560/CPUM2561 macros

Browse Source 
Also remove pulses_avr*
This commit is contained in:
Arne Schwabe
2018-07-05 12:05:55 +02:00
parent a5b44fa877
commit 9c7cfe9252
5 changed files with 0 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/dataconstants.h
-20
View File
@@ -69,26 +69,6 @@
#define MAX_INPUTS 32
#define MAX_TRAINER_CHANNELS 16
#define MAX_TELEMETRY_SENSORS 32
#elif defined(CPUM2560) || defined(CPUM2561)
#define MAX_MODELS 30
#define MAX_OUTPUT_CHANNELS 16 // number of real output channels CH1-CH16
#define MAX_FLIGHT_MODES 6
#define MAX_MIXERS 32
#define MAX_EXPOS 16
#define MAX_LOGICAL_SWITCHES 12
#define MAX_SPECIAL_FUNCTIONS 24 // number of functions assigned to switches
#define MAX_TRAINER_CHANNELS 8
#define MAX_TELEMETRY_SENSORS 0
#elif defined(CPUM128)
#define MAX_MODELS 30
#define MAX_OUTPUT_CHANNELS 16 // number of real output channels CH1-CH16
#define MAX_FLIGHT_MODES 5
#define MAX_MIXERS 32
#define MAX_EXPOS 14
#define MAX_LOGICAL_SWITCHES 12
#define MAX_SPECIAL_FUNCTIONS 24 // number of functions assigned to switches
#define MAX_TRAINER_CHANNELS 8
#define MAX_TELEMETRY_SENSORS 0
#else
#define MAX_MODELS 16
#define MAX_OUTPUT_CHANNELS 16 // number of real output channels CH1-CH16
radio/src/datastructs.h
-5
View File
@@ -863,13 +863,8 @@ static inline void check_struct()
CHKSIZE(ModelHeader, 11);
CHKTYPE(CurveData, 1);
#if defined(CPUM2560) || defined(CPUM2561)
CHKSIZE(ExpoData, 5);
CHKSIZE(MixData, 10);
#else
CHKSIZE(MixData, 9);
CHKSIZE(ExpoData, 4);
#endif
CHKSIZE(CustomFunctionData, 3);
CHKSIZE(TimerData, 3);
radio/src/opentx.cpp
-6
View File
@@ -2180,12 +2180,6 @@ int main()
// important to disable it before commencing with system initialisation (or
// we could put a bunch more wdt_reset()s in. But I don't like that approach
// during boot up.)
#if defined(CPUM2560) || defined(CPUM2561)
uint8_t mcusr = MCUSR; // save the WDT (etc) flags
MCUSR = 0; // must be zeroed before disabling the WDT
MCUCR = 0x80 ; // Disable JTAG port that can interfere with POT3
MCUCR = 0x80 ; // Must be done twice
#endif
#if defined(PCBTARANIS)
g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT;
#endif
radio/src/pulses/pulses_avr.cpp
-1035
View File
File diff suppressed because it is too large Load Diff
radio/src/pulses/pulses_avr.h
-48
View File
@@ -1,48 +0,0 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef _PULSES_AVR_H_
#define _PULSES_AVR_H_
extern uint8_t s_current_protocol[1];
extern uint8_t s_pulses_paused;
extern uint8_t *pulses2MHzRPtr;
extern uint8_t *pulses2MHzWPtr;
extern uint16_t nextMixerEndTime;
extern uint8_t moduleFlag[NUM_MODULES];
#define MAX_MIXER_DELTA (50*16) /* 50ms max as an interval between 2 mixer calculations */
void startPulses();
inline bool pulsesStarted() { return s_current_protocol[0] != 255; }
inline void pausePulses() { s_pulses_paused = true; }
inline void resumePulses() { s_pulses_paused = false; }
void setupPulses();
void DSM2_Init();
void DSM2_Done();
#define SEND_FAILSAFE_NOW()
#define SEND_FAILSAFE_1S()
#endif // _PULSES_AVR_H_
/*eof*/