Skip to content

Enable libraries to build on *nix systems #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable libraries to build on *nix systems #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Ignore libraries added using Arduino IDE Library Manager
RadioLib/
ArduinoJson/

# Ignore Emacs backup files
*~
4 changes: 2 additions & 2 deletions CubeSatLib_Actuators/basedrive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "basedrive.h"
#include <arduino.h>
#include <Arduino.h>
#include "consoleio.h"

int CBaseDrive::channel=0;
Expand Down Expand Up @@ -110,4 +110,4 @@ void CBaseDrive::callNewFunction(CMsg &msg){ //Calls a specific function direc
if (act=="STOP") stopActuator();
if (act=="SPEED") Speed(speed,duration);
if (act=="START") Forward(speed,duration);
}
}
6 changes: 3 additions & 3 deletions CubeSatLib_Actuators/fhmotor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "fhmotor.h"
#include <consoleio.h>
#include <arduino.h>
#include <Arduino.h>

volatile unsigned long _countx=0;
volatile unsigned long _county=0;
Expand Down Expand Up @@ -185,12 +185,12 @@ void CMotorController::activateDrive(float val){
setMSpeed(val);
int nVal;

if((val<0)&&(getDir()){
if((val<0)&&(getDir())){
setDir(0);
digitalWrite(PIN_DIR,LOW);
}

if((val>=0)&&(!getDir()){
if((val>=0)&&(!getDir())){
setDir(1);
digitalWrite(PIN_DIR,HIGH);
}
Expand Down
6 changes: 3 additions & 3 deletions CubeSatLib_Actuators/fhmotor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#pragma once
#include <defs.h>
#include "basedrive.h"
#include <arduino.h>
#include <Arduino.h>
#include "consoleio.h"
#include "system_imu.h"
#include "PID1.h"
#include "pid1.h"


#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
//#include <mbed.h>
//#include <PwmOut.h>
using namespace mbed;
#else
//#include <arduino.h>
//#include <Arduino.h>
typedef int PinName;
#endif

Expand Down
2 changes: 1 addition & 1 deletion CubeSatLib_Actuators/pid1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "WProgram.h"
#endif

#include "PID1.h"
#include "pid1.h"

/*Constructor (...)*********************************************************
* The parameters specified here are those for for which we can't set up
Expand Down
4 changes: 2 additions & 2 deletions CubeSatLib_Actuators/pwmpin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#pragma once
#include <defs.h>
#include "basedrive.h"
#include <arduino.h>
#include <Arduino.h>
#include "consoleio.h"
#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
// #include <mbed.h>
#include <PwmOut.h>
using namespace mbed;
#else
//#include <arduino.h>
//#include <Arduino.h>
typedef int PinName;
#endif

Expand Down
4 changes: 2 additions & 2 deletions CubeSatLib_All/ceps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "arduino.h"
#include "Arduino.h"
#include <Wire.h>
#include "ceps.h"

Expand All @@ -19,7 +19,7 @@ uint8_t CEPS::readI2C(uint8_t i2cs_addr, uint8_t reg, uint8_t * data, uint16_t
Wire.beginTransmission(i2cs_addr);
Wire.write(&reg,1);
Wire.endTransmission();
Wire.requestFrom(i2cs_addr, nbyte); // request 6 bytes from slave device #8
Wire.requestFrom(i2cs_addr, (uint8_t) nbyte); // request 6 bytes from slave device #8

uint16_t k = 0;
//writeconsole("Available :"); writeconsoleln(Wire.available());
Expand Down
2 changes: 1 addition & 1 deletion CubeSatLib_All/consoleio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "defs.h"
#include "funcs.h"
#include "consoleio.h"
#include <arduino.h>
#include <Arduino.h>

std::list<std::string> qLog;

Expand Down
2 changes: 1 addition & 1 deletion CubeSatLib_All/funcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "funcs.h"
#include "arduino.h"
#include "Arduino.h"

long getTime() {
return millis();
Expand Down
2 changes: 1 addition & 1 deletion CubeSatLib_All/messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "messages.h"
#include "consoleio.h"
#include <arduino.h>
#include <Arduino.h>



Expand Down
4 changes: 2 additions & 2 deletions CubeSatLib_All/msg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "msg.h"
#include "consoleio.h"
#include <arduino.h>
#include <Arduino.h>

int CMsg::_ID = 0;

Expand Down Expand Up @@ -180,4 +180,4 @@ for (auto it = Parameters.begin(); it != Parameters.end(); ++it) {
Parameters.erase(it); //Check to make sure this works
}
}
}
}
2 changes: 1 addition & 1 deletion CubeSatLib_All/phone.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <queue>
#include "funcs.h"

#include <arduino.h>
#include <Arduino.h>

#define BLOCK_LENGTH 200
#define BUFFER_LENGTH 50
Expand Down
2 changes: 1 addition & 1 deletion CubeSatLib_All/powerup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "defs.h"
#include "powerup.h"

#include "arduino.h"
#include "Arduino.h"

#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)

Expand Down
2 changes: 1 addition & 1 deletion CubeSatLib_All/system_mgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <fhmotor.h>
#include "SparkFun_BNO080_Arduino_Library.h"
#include <radio.h>
#include <arduino.h>
#include <Arduino.h>

#include <string>
#include <mdrive.h>
Expand Down
4 changes: 2 additions & 2 deletions CubeSatLib_All/system_pins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "system_pins.h"
#include <arduino.h>
#include <Arduino.h>

void CSatPins::loop() {
}
Expand Down Expand Up @@ -129,4 +129,4 @@ void CSatPins::callCustomFunctions(CMsg &msg){
if(act=="HIGH") high(msg);
if(act=="LOW") low(msg);
if(act=="PWM") pwm(msg);
}
}
4 changes: 2 additions & 2 deletions CubeSatLib_All/systemobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "systemobject.h"
#include "messages.h"
#include <arduino.h>
#include <Arduino.h>
//stateNone->switchOn()->stateOn|StateError
//stateOn->setup()->->stateReady|StateError
//stateReady->switchPlay()->statePlay|StateError
Expand Down Expand Up @@ -411,4 +411,4 @@ int CSystemObject::subscribers(std::string str){
CMessages* pM = getMessages();
pM->addReceivedList(m);

}
}
2 changes: 1 addition & 1 deletion CubeSatLib_All/systemobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
TwoWire *getWire2();
using namespace mbed;
#else
//#include <arduino.h>
//#include <Arduino.h>
typedef int PinName;
#endif

Expand Down