Merge pull request #1 from DeviationTX/master

Update

Author: eried

.travis.yml

@@ -135,14 +135,14 @@ install:
        export MPG123_DIR=$HOME/mpg123-w32
      fi
    - |
-     if [[ $TRAVIS_BUILD_STAGE_NAME == "Nightly" || $TRAVIS_BUILD_STAGE_NAME == "Release" ]]; then
+     if [[ $TRAVIS_BUILD_STAGE_NAME == "nightly" || $TRAVIS_BUILD_STAGE_NAME == "release" ]]; then
          pip3 install --user urllib3==1.23 transifex-client
          openssl aes-256-cbc -K $encrypted_54cd4d6ff016_key -iv $encrypted_54cd4d6ff016_iv -in install_nightlies.tar.enc -out install_nightlies.tar -d
          tar -xf install_nightlies.tar;
          rm -f install_nightlies.tar
      fi
    - |
-     if [[ $TRAVIS_BUILD_STAGE_NAME == "Nightly" ]]; then
+     if [[ $TRAVIS_BUILD_STAGE_NAME == "nightly" ]]; then
          echo "[https://www.transifex.com]" > .transifexrc;
          echo "hostname = https://www.transifex.com" >> .transifexrc;
          echo "password = $TX_PASSWD" >> .transifexrc;
@@ -159,7 +159,7 @@ before_script:
 
 script: 
   - |
-    if [[ $TRAVIS_BUILD_STAGE_NAME == "Nightly" ]]; then
+    if [[ $TRAVIS_BUILD_STAGE_NAME == "nightly" ]]; then
         # 'make language' changes order randomly.  Needs to be consistent before enabling this
         pushd src; make language; popd;
         if [[ `git diff src/fs/language/| grep -E -v '^(diff|index|---|\+\+\+|@@|-#|\+#| |$)'` == "" ]]; then
@@ -198,11 +198,11 @@ script:
 
 after_success:
   - |
-    if [[ $TRAVIS_BUILD_STAGE_NAME == "Build" ]]; then
+    if [[ $TRAVIS_BUILD_STAGE_NAME == "build" ]]; then
         travis_terminate 0
     fi
   - |
-    if [[ $TRAVIS_BUILD_STAGE_NAME == "Release" ]]; then
+    if [[ $TRAVIS_BUILD_STAGE_NAME == "release" ]]; then
         export RELEASE_VERSION=$(echo $TRAVIS_BRANCH | egrep -o '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+');
         if [[ "$RELEASE_VERSION" != "" && "$TRAVIS_BRANCH" == "v$RELEASE_VERSION" ]]; then
             echo "Releasing $RELEASE_VERSION";

src/main.c

@@ -57,8 +57,6 @@ int main() {
     if (CHAN_ButtonIsPressed(buttons, BUT_ENTER) || !FS_Init()) {
         LCD_DrawUSBLogo(LCD_WIDTH, LCD_HEIGHT);
         USB_Connect();
-        LCD_Clear(0x0000);
-        FS_Init();
     }
 
     CONFIG_LoadTx();

src/misc/misc.c

@@ -137,13 +137,15 @@ static void update_lfsr(uint32_t *lfsr, uint8_t b)
         b >>= 1;
     }
 }
+
 u32 rand32_r(u32 *seed, u8 update)
 {
     if(! seed)
         seed = &rand_seed;
     update_lfsr(seed, update);
     return *seed;
 }
+
 u32 rand32()
 {
     return rand32_r(0, 0);
@@ -176,22 +178,43 @@ void wait_press_release(u32 press)
 void wait_press() {
     wait_press_release(CHAN_ButtonMask(BUT_ENTER));
 }
+
 void wait_release()
 {
     wait_press_release(0);
 }
 
 void USB_Connect()
 {
+#if !defined(EMULATOR) && defined(HAS_USB_DRIVE_ERASE) && HAS_USB_DRIVE_ERASE
+    u16 up = 0;
+    u16 down = 0;
+    u32 counter = 0;
+#endif
     MSC_Enable();
     //Disable USB Exit
     while(1) {
         if(PWR_CheckPowerSwitch())
             PWR_Shutdown();
+#if !defined(EMULATOR) && defined(HAS_USB_DRIVE_ERASE) && HAS_USB_DRIVE_ERASE
+        // Erase flash drive in case any filesystem damages
+        u32 buttons = ScanButtons();
+        if (CHAN_ButtonIsPressed(buttons, BUT_UP) && !up && !down) {
+            up = 1;
+            counter = CLOCK_getms();
+        } else if (CHAN_ButtonIsPressed(buttons, BUT_DOWN) && up && !down) {
+            down = 1;
+            counter = CLOCK_getms();
+            SPIFlash_BulkErase();
+        }
+        if (counter) {
+            SOUND_SetFrequency(3951, 100);
+            SOUND_StartWithoutVibrating(200, NULL);
+        }
+        if (counter && (CLOCK_getms() - counter) >= 200) {
+            SOUND_Stop();
+            counter = 0;
+        }
+#endif
     }
-    wait_release();
-    wait_press();
-    wait_release();
-    MSC_Disable();
 }
-

src/pages/128x64x1/telemtest_page.c

@@ -29,7 +29,7 @@ enum {
     ARROW_W      = 10,
     //
     LBL1_X       = 0,
-    LBL1_WIDTH   = 8,
+    LBL1_WIDTH   = 7,
     LBL2_X       = 43,
     LBL3_X       = 86,
     LBL4_X       = 0,
@@ -181,19 +181,19 @@ const struct telem_layout dsm_layout_basic[] = {
     {TYPE_HEADER | 1, LBL3_X, LBL1_WIDTH,  H_LABEL},
     {TYPE_VALUE  | 1, DSM3_X, DSM1_WIDTH, TELEM_DSM_FLOG_HOLDS},
 
-#if HAS_EXTENDED_TELEMETRY
+    /*  #if HAS_EXTENDED_TELEMETRY  // it doesn't nicely fit to page
     {TYPE_HEADER | 2, LBL1_X, LBL1_WIDTH, TEMP_LABEL},
     {TYPE_VALUE  | 2, DSM1_X, DSM1_WIDTH, TELEM_DSM_FLOG_TEMP1},
     {TYPE_HEADER | 2, LBL2_X, LBL1_WIDTH, RXV_LABEL},
     {TYPE_VALUE  | 2, DSM2_X, DSM1_WIDTH, TELEM_DSM_FLOG_VOLT1},
     {TYPE_HEADER | 2, LBL3_X, LBL1_WIDTH, MISC_LABEL},
     {TYPE_VALUE  | 2, DSM3_X, DSM1_WIDTH, TELEM_DSM_FLOG_RSSI_DBM},
-#else
+    #else  */
     {TYPE_HEADER | 2, LBL4_X, LBL4_WIDTH, TEMP_LABEL},
     {TYPE_VALUE  | 2, DSM4_X, DSM1_WIDTH, TELEM_DSM_FLOG_TEMP1},
     {TYPE_HEADER | 2, LBL5_X, LBL4_WIDTH, RXV_LABEL},
     {TYPE_VALUE  | 2, DSM5_X, DSM1_WIDTH, TELEM_DSM_FLOG_VOLT1},
-#endif
+    //  #endif
 
     {TYPE_HEADER | 3, LBL4_X, LBL4_WIDTH, BATT_LABEL},
     {TYPE_VALUE  | 3, DSM4_X, DSM1_WIDTH, TELEM_DSM_FLOG_VOLT2},
@@ -363,7 +363,7 @@ static const char *header_cb(guiObject_t *obj, const void *data)
         case CELLS_LABEL:return "Signl";
 #endif
         case MISC_LABEL: return "Misc";
-        case ARROW_LABEL: return current_page== telemetry_gps ? "<-" : "->";
+        case ARROW_LABEL: return current_page == telemetry_gps ? "<-" : "->";
     }
     return "";
 }

src/protocol/dsm2_cyrf6936.c

@@ -618,7 +618,7 @@ NO_INLINE static void parse_telemetry_packet()
             Telemetry.value[TELEM_DSM_FLOG_VOLT2] =  pktTelem[2];
             Telemetry.value[TELEM_DSM_FLOG_TEMP1] = (pktTelem[3] == 0x7fff) ? 0 : (pktTelem[3] - 32) * 5 / 9; //Convert to C
 #if HAS_EXTENDED_TELEMETRY
-            Telemetry.value[TELEM_DSM_FLOG_RSSI_DBM] = (pktTelem[4] == 0xffff) ? 0 : pktTelem[4] >> 8;
+            Telemetry.value[TELEM_DSM_FLOG_RSSI_DBM] = (pktTelem[4] == 0xffff) ? 0 : (s8)packet[8];  // Average signal for A antenna in dBm
 #endif
             break;
         case 0x16: //GPS sensor (always second GPS packet)

src/target/drivers/input/button_matrix/button_matrix.c

@@ -38,7 +38,11 @@ void Initialize_ButtonMatrix()
     rcc_periph_clock_enable(get_rcc_from_pin(BUTTON_MATRIX_ROW_OD));
     rcc_periph_clock_enable(get_rcc_from_pin(BUTTON_MATRIX_COL_PU));
 
+#if defined(HAS_BUTTON_MATRIX_PULLUP) && !HAS_BUTTON_MATRIX_PULLUP
+    GPIO_setup_output(BUTTON_MATRIX_ROW_OD, OTYPE_PUSHPULL);
+#else
     GPIO_setup_output(BUTTON_MATRIX_ROW_OD, OTYPE_OPENDRAIN);
+#endif
     GPIO_pin_set(BUTTON_MATRIX_ROW_OD);
     GPIO_setup_input(BUTTON_MATRIX_COL_PU, ITYPE_PULLUP);
 }

src/target/tx/devo/devo10/target_defs.h

@@ -19,6 +19,7 @@
 #define SUPPORT_SCANNER     1
 #define HAS_EXTRA_SWITCHES  0
 #define HAS_EXTRA_BUTTONS   0
+#define HAS_BUTTON_MATRIX_PULLUP 0
 #define HAS_MULTIMOD_SUPPORT 1
 #define HAS_VIDEO           0
 #define HAS_4IN1_FLASH      0

src/target/tx/devo/devo12/target_defs.h

@@ -23,6 +23,7 @@
 #define SUPPORT_SCANNER     1
 #define HAS_EXTRA_SWITCHES  0
 #define HAS_EXTRA_BUTTONS   0
+#define HAS_BUTTON_MATRIX_PULLUP 0
 #define HAS_MULTIMOD_SUPPORT 1
 #define ENABLE_320x240_GUI  1 //Enable support for 320x240 gui items as well as 480x360 ones
 #define HAS_VIDEO           0

src/target/tx/devo/devo12e/target_defs.h

@@ -19,6 +19,7 @@
 #define SUPPORT_SCANNER     1
 #define HAS_EXTRA_SWITCHES  0
 #define HAS_EXTRA_BUTTONS   0
+#define HAS_BUTTON_MATRIX_PULLUP 0
 #define HAS_MULTIMOD_SUPPORT 1
 #define HAS_VIDEO           0
 #define HAS_4IN1_FLASH      0

src/target/tx/devo/devo6/target_defs.h

@@ -20,6 +20,7 @@
 #define HAS_MULTIMOD_SUPPORT 1
 #define HAS_EXTRA_SWITCHES  1
 #define HAS_EXTRA_BUTTONS   1
+#define HAS_BUTTON_MATRIX_PULLUP 0
 #define HAS_VIDEO           0
 #define HAS_4IN1_FLASH      0
 #define HAS_EXTENDED_AUDIO  1