From e9b497f827b2220f9d3ca4c10990b55e25645f2c Mon Sep 17 00:00:00 2001 From: eddyem Date: Tue, 2 Jun 2020 17:55:36 +0300 Subject: [PATCH] Fixed bug in can.s: CAN->BTR |= -->> CAN->BTR = --- F0-nolib/CANbus_stepper/src/can.c | 2 +- F0-nolib/CANbus_stepper/src/canstepper.bin | Bin F0-nolib/Chiller/chiller.bin | Bin F0-nolib/F0_testbrd/pl2303.bin | Bin F0-nolib/QuadEncoder/encoder.bin | Bin F0-nolib/Servo/servo.bin | Bin F0-nolib/TM1637/tm1637.bin | Bin F0-nolib/USBHID/usbhid.bin | Bin F0-nolib/blink/blink.bin | Bin F0-nolib/canbus/src/can.c | 2 +- F0-nolib/canbus/src/canbus.bin | Bin F0-nolib/htu21d_nucleo/usart.bin | Bin F0-nolib/morze/morze.bin | Bin F0-nolib/pl2303/pl2303.bin | Bin F0-nolib/tsys01_nucleo/tsys01.bin | Bin F0-nolib/uart_blink/uartblink.bin | Bin F0-nolib/uart_blink_dma/uartblink.bin | Bin F0-nolib/uart_nucleo/usart.bin | Bin F0-nolib/usbcan/can.c | 2 +- F0-nolib/usbcan/usbcan.bin | Bin F0/blink/blink.bin | Bin F0/uart/uart.bin | Bin F1-nolib/CDC_ACM/cdcacm.bin | Bin F1-nolib/F1_testbrd/pl2303.bin | Bin F1-nolib/LED_Screen/LEDscreen.bin | Bin F1-nolib/LED_Screen/genlist | 0 F1-nolib/LED_Screen/scrtest/scrtest | Bin F1-nolib/PL2303/pl2303.bin | Bin F1-nolib/SPI/SPI.bin | Bin F1-nolib/USB_HID/usbhid103.bin | Bin F1-nolib/chronometer/chrono.bin | Bin F1-nolib/chronometer_v2/chrono.bin | Bin F1-nolib/led_blink/blink.bin | Bin F1-nolib/uart/uart.bin | Bin F1/1_wire/onewire.bin | Bin F1/2.8TFT/dma_gpio.bin | Bin F1/DMA_GPIO/dma_gpio.bin | Bin F1/GPIO_TIM/tim_gpio.bin | Bin F1/GPS+ultrasonic/timelapse.bin | Bin F1/GPS/GPS.bin | Bin F1/Jeep_generator/jeep_generator.bin | Bin F1/Timelapse_keyboard/timelapse.bin | Bin F1/Timelapse_keyboard_only_lasers/timelapse.bin | Bin F1/USBCDC_template/usb_cdc_simple.bin | Bin F1/canon_lens/canon_lens.bin | Bin F1/distance_meters/ultrasonic.bin | Bin F1/hid_mouse_keyboard/usbhid.bin | Bin F1/keyboard_snippet/keyboard.bin | Bin F1/matrix_keyboard/matrkeyb.bin | Bin F1/nokia5110/nokia5110.bin | Bin F1/simple_cdc/usb_cdc_simple.bin | Bin F1/stepper_motion/usb_cdc_simple.bin | Bin F1/ultrasonic/ultrasonic.bin | Bin 53 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 F0-nolib/CANbus_stepper/src/canstepper.bin mode change 100644 => 100755 F0-nolib/Chiller/chiller.bin mode change 100644 => 100755 F0-nolib/F0_testbrd/pl2303.bin mode change 100644 => 100755 F0-nolib/QuadEncoder/encoder.bin mode change 100644 => 100755 F0-nolib/Servo/servo.bin mode change 100644 => 100755 F0-nolib/TM1637/tm1637.bin mode change 100644 => 100755 F0-nolib/USBHID/usbhid.bin mode change 100644 => 100755 F0-nolib/blink/blink.bin mode change 100644 => 100755 F0-nolib/canbus/src/canbus.bin mode change 100644 => 100755 F0-nolib/htu21d_nucleo/usart.bin mode change 100644 => 100755 F0-nolib/morze/morze.bin mode change 100644 => 100755 F0-nolib/pl2303/pl2303.bin mode change 100644 => 100755 F0-nolib/tsys01_nucleo/tsys01.bin mode change 100644 => 100755 F0-nolib/uart_blink/uartblink.bin mode change 100644 => 100755 F0-nolib/uart_blink_dma/uartblink.bin mode change 100644 => 100755 F0-nolib/uart_nucleo/usart.bin mode change 100644 => 100755 F0-nolib/usbcan/usbcan.bin mode change 100644 => 100755 F0/blink/blink.bin mode change 100644 => 100755 F0/uart/uart.bin mode change 100644 => 100755 F1-nolib/CDC_ACM/cdcacm.bin mode change 100644 => 100755 F1-nolib/F1_testbrd/pl2303.bin mode change 100644 => 100755 F1-nolib/LED_Screen/LEDscreen.bin mode change 100644 => 100755 F1-nolib/LED_Screen/genlist mode change 100644 => 100755 F1-nolib/LED_Screen/scrtest/scrtest mode change 100644 => 100755 F1-nolib/PL2303/pl2303.bin mode change 100644 => 100755 F1-nolib/SPI/SPI.bin mode change 100644 => 100755 F1-nolib/USB_HID/usbhid103.bin mode change 100755 => 100644 F1-nolib/chronometer/chrono.bin mode change 100644 => 100755 F1-nolib/chronometer_v2/chrono.bin mode change 100644 => 100755 F1-nolib/led_blink/blink.bin mode change 100644 => 100755 F1-nolib/uart/uart.bin mode change 100644 => 100755 F1/1_wire/onewire.bin mode change 100644 => 100755 F1/2.8TFT/dma_gpio.bin mode change 100644 => 100755 F1/DMA_GPIO/dma_gpio.bin mode change 100644 => 100755 F1/GPIO_TIM/tim_gpio.bin mode change 100644 => 100755 F1/GPS+ultrasonic/timelapse.bin mode change 100644 => 100755 F1/GPS/GPS.bin mode change 100644 => 100755 F1/Jeep_generator/jeep_generator.bin mode change 100644 => 100755 F1/Timelapse_keyboard/timelapse.bin mode change 100644 => 100755 F1/Timelapse_keyboard_only_lasers/timelapse.bin mode change 100644 => 100755 F1/USBCDC_template/usb_cdc_simple.bin mode change 100644 => 100755 F1/canon_lens/canon_lens.bin mode change 100644 => 100755 F1/distance_meters/ultrasonic.bin mode change 100644 => 100755 F1/hid_mouse_keyboard/usbhid.bin mode change 100644 => 100755 F1/keyboard_snippet/keyboard.bin mode change 100644 => 100755 F1/matrix_keyboard/matrkeyb.bin mode change 100644 => 100755 F1/nokia5110/nokia5110.bin mode change 100644 => 100755 F1/simple_cdc/usb_cdc_simple.bin mode change 100644 => 100755 F1/stepper_motion/usb_cdc_simple.bin mode change 100644 => 100755 F1/ultrasonic/ultrasonic.bin diff --git a/F0-nolib/CANbus_stepper/src/can.c b/F0-nolib/CANbus_stepper/src/can.c index 150de17..f78e90c 100644 --- a/F0-nolib/CANbus_stepper/src/can.c +++ b/F0-nolib/CANbus_stepper/src/can.c @@ -145,7 +145,7 @@ void CAN_setup(uint16_t speed){ CAN->MCR &=~ CAN_MCR_SLEEP; /* (3) */ CAN->MCR |= CAN_MCR_ABOM; /* allow automatically bus-off */ - CAN->BTR |= 2 << 20 | 3 << 16 | (6000/speed - 1); /* (4) */ + CAN->BTR = 2 << 20 | 3 << 16 | (6000/speed - 1); /* (4) */ CAN->MCR &=~ CAN_MCR_INRQ; /* (5) */ tmout = 16000000; while((CAN->MSR & CAN_MSR_INAK)==CAN_MSR_INAK) if(--tmout == 0) break; /* (6) */ diff --git a/F0-nolib/CANbus_stepper/src/canstepper.bin b/F0-nolib/CANbus_stepper/src/canstepper.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/Chiller/chiller.bin b/F0-nolib/Chiller/chiller.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/F0_testbrd/pl2303.bin b/F0-nolib/F0_testbrd/pl2303.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/QuadEncoder/encoder.bin b/F0-nolib/QuadEncoder/encoder.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/Servo/servo.bin b/F0-nolib/Servo/servo.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/TM1637/tm1637.bin b/F0-nolib/TM1637/tm1637.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/USBHID/usbhid.bin b/F0-nolib/USBHID/usbhid.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/blink/blink.bin b/F0-nolib/blink/blink.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/canbus/src/can.c b/F0-nolib/canbus/src/can.c index 8cb6886..376ecff 100644 --- a/F0-nolib/canbus/src/can.c +++ b/F0-nolib/canbus/src/can.c @@ -135,7 +135,7 @@ void CAN_setup(){ CAN->MCR &=~ CAN_MCR_SLEEP; /* (3) */ CAN->MCR |= CAN_MCR_ABOM; - CAN->BTR |= 2 << 20 | 3 << 16 | 59 << 0; /* (4) */ + CAN->BTR = 2 << 20 | 3 << 16 | 59 << 0; /* (4) */ CAN->MCR &=~ CAN_MCR_INRQ; /* (5) */ while((CAN->MSR & CAN_MSR_INAK)==CAN_MSR_INAK) /* (6) */ { diff --git a/F0-nolib/canbus/src/canbus.bin b/F0-nolib/canbus/src/canbus.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/htu21d_nucleo/usart.bin b/F0-nolib/htu21d_nucleo/usart.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/morze/morze.bin b/F0-nolib/morze/morze.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/pl2303/pl2303.bin b/F0-nolib/pl2303/pl2303.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/tsys01_nucleo/tsys01.bin b/F0-nolib/tsys01_nucleo/tsys01.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/uart_blink/uartblink.bin b/F0-nolib/uart_blink/uartblink.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/uart_blink_dma/uartblink.bin b/F0-nolib/uart_blink_dma/uartblink.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/uart_nucleo/usart.bin b/F0-nolib/uart_nucleo/usart.bin old mode 100644 new mode 100755 diff --git a/F0-nolib/usbcan/can.c b/F0-nolib/usbcan/can.c index c1b4f53..902bd95 100644 --- a/F0-nolib/usbcan/can.c +++ b/F0-nolib/usbcan/can.c @@ -165,7 +165,7 @@ void CAN_setup(uint16_t speed){ CAN->MCR &=~ CAN_MCR_SLEEP; /* (3) */ CAN->MCR |= CAN_MCR_ABOM; /* allow automatically bus-off */ - CAN->BTR |= 2 << 20 | 3 << 16 | (6000/speed - 1); /* (4) */ + CAN->BTR = 2 << 20 | 3 << 16 | (6000/speed - 1); /* (4) */ CAN->MCR &=~ CAN_MCR_INRQ; /* (5) */ tmout = 16000000; while((CAN->MSR & CAN_MSR_INAK)==CAN_MSR_INAK) if(--tmout == 0) break; /* (6) */ diff --git a/F0-nolib/usbcan/usbcan.bin b/F0-nolib/usbcan/usbcan.bin old mode 100644 new mode 100755 diff --git a/F0/blink/blink.bin b/F0/blink/blink.bin old mode 100644 new mode 100755 diff --git a/F0/uart/uart.bin b/F0/uart/uart.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/CDC_ACM/cdcacm.bin b/F1-nolib/CDC_ACM/cdcacm.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/F1_testbrd/pl2303.bin b/F1-nolib/F1_testbrd/pl2303.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/LED_Screen/LEDscreen.bin b/F1-nolib/LED_Screen/LEDscreen.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/LED_Screen/genlist b/F1-nolib/LED_Screen/genlist old mode 100644 new mode 100755 diff --git a/F1-nolib/LED_Screen/scrtest/scrtest b/F1-nolib/LED_Screen/scrtest/scrtest old mode 100644 new mode 100755 diff --git a/F1-nolib/PL2303/pl2303.bin b/F1-nolib/PL2303/pl2303.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/SPI/SPI.bin b/F1-nolib/SPI/SPI.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/USB_HID/usbhid103.bin b/F1-nolib/USB_HID/usbhid103.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/chronometer/chrono.bin b/F1-nolib/chronometer/chrono.bin old mode 100755 new mode 100644 diff --git a/F1-nolib/chronometer_v2/chrono.bin b/F1-nolib/chronometer_v2/chrono.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/led_blink/blink.bin b/F1-nolib/led_blink/blink.bin old mode 100644 new mode 100755 diff --git a/F1-nolib/uart/uart.bin b/F1-nolib/uart/uart.bin old mode 100644 new mode 100755 diff --git a/F1/1_wire/onewire.bin b/F1/1_wire/onewire.bin old mode 100644 new mode 100755 diff --git a/F1/2.8TFT/dma_gpio.bin b/F1/2.8TFT/dma_gpio.bin old mode 100644 new mode 100755 diff --git a/F1/DMA_GPIO/dma_gpio.bin b/F1/DMA_GPIO/dma_gpio.bin old mode 100644 new mode 100755 diff --git a/F1/GPIO_TIM/tim_gpio.bin b/F1/GPIO_TIM/tim_gpio.bin old mode 100644 new mode 100755 diff --git a/F1/GPS+ultrasonic/timelapse.bin b/F1/GPS+ultrasonic/timelapse.bin old mode 100644 new mode 100755 diff --git a/F1/GPS/GPS.bin b/F1/GPS/GPS.bin old mode 100644 new mode 100755 diff --git a/F1/Jeep_generator/jeep_generator.bin b/F1/Jeep_generator/jeep_generator.bin old mode 100644 new mode 100755 diff --git a/F1/Timelapse_keyboard/timelapse.bin b/F1/Timelapse_keyboard/timelapse.bin old mode 100644 new mode 100755 diff --git a/F1/Timelapse_keyboard_only_lasers/timelapse.bin b/F1/Timelapse_keyboard_only_lasers/timelapse.bin old mode 100644 new mode 100755 diff --git a/F1/USBCDC_template/usb_cdc_simple.bin b/F1/USBCDC_template/usb_cdc_simple.bin old mode 100644 new mode 100755 diff --git a/F1/canon_lens/canon_lens.bin b/F1/canon_lens/canon_lens.bin old mode 100644 new mode 100755 diff --git a/F1/distance_meters/ultrasonic.bin b/F1/distance_meters/ultrasonic.bin old mode 100644 new mode 100755 diff --git a/F1/hid_mouse_keyboard/usbhid.bin b/F1/hid_mouse_keyboard/usbhid.bin old mode 100644 new mode 100755 diff --git a/F1/keyboard_snippet/keyboard.bin b/F1/keyboard_snippet/keyboard.bin old mode 100644 new mode 100755 diff --git a/F1/matrix_keyboard/matrkeyb.bin b/F1/matrix_keyboard/matrkeyb.bin old mode 100644 new mode 100755 diff --git a/F1/nokia5110/nokia5110.bin b/F1/nokia5110/nokia5110.bin old mode 100644 new mode 100755 diff --git a/F1/simple_cdc/usb_cdc_simple.bin b/F1/simple_cdc/usb_cdc_simple.bin old mode 100644 new mode 100755 diff --git a/F1/stepper_motion/usb_cdc_simple.bin b/F1/stepper_motion/usb_cdc_simple.bin old mode 100644 new mode 100755 diff --git a/F1/ultrasonic/ultrasonic.bin b/F1/ultrasonic/ultrasonic.bin old mode 100644 new mode 100755