Makefile can build for bootloader. Enable automatic power off. Initial screen showing firmware version, link for site and porject name

Author: casainho

Bafang_color_LCD_850C/Bafang_LCD_850C_firmware/src/Makefile

@@ -13,6 +13,9 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# uncomment next lines to build for bootloader
+CFLAGS = -DUSE_WITH_BOOTLOADER
+LFLAGS = -Xlinker --defsym=USE_WITH_BOOTLOADER=1
 
 TCPREFIX  = arm-none-eabi-
 CC      = $(TCPREFIX)gcc
@@ -40,11 +43,11 @@ OPT = 0
 # -mfix-cortex-m3-ldrd should be enabled by default for Cortex M3.
 # CFLAGS -H show header files
 AFLAGS  = -I./GD32F10x_standard_peripheral/Include -I -Ispl/CMSIS -Ispl/inc -c -g -mcpu=cortex-m3 -mthumb -l libgcc
-CFLAGS  = -I./GD32F10x_standard_peripheral/Include -I./ -I./spl/CMSIS -I./spl/CMSIS/inc -I./spl/inc -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -c -fno-common -O$(OPT) -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -l libgcc -DUSE_COLOR_RGB565
+CFLAGS  += -I./GD32F10x_standard_peripheral/Include -I./ -I./spl/CMSIS -I./spl/CMSIS/inc -I./spl/inc -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -c -fno-common -O$(OPT) -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -l libgcc -DUSE_COLOR_RGB565
 # Need following option for LTO as LTO will treat retarget functions as
 # unused without following option
 CFLAGS+ = -fno-builtin
-LFLAGS  = -Tstm32_flash.ld -L/usr/lib/gcc/arm-none-eabi/4.9.3/armv7-m -lgcc -lm -nostartfiles -lnosys -mcpu=cortex-m3 -mthumb -Wl,--gc-sections
+LFLAGS  += -Tstm32_flash.ld -L/usr/lib/gcc/arm-none-eabi/4.9.3/armv7-m -lgcc -lm -nostartfiles -lnosys -mcpu=cortex-m3 -mthumb -Wl,--gc-sections
 #LFLAGS += --specs=nano.specs # to use newlib nano
 #LFLAGS += -u _printf_float # newlib nano printf use floats
 #LFLAGS += -u _scanf_float # newlib nano scanf use floats

Bafang_color_LCD_850C/Bafang_LCD_850C_firmware/src/lcd.c

@@ -80,7 +80,7 @@ void l2_low_pass_filter_battery_voltage_current_power(void);
 void update_menu_flashing_state(void);
 void calc_battery_soc_watts_hour(void);
 void l2_calc_odometer(void);
-static void l2_automatic_power_off_management(void);
+static void automatic_power_off_management(void);
 void brake(void);
 void walk_assist_state(void);
 void wheel_speed(void);
@@ -109,6 +109,7 @@ void change_graph(void);
 void lcd_init(void)
 {
   bafang_500C_lcd_init();
+  lcd_set_backlight_intensity(20); // need otherwise no image will be shownbefore this
   UG_FillScreen(C_BLACK);
 
   lcd_configurations_screen_init();
@@ -195,6 +196,7 @@ void lcd_clock(void)
     graphs_clock_2();
   }
 
+  automatic_power_off_management();
   power_off_management();
 
   // must be reset after a full cycle of lcd_clock()
@@ -965,43 +967,44 @@ void l2_calc_odometer(void)
 //  }
 }
 
-static void l2_automatic_power_off_management(void)
+static void automatic_power_off_management(void)
 {
-//  static uint8_t ui8_lcd_power_off_time_counter_minutes = 0;
-//  static uint16_t ui16_lcd_power_off_time_counter = 0;
-//
-//  if(configuration_variables.ui8_lcd_power_off_time_minutes != 0)
-//  {
-//    // see if we should reset the automatic power off minutes counter
-//    if ((l3_vars.ui16_wheel_speed_x10 > 0) ||   // wheel speed > 0
-//        (l3_vars.ui8_battery_current_x5 > 0) || // battery current > 0
-//        (l3_vars.ui8_braking) ||                // braking
-//        buttons_get_events())                                 // any button active
-//    {
-//      ui16_lcd_power_off_time_counter = 0;
-//      ui8_lcd_power_off_time_counter_minutes = 0;
-//    }
-//
-//    // increment the automatic power off minutes counter
-//    ui16_lcd_power_off_time_counter++;
-//
-//    // check if we should power off the LCD
-//    if(ui16_lcd_power_off_time_counter >= (10 * 60)) // 1 minute passed
-//    {
-//      ui16_lcd_power_off_time_counter = 0;
-//
-//      ui8_lcd_power_off_time_counter_minutes++;
-//      if(ui8_lcd_power_off_time_counter_minutes >= configuration_variables.ui8_lcd_power_off_time_minutes)
-//      {
-//        lcd_power_off(1);
-//      }
-//    }
-//  }
-//  else
-//  {
-//    ui16_lcd_power_off_time_counter = 0;
-//    ui8_lcd_power_off_time_counter_minutes = 0;
-//  }
+  static uint8_t ui8_lcd_power_off_time_counter_minutes = 0;
+  static uint16_t ui16_lcd_power_off_time_counter = 0;
+
+  if(l3_vars.ui8_lcd_power_off_time_minutes != 0)
+  {
+    // see if we should reset the automatic power off minutes counter
+    if ((l3_vars.ui16_wheel_speed_x10 > 0) ||   // wheel speed > 0
+        (l3_vars.ui8_battery_current_x5 > 0) || // battery current > 0
+        (l3_vars.ui8_braking) ||                // braking
+        buttons_get_events())                   // any button active
+    {
+      ui16_lcd_power_off_time_counter = 0;
+      ui8_lcd_power_off_time_counter_minutes = 0;
+    }
+
+    // increment the automatic power off minutes counter
+    ui16_lcd_power_off_time_counter++;
+
+    // check if we should power off the LCD
+    if(ui16_lcd_power_off_time_counter >= (50 * 60)) // 1 minute passed
+    {
+      ui16_lcd_power_off_time_counter = 0;
+
+      ui8_lcd_power_off_time_counter_minutes++;
+      if(ui8_lcd_power_off_time_counter_minutes >= l3_vars.ui8_lcd_power_off_time_minutes)
+      {
+        lcd_power_off(1);
+      }
+    }
+  }
+  // keep automatic_power_off_management disabled
+  else
+  {
+    ui16_lcd_power_off_time_counter = 0;
+    ui8_lcd_power_off_time_counter_minutes = 0;
+  }
 }
 
 void update_menu_flashing_state(void)

Bafang_color_LCD_850C/Bafang_LCD_850C_firmware/src/main.c

@@ -39,6 +39,11 @@ int main(void)
   SetSysClockTo128Mhz();
   RCC_APB1PeriphResetCmd(RCC_APB1Periph_WWDG, DISABLE);
 
+  // if building for original bootloader (from manufacturer), relocate flash after 20K (0x5000) that is the space that bootloader uses
+#ifdef USE_WITH_BOOTLOADER
+  NVIC_SetVectorTable(NVIC_VectTab_FLASH, (uint32_t) 0x5000);
+#endif
+
   pins_init();
   system_power(1);
   systick_init();
@@ -51,6 +56,17 @@ int main(void)
   graphs_init();
   buttons_init();
 
+  // print firmware version on LCD
+  UG_SetBackcolor(C_BLACK);
+  UG_SetForecolor(C_WHITE);
+  UG_FontSelect(&TITLE_TEXT_FONT);
+  UG_PutString(92, 75, "Flexible");
+  UG_PutString(24, 111, "OpenSource ebike");
+  UG_FontSelect(&SMALL_TEXT_FONT);
+  UG_PutString(61, 192, "https://github.com");
+  UG_PutString(14, 214, "/OpenSource-EBike-firmware");
+  UG_PutString(78, 344, "firmware v0.4.0");
+
   // block until user release the buttons
   while(buttons_get_onoff_state() ||
       buttons_get_down_state() ||

Bafang_color_LCD_850C/Bafang_LCD_850C_firmware/src/stm32_flash.ld

@@ -42,7 +42,7 @@ _Min_Stack_Size = 0x800; /* required amount of stack */
 /* Specify the memory areas */
 MEMORY
 {
-  FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K
+  FLASH (rx)      : ORIGIN = DEFINED(USE_WITH_BOOTLOADER) ? (0x08000000 + 20K) : 0x08000000, LENGTH = DEFINED(USE_WITH_BOOTLOADER) ? (512K - 20K) : 512K
   RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 64K
   MEMORY_B1 (rx)  : ORIGIN = 0x60000000, LENGTH = 0K
 }