Browse Source

Rename files to move them in the IDE

pull/1/head
Scott Lahteine 10 years ago
parent
commit
a22a228bcc
  1. 4
      Marlin/BlinkM.cpp
  2. 2
      Marlin/BlinkM.h
  3. 4
      Marlin/Makefile
  4. 8
      Marlin/Marlin_main.cpp
  5. 4
      Marlin/Servo.cpp
  6. 6
      Marlin/Servo.h
  7. 4
      Marlin/configuration_store.cpp
  8. 6
      Marlin/configuration_store.h
  9. 0
      Marlin/dogm_bitmaps.h
  10. 2
      Marlin/dogm_lcd_implementation.h
  11. 2
      Marlin/pins_SAV_MKI.h
  12. 2
      Marlin/ultralcd.cpp

4
Marlin/BlinkM.cpp

@ -1,11 +1,11 @@
/* /*
BlinkM.cpp - Library for controlling a BlinkM over i2c blinkm.cpp - Library for controlling a BlinkM over i2c
Created by Tim Koster, August 21 2013. Created by Tim Koster, August 21 2013.
*/ */
#include "Marlin.h" #include "Marlin.h"
#ifdef BLINKM #ifdef BLINKM
#include "BlinkM.h" #include "blinkm.h"
void SendColors(byte red, byte grn, byte blu) { void SendColors(byte red, byte grn, byte blu) {
Wire.begin(); Wire.begin();

2
Marlin/BlinkM.h

@ -1,5 +1,5 @@
/* /*
BlinkM.h blinkm.h
Library header file for BlinkM library Library header file for BlinkM library
*/ */
#if ARDUINO >= 100 #if ARDUINO >= 100

4
Marlin/Makefile

@ -267,8 +267,8 @@ endif
CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \ MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \
SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \ SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \
stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \ stepper.cpp temperature.cpp cardreader.cpp configuration_store.cpp \
watchdog.cpp SPI.cpp Servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \ watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
vector_3.cpp qr_solve.cpp vector_3.cpp qr_solve.cpp
ifeq ($(LIQUID_TWI2), 0) ifeq ($(LIQUID_TWI2), 0)
CXXSRC += LiquidCrystal.cpp CXXSRC += LiquidCrystal.cpp

8
Marlin/Marlin_main.cpp

@ -49,18 +49,18 @@
#include "motion_control.h" #include "motion_control.h"
#include "cardreader.h" #include "cardreader.h"
#include "watchdog.h" #include "watchdog.h"
#include "ConfigurationStore.h" #include "configuration_store.h"
#include "language.h" #include "language.h"
#include "pins_arduino.h" #include "pins_arduino.h"
#include "math.h" #include "math.h"
#ifdef BLINKM #ifdef BLINKM
#include "BlinkM.h" #include "blinkm.h"
#include "Wire.h" #include "Wire.h"
#endif #endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#include "Servo.h" #include "servo.h"
#endif #endif
#if HAS_DIGIPOTSS #if HAS_DIGIPOTSS
@ -4417,7 +4417,7 @@ inline void gcode_M503() {
if (code_seen('Z')) { if (code_seen('Z')) {
value = code_value(); value = code_value();
if (Z_PROBE_OFFSET_RANGE_MIN <= value && value <= Z_PROBE_OFFSET_RANGE_MAX) { if (Z_PROBE_OFFSET_RANGE_MIN <= value && value <= Z_PROBE_OFFSET_RANGE_MAX) {
zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp zprobe_zoffset = -value; // compare w/ line 278 of configuration_store.cpp
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK); SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
SERIAL_EOL; SERIAL_EOL;

4
Marlin/Servo.cpp

@ -1,5 +1,5 @@
/* /*
Servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2 servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
Copyright (c) 2009 Michael Margolis. All right reserved. Copyright (c) 2009 Michael Margolis. All right reserved.
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
@ -48,7 +48,7 @@
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <Arduino.h> #include <Arduino.h>
#include "Servo.h" #include "servo.h"
#define usToTicks(_us) (( clockCyclesPerMicrosecond()* _us) / 8) // converts microseconds to tick (assumes prescale of 8) // 12 Aug 2009 #define usToTicks(_us) (( clockCyclesPerMicrosecond()* _us) / 8) // converts microseconds to tick (assumes prescale of 8) // 12 Aug 2009
#define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds

6
Marlin/Servo.h

@ -1,5 +1,5 @@
/* /*
Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2 servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
Copyright (c) 2009 Michael Margolis. All right reserved. Copyright (c) 2009 Michael Margolis. All right reserved.
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
@ -42,8 +42,8 @@
detach() - Stops an attached servos from pulsing its i/o pin. detach() - Stops an attached servos from pulsing its i/o pin.
*/ */
#ifndef Servo_h #ifndef servo_h
#define Servo_h #define servo_h
#include <inttypes.h> #include <inttypes.h>

4
Marlin/ConfigurationStore.cpp → Marlin/configuration_store.cpp

@ -1,5 +1,5 @@
/** /**
* ConfigurationStore.cpp * configuration_store.cpp
* *
* Configuration and EEPROM storage * Configuration and EEPROM storage
* *
@ -93,7 +93,7 @@
#include "planner.h" #include "planner.h"
#include "temperature.h" #include "temperature.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "ConfigurationStore.h" #include "configuration_store.h"
#ifdef MESH_BED_LEVELING #ifdef MESH_BED_LEVELING
#include "mesh_bed_leveling.h" #include "mesh_bed_leveling.h"

6
Marlin/ConfigurationStore.h → Marlin/configuration_store.h

@ -1,5 +1,5 @@
#ifndef CONFIGURATIONSTORE_H #ifndef CONFIGURATION_STORE_H
#define CONFIGURATIONSTORE_H #define CONFIGURATION_STORE_H
#include "Configuration.h" #include "Configuration.h"
@ -19,4 +19,4 @@ void Config_ResetDefault();
FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); } FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
#endif #endif
#endif //CONFIGURATIONSTORE_H #endif //CONFIGURATION_STORE_H

0
Marlin/DOGMbitmaps.h → Marlin/dogm_bitmaps.h

2
Marlin/dogm_lcd_implementation.h

@ -29,7 +29,7 @@
#endif #endif
#include <U8glib.h> #include <U8glib.h>
#include "DOGMbitmaps.h" #include "dogm_bitmaps.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h" #include "ultralcd_st7920_u8glib_rrd.h"

2
Marlin/pins_SAV_MKI.h

@ -82,7 +82,7 @@
#define HOME_PIN -1 // A4 = marlin 44 - teensy = 42 #define HOME_PIN -1 // A4 = marlin 44 - teensy = 42
#ifdef NUM_SERVOS #ifdef NUM_SERVOS
#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in Servo.cpp) #define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
#endif #endif
#endif // SAV_3DLCD #endif // SAV_3DLCD

2
Marlin/ultralcd.cpp

@ -5,7 +5,7 @@
#include "cardreader.h" #include "cardreader.h"
#include "temperature.h" #include "temperature.h"
#include "stepper.h" #include "stepper.h"
#include "ConfigurationStore.h" #include "configuration_store.h"
int8_t encoderDiff; /* encoderDiff is updated from interrupt context and added to encoderPosition every LCD update */ int8_t encoderDiff; /* encoderDiff is updated from interrupt context and added to encoderPosition every LCD update */

Loading…
Cancel
Save