Update Bafang Display library

Author: jenkie

Arduino_Pedelec_Controller/display.cpp

@@ -1295,7 +1295,9 @@ void display_debug(HardwareSerial* localSerial)
     localSerial->print(MY_F("  Light "));
     localSerial->print(BF.Rx.Headlight, HEX);
     localSerial->print(MY_F("  Push "));
-    localSerial->println(BF.Rx.PushAssist, HEX);
+    localSerial->print(BF.Rx.PushAssist, HEX);
+    localSerial->print(MY_F("  Diameter "));
+    localSerial->println(BF.Rx.Wheeldiameter,DEC);
     #endif
 
 

Arduino_Pedelec_Controller/display_bafang.cpp

@@ -38,6 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 static void BAFANG_Service(BAFANG_t* BF_ctx);
 
 uint8_t TxBuff[BF_MAX_TXBUFF];
+uint16_t spd_tmp;
 
 
 
@@ -127,9 +128,10 @@ void Bafang_Service(BAFANG_t* BF_ctx)
         switch (BF_ctx->RxBuff[1])
         {
           case BF_CMD_GETSPEED:
-          TxBuff[0]=0;
-          TxBuff[1]=min(spd/0.128,255);
-          TxBuff[2]=TxBuff[1]+32;
+          spd_tmp=BF_ctx->Rx.Wheeldiameter*0.03887*spd;
+          TxBuff[0]=(spd_tmp>>8);
+          TxBuff[1]=(spd_tmp&0xff);
+          TxBuff[2]=TxBuff[0]+TxBuff[1]+32;
           BF_sendmessage(BF_ctx,3);
           break;
 
@@ -143,9 +145,9 @@ void Bafang_Service(BAFANG_t* BF_ctx)
           TxBuff[1]=battery_percent_fromcapacity;
           BF_sendmessage(BF_ctx,2);
 
-          case BF_CMD_GET1:
-          TxBuff[0]=0;
-          TxBuff[1]=0;
+          case BF_CMD_GETPOWER:
+          TxBuff[0]=power/10;
+          TxBuff[1]=power/10;
           BF_sendmessage(BF_ctx,2);
           break;
 
@@ -204,9 +206,13 @@ void Bafang_Service(BAFANG_t* BF_ctx)
           }
           break;
 
-          case BF_CMD_MISC:
+          case BF_CMD_LIGHT:
           BF_ctx->Rx.Headlight=(BF_ctx->RxBuff[2]==BF_LIGHTON);
           break;
+          
+          case BF_CMD_WHEELDIAM:
+          BF_ctx->Rx.Wheeldiameter=BF_ctx->RxBuff[2]*256+BF_ctx->RxBuff[3];
+          break;
         }
       }       
     }

Arduino_Pedelec_Controller/display_bafang.h

@@ -38,11 +38,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BF_CMD_STARTREQUEST 17
 #define BF_CMD_STARTINFO 22
 #define BF_CMD_LEVEL 11
-#define BF_CMD_MISC 26
+#define BF_CMD_LIGHT 26
+#define BF_CMD_WHEELDIAM 31
 #define BF_CMD_GETSPEED 32
 #define BF_CMD_GETERROR 8
 #define BF_CMD_GETBAT 17
-#define BF_CMD_GET1 10
+#define BF_CMD_GETPOWER 10
 #define BF_CMD_GET2 49
 
 #define BF_LIGHTON 241
@@ -70,6 +71,7 @@ typedef struct
     uint8_t  AssistLevel;               // 0..9 Power Assist Level
     uint8_t  Headlight;                 // BF_HEADLIGHT_OFF / BF_HEADLIGHT_ON 
     uint8_t  PushAssist;                // BF_PUSHASSIST_OFF / BF_PUSHASSIST_ON
+    uint16_t Wheeldiameter;             // Wheel Diameter
 }RX_PARAM_t;