Selaa lähdekoodia

Remove 'const' from PersistentStore::capacity

Scott Lahteine 6 vuotta sitten
vanhempi
commit
834ea7fcea

+ 1
- 1
Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp Näytä tiedosto

62
   return false;  // always assume success for AVR's
62
   return false;  // always assume success for AVR's
63
 }
63
 }
64
 
64
 
65
-const size_t PersistentStore::capacity() { return E2END + 1; }
65
+size_t PersistentStore::capacity() { return E2END + 1; }
66
 
66
 
67
 #endif // EEPROM_SETTINGS
67
 #endif // EEPROM_SETTINGS
68
 #endif // __AVR__
68
 #endif // __AVR__

+ 1
- 1
Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp Näytä tiedosto

71
   return false;
71
   return false;
72
 }
72
 }
73
 
73
 
74
-const size_t PersistentStore::capacity() { return E2END + 1; }
74
+size_t PersistentStore::capacity() { return E2END + 1; }
75
 
75
 
76
 #endif // EEPROM_SETTINGS
76
 #endif // EEPROM_SETTINGS
77
 #endif // ARDUINO_ARCH_SAM
77
 #endif // ARDUINO_ARCH_SAM

+ 6
- 6
Marlin/src/HAL/HAL_LPC1768/HAL.cpp Näytä tiedosto

125
 
125
 
126
 // possible config options if something similar is extended to more platforms.
126
 // possible config options if something similar is extended to more platforms.
127
 #define ADC_USE_MEDIAN_FILTER          // Filter out erroneous readings
127
 #define ADC_USE_MEDIAN_FILTER          // Filter out erroneous readings
128
-#define ADC_MEDIAN_FILTER_SIZE    (23) // Higher values increase step delay (phase shift),
128
+#define ADC_MEDIAN_FILTER_SIZE     23  // Higher values increase step delay (phase shift),
129
                                        // (ADC_MEDIAN_FILTER_SIZE + 1) / 2 sample step delay (12 samples @ 500Hz: 24ms phase shift)
129
                                        // (ADC_MEDIAN_FILTER_SIZE + 1) / 2 sample step delay (12 samples @ 500Hz: 24ms phase shift)
130
                                        // Memory usage per ADC channel (bytes): (6 * ADC_MEDIAN_FILTER_SIZE) + 16
130
                                        // Memory usage per ADC channel (bytes): (6 * ADC_MEDIAN_FILTER_SIZE) + 16
131
                                        // 8 * ((6 * 23) + 16 ) = 1232 Bytes for 8 channels
131
                                        // 8 * ((6 * 23) + 16 ) = 1232 Bytes for 8 channels
132
 
132
 
133
 #define ADC_USE_LOWPASS_FILTER         // Filter out high frequency noise
133
 #define ADC_USE_LOWPASS_FILTER         // Filter out high frequency noise
134
-#define ADC_LOWPASS_K_VALUE       (6)  // Higher values increase rise time
134
+#define ADC_LOWPASS_K_VALUE         6  // Higher values increase rise time
135
                                        // Rise time sample delays for 100% signal convergence on full range step
135
                                        // Rise time sample delays for 100% signal convergence on full range step
136
                                        // (1 : 13, 2 : 32, 3 : 67, 4 : 139, 5 : 281, 6 : 565, 7 : 1135, 8 : 2273)
136
                                        // (1 : 13, 2 : 32, 3 : 67, 4 : 139, 5 : 281, 6 : 565, 7 : 1135, 8 : 2273)
137
                                        // K = 6, 565 samples, 500Hz sample rate, 1.13s convergence on full range step
137
                                        // K = 6, 565 samples, 500Hz sample rate, 1.13s convergence on full range step
162
       datum = STOPPER + 1;                  // No stoppers allowed.
162
       datum = STOPPER + 1;                  // No stoppers allowed.
163
     }
163
     }
164
 
164
 
165
-    if ( (++datpoint - buffer) >= ADC_MEDIAN_FILTER_SIZE) {
165
+    if ( (++datpoint - buffer) >= (ADC_MEDIAN_FILTER_SIZE)) {
166
       datpoint = buffer;                    // Increment and wrap data in pointer.
166
       datpoint = buffer;                    // Increment and wrap data in pointer.
167
     }
167
     }
168
 
168
 
224
 
224
 
225
 struct LowpassFilter {
225
 struct LowpassFilter {
226
   uint32_t data_delay = 0;
226
   uint32_t data_delay = 0;
227
-  uint16_t update(uint16_t value) {
228
-    data_delay = data_delay - (data_delay >> ADC_LOWPASS_K_VALUE) + value;
229
-    return (uint16_t)(data_delay >> ADC_LOWPASS_K_VALUE);
227
+  uint16_t update(const uint16_t value) {
228
+    data_delay -= (data_delay >> (ADC_LOWPASS_K_VALUE)) - value;
229
+    return (uint16_t)(data_delay >> (ADC_LOWPASS_K_VALUE));
230
   }
230
   }
231
 };
231
 };
232
 
232
 

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp Näytä tiedosto

175
   return bytes_read != size;  // return true for any error
175
   return bytes_read != size;  // return true for any error
176
 }
176
 }
177
 
177
 
178
-const size_t PersistentStore::capacity() { return 4096; } // 4KiB of Emulated EEPROM
178
+size_t PersistentStore::capacity() { return 4096; } // 4KiB of Emulated EEPROM
179
 
179
 
180
 #endif // !FLASH_EEPROM
180
 #endif // !FLASH_EEPROM
181
 #endif // EEPROM_SETTINGS
181
 #endif // EEPROM_SETTINGS

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp Näytä tiedosto

101
   return false;
101
   return false;
102
 }
102
 }
103
 
103
 
104
-const size_t PersistentStore::capacity() { return E2END + 1; }
104
+size_t PersistentStore::capacity() { return E2END + 1; }
105
 
105
 
106
 #endif // EEPROM_SETTINGS && EEPROM FLASH
106
 #endif // EEPROM_SETTINGS && EEPROM FLASH
107
 #endif // __STM32F1__
107
 #endif // __STM32F1__

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp Näytä tiedosto

79
   return false;
79
   return false;
80
 }
80
 }
81
 
81
 
82
-const size_t PersistentStore::capacity() { return HAL_STM32F1_EEPROM_SIZE; }
82
+size_t PersistentStore::capacity() { return HAL_STM32F1_EEPROM_SIZE; }
83
 
83
 
84
 #endif // EEPROM_SETTINGS
84
 #endif // EEPROM_SETTINGS
85
 
85
 

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/persistent_store_eeprom.cpp Näytä tiedosto

64
   return false;
64
   return false;
65
 }
65
 }
66
 
66
 
67
-const size_t PersistentStore::capacity() { return E2END + 1; }
67
+size_t PersistentStore::capacity() { return E2END + 1; }
68
 
68
 
69
 #endif // EEPROM_SETTINGS
69
 #endif // EEPROM_SETTINGS
70
 #endif // STM32F4 || STM32F4xx
70
 #endif // STM32F4 || STM32F4xx

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/persistent_store_eeprom.cpp Näytä tiedosto

64
   return false;
64
   return false;
65
 }
65
 }
66
 
66
 
67
-const size_t PersistentStore::capacity() { return E2END + 1; }
67
+size_t PersistentStore::capacity() { return E2END + 1; }
68
 
68
 
69
 #endif // EEPROM_SETTINGS
69
 #endif // EEPROM_SETTINGS
70
 #endif // STM32F7
70
 #endif // STM32F7

+ 1
- 1
Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp Näytä tiedosto

65
   return false;
65
   return false;
66
 }
66
 }
67
 
67
 
68
-const size_t PersistentStore::capacity() { return E2END + 1; }
68
+size_t PersistentStore::capacity() { return E2END + 1; }
69
 
69
 
70
 #endif // EEPROM_SETTINGS
70
 #endif // EEPROM_SETTINGS
71
 #endif // __MK64FX512__ || __MK66FX1M0__
71
 #endif // __MK64FX512__ || __MK66FX1M0__

+ 1
- 1
Marlin/src/HAL/shared/persistent_store_api.h Näytä tiedosto

31
   static bool access_finish();
31
   static bool access_finish();
32
   static bool write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc);
32
   static bool write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc);
33
   static bool read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing=true);
33
   static bool read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing=true);
34
-  static const size_t capacity();
34
+  static size_t capacity();
35
 
35
 
36
   static inline bool write_data(const int pos, uint8_t* value, const size_t size) {
36
   static inline bool write_data(const int pos, uint8_t* value, const size_t size) {
37
     int data_pos = pos;
37
     int data_pos = pos;

Loading…
Peruuta
Tallenna