switch back to fixed filter, ready for first release

Author: stancecoke

documentation/Logaufbereitung.py

@@ -55,7 +55,7 @@
 #x2=na[:,1:2]
 #x3=na[:,1:2]
 y=np.int16(na[:,1:2])
-z1=na[:,3:4]
+z1=na[:,3:4]/10
 z=na[:,2:3]
 
 #y=na[:,8:9]
@@ -79,7 +79,7 @@
 axs[1].legend(bbox_to_anchor=(1.01, 0), loc="lower left",
               mode="expand", borderaxespad=0)
 axs[2].plot(z,color='r', label="p_human (W)")
-axs[2].plot(z1,color='b', label="cadence (1/min)")
+axs[2].plot(z1,color='b', label="speed (kph*10)")
 axs[2].legend(bbox_to_anchor=(1.01, 0), loc="lower left",
               mode="expand", borderaxespad=0)
 

ldscripts/gd32f30x_flash.ld

@@ -1,8 +1,8 @@
 /* memory map */
 MEMORY
 {
-  FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 238K
-  /*FLASH (rx)      : ORIGIN = 0x08004000, LENGTH = 238K*/
+  /*FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 238K*/
+  FLASH (rx)      : ORIGIN = 0x08004000, LENGTH = 238K
   /*FLASH (rx)      : ORIGIN = 0x0800A800, LENGTH = 238K*/
   RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 48K
 }

src/main.c

@@ -218,7 +218,7 @@ int main(void)
 {
 
     //nvic_vector_table_set(NVIC_VECTTAB_FLASH, 0xA800); //for bootloader v3.8
-	//nvic_vector_table_set(NVIC_VECTTAB_FLASH, 0x4000); //for bootloader v3
+	nvic_vector_table_set(NVIC_VECTTAB_FLASH, 0x4000); //for bootloader v3
     __enable_irq();
 
 	//SCB->VTOR = 0x08004000;
@@ -1293,12 +1293,12 @@ void PAS_processing(void)
 		MS.torque_on_crank=(adc_value[2]*3300)>>12; //map ADC value to mV
 		PAS_counter=0;
     	PAS_flag = 0;
-    	torque_cumulated-=torque_cumulated>>MP.assist_settings[MS.assist_level][2];
+    	torque_cumulated-=torque_cumulated>>5;//MP.assist_settings[MS.assist_level][2];
     	if(MS.torque_on_crank>750){
     		torque_cumulated+=(MS.torque_on_crank-750);
     	}
     	//Power=2*Pi*speed*torque, calibration factors: rpm to 1/s for cadence: /60, mV to Nm: 750 to 3200 --> 0 to 80 Nm. (from Bafang data sheet)
-    	MS.p_human=(uint16_t)((float)(MS.cadence*(torque_cumulated>>MP.assist_settings[MS.assist_level][2]))*0.00342); //in Watt
+    	MS.p_human=(uint16_t)((float)(MS.cadence*(torque_cumulated>>5))*0.00342); //in Watt
 }
 
 void Speed_processing(void)
@@ -1865,7 +1865,7 @@ void write_virtual_eeprom(void)
 //		fmc_multi_word_program(FMC_OFFSET_PARA0, &Para0[0]);
 //		fmc_multi_word_program(FMC_OFFSET_PARA1, &Para1[0]);
 //		fmc_multi_word_program(FMC_OFFSET_PARA2, &Para2[0]);
-		fmc_multi_word_program(FMC_OFFSET_MP, (uint8_t*)&MP, 22); //86byte in MP
+		fmc_multi_word_program(FMC_OFFSET_MP, (uint8_t*)&MP, 22); //88byte in MP
 	}
 
 void read_virtual_eeprom(void)