Browse Source

Fix some HAL_STM32F1 type declarations

Scott Lahteine 6 years ago
parent
commit
3e867008f0

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/HAL.cpp View File

100
 // --------------------------------------------------------------------------
100
 // --------------------------------------------------------------------------
101
 STM32ADC adc(ADC1);
101
 STM32ADC adc(ADC1);
102
 
102
 
103
-uint8 adc_pins[] = {
103
+uint8_t adc_pins[] = {
104
   #if HAS_TEMP_ADC_0
104
   #if HAS_TEMP_ADC_0
105
     TEMP_0_PIN,
105
     TEMP_0_PIN,
106
   #endif
106
   #endif

+ 7
- 7
Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp View File

52
 #define TAU_USEC        (TAU_MSEC * 1000)
52
 #define TAU_USEC        (TAU_MSEC * 1000)
53
 #define TAU_CYC         (TAU_MSEC * CYC_MSEC)
53
 #define TAU_CYC         (TAU_MSEC * CYC_MSEC)
54
 #define SERVO_PRESCALER (TAU_CYC / MAX_OVERFLOW + 1)
54
 #define SERVO_PRESCALER (TAU_CYC / MAX_OVERFLOW + 1)
55
-#define SERVO_OVERFLOW  ((uint16)round((double)TAU_CYC / SERVO_PRESCALER))
55
+#define SERVO_OVERFLOW  ((uint16_t)round((double)TAU_CYC / SERVO_PRESCALER))
56
 
56
 
57
 // Unit conversions
57
 // Unit conversions
58
-#define US_TO_COMPARE(us) ((uint16)map((us), 0, TAU_USEC, 0, SERVO_OVERFLOW))
59
-#define COMPARE_TO_US(c)  ((uint32)map((c), 0, SERVO_OVERFLOW, 0, TAU_USEC))
60
-#define ANGLE_TO_US(a)    ((uint16)(map((a), this->minAngle, this->maxAngle, \
58
+#define US_TO_COMPARE(us) ((uint16_t)map((us), 0, TAU_USEC, 0, SERVO_OVERFLOW))
59
+#define COMPARE_TO_US(c)  ((uint32_t)map((c), 0, SERVO_OVERFLOW, 0, TAU_USEC))
60
+#define ANGLE_TO_US(a)    ((uint16_t)(map((a), this->minAngle, this->maxAngle, \
61
                                         SERVO_DEFAULT_MIN_PW, SERVO_DEFAULT_MAX_PW)))
61
                                         SERVO_DEFAULT_MIN_PW, SERVO_DEFAULT_MAX_PW)))
62
-#define US_TO_ANGLE(us)   ((int16)(map((us), SERVO_DEFAULT_MIN_PW, SERVO_DEFAULT_MAX_PW,  \
62
+#define US_TO_ANGLE(us)   ((int16_t)(map((us), SERVO_DEFAULT_MIN_PW, SERVO_DEFAULT_MAX_PW,  \
63
                                        this->minAngle, this->maxAngle)))
63
                                        this->minAngle, this->maxAngle)))
64
 
64
 
65
 libServo::libServo() {
65
 libServo::libServo() {
74
   this->maxAngle = maxAngle;
74
   this->maxAngle = maxAngle;
75
 
75
 
76
   timer_dev *tdev = PIN_MAP[this->pin].timer_device;
76
   timer_dev *tdev = PIN_MAP[this->pin].timer_device;
77
-  uint8 tchan = PIN_MAP[this->pin].timer_channel;
77
+  uint8_t tchan = PIN_MAP[this->pin].timer_channel;
78
 
78
 
79
   pinMode(this->pin, PWM);
79
   pinMode(this->pin, PWM);
80
   pwmWrite(this->pin, 0);
80
   pwmWrite(this->pin, 0);
97
 int32_t libServo::read() const {
97
 int32_t libServo::read() const {
98
   if (this->attached()) {
98
   if (this->attached()) {
99
     timer_dev *tdev = PIN_MAP[this->pin].timer_device;
99
     timer_dev *tdev = PIN_MAP[this->pin].timer_device;
100
-    uint8 tchan = PIN_MAP[this->pin].timer_channel;
100
+    uint8_t tchan = PIN_MAP[this->pin].timer_channel;
101
     return US_TO_ANGLE(COMPARE_TO_US(timer_get_compare(tdev, tchan)));
101
     return US_TO_ANGLE(COMPARE_TO_US(timer_get_compare(tdev, tchan)));
102
   }
102
   }
103
   return 0;
103
   return 0;

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.cpp View File

138
 
138
 
139
   SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
139
   SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
140
 
140
 
141
-  uint32 timeout = millis() + SDIO_WRITE_TIMEOUT;
141
+  uint32_t timeout = millis() + SDIO_WRITE_TIMEOUT;
142
   while (timeout > millis()) {
142
   while (timeout > millis()) {
143
     if (SDIO_GetCardState() == SDIO_CARD_TRANSFER) {
143
     if (SDIO_GetCardState() == SDIO_CARD_TRANSFER) {
144
       return true;
144
       return true;

+ 2
- 2
Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp View File

133
  */
133
  */
134
 void spiRead(uint8_t* buf, uint16_t nbyte) {
134
 void spiRead(uint8_t* buf, uint16_t nbyte) {
135
   SPI.beginTransaction(spiConfig);
135
   SPI.beginTransaction(spiConfig);
136
-  SPI.dmaTransfer(0, const_cast<uint8*>(buf), nbyte);
136
+  SPI.dmaTransfer(0, const_cast<uint8_t*>(buf), nbyte);
137
   SPI.endTransaction();
137
   SPI.endTransaction();
138
 }
138
 }
139
 
139
 
161
 void spiSendBlock(uint8_t token, const uint8_t* buf) {
161
 void spiSendBlock(uint8_t token, const uint8_t* buf) {
162
   SPI.beginTransaction(spiConfig);
162
   SPI.beginTransaction(spiConfig);
163
   SPI.send(token);
163
   SPI.send(token);
164
-  SPI.dmaSend(const_cast<uint8*>(buf), 512);
164
+  SPI.dmaSend(const_cast<uint8_t*>(buf), 512);
165
   SPI.endTransaction();
165
   SPI.endTransaction();
166
 }
166
 }
167
 
167
 

+ 3
- 3
Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp View File

119
     case STEP_TIMER_NUM:
119
     case STEP_TIMER_NUM:
120
       timer_pause(STEP_TIMER_DEV);
120
       timer_pause(STEP_TIMER_DEV);
121
       timer_set_count(STEP_TIMER_DEV, 0);
121
       timer_set_count(STEP_TIMER_DEV, 0);
122
-      timer_set_prescaler(STEP_TIMER_DEV, (uint16)(STEPPER_TIMER_PRESCALE - 1));
122
+      timer_set_prescaler(STEP_TIMER_DEV, (uint16_t)(STEPPER_TIMER_PRESCALE - 1));
123
       timer_set_reload(STEP_TIMER_DEV, 0xFFFF);
123
       timer_set_reload(STEP_TIMER_DEV, 0xFFFF);
124
       timer_set_compare(STEP_TIMER_DEV, STEP_TIMER_CHAN, MIN(HAL_TIMER_TYPE_MAX, (STEPPER_TIMER_RATE / frequency)));
124
       timer_set_compare(STEP_TIMER_DEV, STEP_TIMER_CHAN, MIN(HAL_TIMER_TYPE_MAX, (STEPPER_TIMER_RATE / frequency)));
125
       timer_attach_interrupt(STEP_TIMER_DEV, STEP_TIMER_CHAN, stepTC_Handler);
125
       timer_attach_interrupt(STEP_TIMER_DEV, STEP_TIMER_CHAN, stepTC_Handler);
130
     case TEMP_TIMER_NUM:
130
     case TEMP_TIMER_NUM:
131
       timer_pause(TEMP_TIMER_DEV);
131
       timer_pause(TEMP_TIMER_DEV);
132
       timer_set_count(TEMP_TIMER_DEV, 0);
132
       timer_set_count(TEMP_TIMER_DEV, 0);
133
-      timer_set_prescaler(TEMP_TIMER_DEV, (uint16)(TEMP_TIMER_PRESCALE - 1));
133
+      timer_set_prescaler(TEMP_TIMER_DEV, (uint16_t)(TEMP_TIMER_PRESCALE - 1));
134
       timer_set_reload(TEMP_TIMER_DEV, 0xFFFF);
134
       timer_set_reload(TEMP_TIMER_DEV, 0xFFFF);
135
       timer_set_compare(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, MIN(HAL_TIMER_TYPE_MAX, ((F_CPU / TEMP_TIMER_PRESCALE) / frequency)));
135
       timer_set_compare(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, MIN(HAL_TIMER_TYPE_MAX, ((F_CPU / TEMP_TIMER_PRESCALE) / frequency)));
136
       timer_attach_interrupt(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, tempTC_Handler);
136
       timer_attach_interrupt(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, tempTC_Handler);
157
   }
157
   }
158
 }
158
 }
159
 
159
 
160
-static inline bool timer_irq_enabled(const timer_dev * const dev, const uint8 interrupt) {
160
+static inline bool timer_irq_enabled(const timer_dev * const dev, const uint8_t interrupt) {
161
   return bool(*bb_perip(&(dev->regs).adv->DIER, interrupt));
161
   return bool(*bb_perip(&(dev->regs).adv->DIER, interrupt));
162
 }
162
 }
163
 
163
 

Loading…
Cancel
Save