| 49,6 → 49,11 |
|---|
| // + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| // + POSSIBILITY OF SUCH DAMAGE. |
| // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| #include <avr/boot.h> |
| |
| #include <avr/io.h> |
| #include <avr/interrupt.h> |
| |
| #include "main.h" |
| #include "timer0.h" |
| #include "timer2.h" |
| 65,42 → 70,10 |
|---|
| #include "_Settings.h" |
| |
| |
| uint8_t EEPromArray[E2END+1] EEMEM; |
| |
| uint8_t BoardRelease = 10; |
| |
| // -- Parametersatz aus EEPROM lesen --- |
| // number [0..5] |
| void ReadParameterSet(unsigned char number, unsigned char *buffer, unsigned char length) |
| { |
| if (number > 5) number = 5; |
| eeprom_read_block(buffer, &EEPromArray[EEPROM_ADR_PARAM_BEGIN + length * number], length); |
| } |
| |
| |
| // -- Parametersatz ins EEPROM schreiben --- |
| // number [0..5] |
| void WriteParameterSet(unsigned char number, unsigned char *buffer, unsigned char length) |
| { |
| if(number > 5) number = 5; |
| eeprom_write_block(buffer, &EEPromArray[EEPROM_ADR_PARAM_BEGIN + length * number], length); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], number); // diesen Parametersatz als aktuell merken |
| } |
| |
| /***************************************************/ |
| /* Get number of active parameter set */ |
| /***************************************************/ |
| uint8_t GetActiveParamSetNumber(void) |
| { |
| uint8_t set; |
| set = eeprom_read_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET]); |
| if(set > 5) |
| { |
| set = 2; |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], set); // diesen Parametersatz als aktuell merken |
| } |
| return(set); |
| } |
| |
| //############################################################################ |
| //Hauptprogramm |
| int main (void) |
| 162,32 → 135,16 |
|---|
| printf("\n\r=============================="); |
| GRN_ON; |
| |
| #define EE_DATENREVISION 69 // wird angepasst, wenn sich die EEPROM-Daten geändert haben |
| if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) != EE_DATENREVISION) |
| { |
| printf("\n\rInit. EEPROM: Generiere Default-Parameter..."); |
| DefaultKonstanten1(); |
| for (unsigned char i=0;i<6;i++) |
| { |
| if(i==2) DefaultKonstanten2(); // Kamera |
| if(i==3) DefaultKonstanten3(); // Beginner |
| if(i>3) DefaultKonstanten2(); // Kamera |
| WriteParameterSet(i, (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE); |
| } |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], 3); // default-Setting |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_VALID], EE_DATENREVISION); |
| } |
| // Parameter set handling |
| ParamSet_Init(); |
| |
| if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_ACC_NICK]) > 4) |
| if(GetParamByte(PID_ACC_NICK) > 4) |
| { |
| printf("\n\rACC nicht abgeglichen!"); |
| } |
| |
| ReadParameterSet(GetActiveParamSetNumber(), (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE); |
| printf("\n\rBenutze Parametersatz %d", GetActiveParamSetNumber()); |
| |
| |
| if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) |
| if(ParamSet.GlobalConfig & CFG_HOEHENREGELUNG) |
| { |
| printf("\n\rAbgleich Luftdrucksensor.."); |
| timer = SetDelay(1000); |
| 205,7 → 162,7 |
|---|
| |
| |
| printf("\n\rSteuerung: "); |
| if (EE_Parameter.GlobalConfig & CFG_HEADING_HOLD) printf("HeadingHold"); |
| if (ParamSet.GlobalConfig & CFG_HEADING_HOLD) printf("HeadingHold"); |
| else printf("Neutral"); |
| |
| printf("\n\n\r"); |
| 258,7 → 215,7 |
|---|
| else BearbeiteRxDaten(); |
| if(CheckDelay(timer)) |
| { |
| if(UBat < EE_Parameter.UnterspannungsWarnung) |
| if(UBat < ParamSet.UnterspannungsWarnung) |
| { |
| if(BeepModulation == 0xFFFF) |
| { |