Merge pull request pycom#165 from pycom/pygate_1308_timer_fix

peter-pycom · web-flow · commit a24d9b67926a · 2020-07-23T10:46:20.000+02:00
Fixed sx1308_timer_read_us to return correct time in us
diff --git a/drivers/sx1308/sx1308.c b/drivers/sx1308/sx1308.c
@@ -87,7 +87,7 @@ bool sx1308_init(void) {
     machpin_register_irq_c_handler(SX1308.TxOn, (void *)SX1308_Tx_Off_Isr);
     pin_irq_enable(SX1308.TxOn);
 
-    timer_start_value = machtimer_get_timer_counter_value();
+    timer_start_value = machtimer_get_timer_counter_value()/(CLK_FREQ / 1000000);
     SX1308.firsttx = true;
     SX1308.txongoing = 0;
     SX1308.offtmstp = 0;
@@ -235,7 +235,7 @@ uint8_t sx1308_spiReadBurst(uint8_t reg, uint8_t *data, int size) {
 }
 
 uint32_t sx1308_timer_read_us(void) {
-     return ((machtimer_get_timer_counter_value() - timer_start_value) & 0xFFFFFFFF);
+     return ((machtimer_get_timer_counter_value()/(CLK_FREQ / 1000000) - timer_start_value) & 0xFFFFFFFF);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ bool sx1308_init(void) {`
`87`	`87`	`machpin_register_irq_c_handler(SX1308.TxOn, (void *)SX1308_Tx_Off_Isr);`
`88`	`88`	`pin_irq_enable(SX1308.TxOn);`
`89`	`89`
`90`		`- timer_start_value = machtimer_get_timer_counter_value();`
	`90`	`+ timer_start_value = machtimer_get_timer_counter_value()/(CLK_FREQ / 1000000);`
`91`	`91`	`SX1308.firsttx = true;`
`92`	`92`	`SX1308.txongoing = 0;`
`93`	`93`	`SX1308.offtmstp = 0;`
`@@ -235,7 +235,7 @@ uint8_t sx1308_spiReadBurst(uint8_t reg, uint8_t *data, int size) {`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`uint32_t sx1308_timer_read_us(void) {`
`238`		`- return ((machtimer_get_timer_counter_value() - timer_start_value) & 0xFFFFFFFF);`
	`238`	`+ return ((machtimer_get_timer_counter_value()/(CLK_FREQ / 1000000) - timer_start_value) & 0xFFFFFFFF);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`