Przeglądaj źródła

Removing warnings from compilation

etagle 7 lat temu
rodzic
commit
40d7e12827

+ 17
- 9
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp Wyświetl plik

@@ -142,20 +142,26 @@ uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_v
142 142
       //u8g->pin_list[U8G_PI_SET_A0] = 1;
143 143
       //if (u8g_com_arduino_ssd_start_sequence(u8g) == 0)
144 144
       //  return u8g_i2c_stop(), 0;
145
-      if (u8g_i2c_send_byte(arg_val) == 0)
146
-        return u8g_i2c_stop(), 0;
145
+      if (u8g_i2c_send_byte(arg_val) == 0) {
146
+        u8g_i2c_stop();
147
+        return 0;
148
+      }
147 149
       // u8g_i2c_stop();
148 150
       break;
149 151
 
150 152
     case U8G_COM_MSG_WRITE_SEQ: {
151
-      //u8g->pin_list[U8G_PI_SET_A0] = 1;
152
-      if (u8g_com_ssd_I2C_start_sequence(u8g) == 0)
153
-        return u8g_i2c_stop(), 0;
153
+        //u8g->pin_list[U8G_PI_SET_A0] = 1;
154
+        if (u8g_com_ssd_I2C_start_sequence(u8g) == 0) {
155
+         u8g_i2c_stop();
156
+         return 0;
157
+        }
154 158
 
155 159
         register uint8_t *ptr = (uint8_t *)arg_ptr;
156 160
         while (arg_val > 0) {
157
-          if (u8g_i2c_send_byte(*ptr++) == 0)
158
-            return u8g_i2c_stop(), 0;
161
+          if (u8g_i2c_send_byte(*ptr++) == 0) {
162
+            u8g_i2c_stop();
163
+            return 0;
164
+          }
159 165
           arg_val--;
160 166
         }
161 167
       }
@@ -164,8 +170,10 @@ uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_v
164 170
 
165 171
     case U8G_COM_MSG_WRITE_SEQ_P: {
166 172
         //u8g->pin_list[U8G_PI_SET_A0] = 1;
167
-        if (u8g_com_ssd_I2C_start_sequence(u8g) == 0)
168
-          return u8g_i2c_stop(), 0;
173
+        if (u8g_com_ssd_I2C_start_sequence(u8g) == 0) {
174
+          u8g_i2c_stop();
175
+          return 0;
176
+        }
169 177
 
170 178
         register uint8_t *ptr = (uint8_t *)arg_ptr;
171 179
         while (arg_val > 0) {

+ 0
- 1
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp Wyświetl plik

@@ -79,7 +79,6 @@ void spiSend(const uint8_t* buf, size_t n);
79 79
 static uint8_t rs_last_state = 255;
80 80
 
81 81
 static void u8g_com_LPC1768_st7920_write_byte_hw_spi(uint8_t rs, uint8_t val) {
82
-  uint8_t i;
83 82
 
84 83
   if ( rs != rs_last_state) {  // time to send a command/data byte
85 84
     rs_last_state = rs;

+ 1
- 2
Marlin/src/backtrace/unwarm_thumb.cpp Wyświetl plik

@@ -255,10 +255,9 @@ UnwResult UnwStartThumb(UnwState * const state) {
255 255
          * the switch clauses
256 256
          */
257 257
         uint8_t rn = instr & 0xF;
258
-        uint8_t rm = instr2 & 0xF;
259 258
         bool H = (instr2 & 0x10) ? true : false;
260 259
 
261
-        UnwPrintd5("TB%c [r%d,r%d%s]\n", H ? 'H' : 'B', rn, rm, H ? ",LSL #1" : "");
260
+        UnwPrintd5("TB%c [r%d,r%d%s]\n", H ? 'H' : 'B', rn, (instr2 & 0xF), H ? ",LSL #1" : "");
262 261
 
263 262
         // We are only interested if the RN is the PC. Let's choose the 1st destination
264 263
         if (rn == 15) {

+ 1
- 1
Marlin/src/backtrace/unwarmbytab.cpp Wyświetl plik

@@ -185,7 +185,7 @@ static UnwResult UnwTabExecuteInstructions(const UnwindCallbacks *cb, UnwTabStat
185 185
       /* pop r4-r[4+nnn] or pop r4-r[4+nnn], r14*/
186 186
       vsp = ucb->vrs[13];
187 187
 
188
-      for (reg = 4; reg <= (instruction & 0x07) + 4; ++reg) {
188
+      for (reg = 4; reg <= uint32_t((instruction & 0x07) + 4); ++reg) {
189 189
         uint32_t v;
190 190
         if (!cb->readW(vsp,&v))
191 191
           return UNWIND_DREAD_W_FAIL;

Ładowanie…
Anuluj
Zapisz