| 34,6 → 34,10 |
|---|
| //############################################################################ |
| //# HISTORY setup.c |
| //# |
| //# 14.10.2015 Starter |
| //# - FollowMe neu mit Offset |
| //# - enum Show_int3 fehlte für das Anzeigen von Setupwerten. Nun ergänzt |
| //# - Umbenennen der Pareameter Distance und Azimuth in Offset_lat und Offset_long |
| //# |
| //# 03.08.2015 CB |
| //# - add: FollowMe Setup um Distance und Azimuth erweitert |
| 598,22 → 602,23 |
|---|
| //----------------------------- |
| // Setup_FollowMe() |
| //----------------------------- |
| #define FME_DISTANCE 1 |
| #define FME_SPEED 2 |
| #define FME_RADIUS 3 |
| #define FME_AZIMUTH 4 |
| #define FME_SPEED 1 |
| #define FME_RADIUS 2 |
| |
| static const char FME_DISTANCE_de[] PROGMEM = "FollowMe Abstand"; |
| static const char FME_DISTANCE_en[] PROGMEM = "followMe distance"; |
| #define FME_OFFSET_LAT 3 |
| #define FME_OFFSET_LONG 4 |
| |
| static const char FME_AZIMUTH_de[] PROGMEM = "FollowMe Winkel"; |
| static const char FME_AZIMUTH_en[] PROGMEM = "followMe angle"; |
| // FOLLOW_ME Step 2 |
| static const char FME_OFFSET_LATITUDE_de[] PROGMEM = "Offset Lat"; |
| static const char FME_OFFSET_LATITUDE_en[] PROGMEM = "offset lat"; |
| static const char FME_OFFSET_LONGITUDE_de[] PROGMEM = "Offset Long"; |
| static const char FME_OFFSET_LONGITUDE_en[] PROGMEM = "offset long"; |
| |
| static const char FME_SPEED_de[] PROGMEM = "FollowMe Speed"; |
| #define FME_SPEED_en FME_SPEED_de |
| static const char FME_SPEED_de[] PROGMEM = "Speed"; |
| #define FME_SPEED_en FME_SPEED_de |
| |
| static const char FME_RADIUS_de[] PROGMEM = "Toleranz Radius"; |
| static const char FME_RADIUS_en[] PROGMEM = "tolerance radius"; |
| static const char FME_RADIUS_de[] PROGMEM = "Toleranz Radius"; |
| static const char FME_RADIUS_en[] PROGMEM = "tolerance radius"; |
| |
| |
| |
| 887,15 → 892,15 |
|---|
| case Show_uint3: pstr = buffered_sprintf_P( PSTR("%3d"), Value ); |
| break; |
| |
| |
| case Show_uint5: pstr = buffered_sprintf_P( PSTR("%5d"), Value ); |
| break; |
| |
| case Show_int3: pstr = buffered_sprintf_P( PSTR("%3d"), Value ); |
| break; |
| |
| case Show_uint10th: pstr = buffered_sprintf_P( PSTR("%2.1d"), Value ); |
| break; |
| |
| |
| case MK_Connection: switch( Value ) |
| { |
| case 0: pStr = PSTR("Wi.232"); break; |
| 913,7 → 918,6 |
|---|
| } |
| break; |
| |
| |
| case GPSMOUSE: switch( Value ) |
| { |
| case GPS_Bluetoothmouse1: pStr = PSTR("BT-Mouse"); break; |
| 922,7 → 926,6 |
|---|
| } |
| break; |
| |
| |
| case Wi_Netmode: switch( Value ) |
| { |
| case false: pStr = strGet(SLAVE); break; |
| 930,8 → 933,6 |
|---|
| } |
| break; |
| |
| |
| |
| case OnOff: switch( Value ) |
| { |
| case 0: pStr = strGet(OFF); break; |
| 939,7 → 940,6 |
|---|
| } |
| break; |
| |
| |
| case YesNo: switch( Value ) |
| { |
| case 0: pStr = strGet(NOO); break; |
| 947,7 → 947,6 |
|---|
| } |
| break; |
| |
| |
| case WlanMode: switch( Value ) |
| { |
| case 0: pStr = strGet(OFF); break; |
| 956,8 → 955,6 |
|---|
| } |
| break; |
| |
| |
| |
| case NormRev: switch( Value ) // wird noch von stick/stick_setup.c verwendet |
| { |
| case 0 : pStr = strGet(NORMAL); break; |
| 965,7 → 962,6 |
|---|
| } |
| break; |
| |
| |
| case Kontrast: if( Value >= max ) |
| { |
| Value = max; |
| 983,11 → 979,9 |
|---|
| pstr = buffered_sprintf_P( PSTR("%3d"), Value ); |
| break; |
| |
| |
| case Baudrate: pstr = buffered_sprintf_P( PSTR("%ld"), Baud_to_uint32(Value) ); |
| break; |
| |
| |
| case Language: switch( Value ) |
| { |
| case 0: pStr = strGet(DEUTSCH); break; |
| 995,7 → 989,6 |
|---|
| } |
| break; |
| |
| |
| case Sticktype: switch( Value ) |
| { |
| case false: pStr = strGet(POTI); break; |
| 1826,11 → 1819,9 |
|---|
| //MenuCtrl_PushML2_P( FME_REFRESH , MENU_ITEM, NOFUNC , FME_REFRESH_de , FME_REFRESH_en ); |
| |
| |
| MenuCtrl_PushML2_P( FME_OFFSET_LAT , MENU_ITEM, NOFUNC, FME_OFFSET_LATITUDE_de , FME_OFFSET_LATITUDE_en ); |
| MenuCtrl_PushML2_P( FME_OFFSET_LONG, MENU_ITEM, NOFUNC, FME_OFFSET_LONGITUDE_de, FME_OFFSET_LONGITUDE_en ); |
| |
| #ifdef USE_FOLLOWME_STEP2 |
| MenuCtrl_PushML2_P( FME_DISTANCE, MENU_ITEM, NOFUNC, FME_DISTANCE_de, FME_DISTANCE_en ); |
| MenuCtrl_PushML2_P( FME_AZIMUTH , MENU_ITEM, NOFUNC, FME_AZIMUTH_de , FME_AZIMUTH_en ); |
| #endif |
| MenuCtrl_PushML2_P( FME_SPEED , MENU_ITEM, NOFUNC, FME_SPEED_de , FME_SPEED_en ); |
| MenuCtrl_PushML2_P( FME_RADIUS , MENU_ITEM, NOFUNC, FME_RADIUS_de , FME_RADIUS_en ); |
| MenuCtrl_PushSeparator(); // MENUE TRENNLINIE |
| 1849,12 → 1840,13 |
|---|
| |
| //if( itemid == FME_REFRESH ) { Config.FM_Refresh = Edit_generic( Config.FM_Refresh ,250,60000, Show_uint3,1 ,NULL,NULL); } |
| |
| // FollowMeStep2: |
| if( itemid == FME_DISTANCE) { Config.FM_Distance= Edit_generic( Config.FM_Distance , 0, 100, Show_uint3,1 ,strGet(STR_METERS),NULL); } |
| if( itemid == FME_AZIMUTH ) { Config.FM_Azimuth = Edit_generic( Config.FM_Azimuth , 0, 360, Show_uint3,1 ,PSTR("Grad"),NULL); } |
| // FollowMeStep2: Eingabe in m, intern als mm behandeln |
| if( itemid == FME_OFFSET_LAT ) { Config.FM_Offest_Latitude = Edit_generic( Config.FM_Offest_Latitude / 1000, -30, 30, Show_int3, 1, strGet(STR_METERS), NULL) * 1000; } |
| if( itemid == FME_OFFSET_LONG) { Config.FM_Offset_Longitude = Edit_generic( Config.FM_Offset_Longitude / 1000, -30, 30, Show_int3, 1, strGet(STR_METERS), NULL) * 1000; } |
| |
| // FollowMe: |
| if( itemid == FME_SPEED ) { Config.FM_Speed = Edit_generic( Config.FM_Speed , 0, 100, Show_uint3,1 ,PSTR("0.1 m/s") ,NULL); } |
| if( itemid == FME_RADIUS ) { Config.FM_Radius = Edit_generic( Config.FM_Radius , 1, 20, Show_uint3,1 ,strGet(STR_METERS),NULL); } |
| if( itemid == FME_SPEED ) { Config.FM_Speed = Edit_generic( Config.FM_Speed , 0, 100, Show_uint3, 1, PSTR("0.1 m/s") , NULL); } |
| if( itemid == FME_RADIUS ) { Config.FM_Radius = Edit_generic( Config.FM_Radius, 1, 20, Show_uint3, 1, strGet(STR_METERS), NULL); } |
| |
| //-------------------- |
| // GPS_DATA |