Compare commits
No commits in common. "sheller" and "main" have entirely different histories.
|
|
@ -1,5 +0,0 @@
|
||||||
.pio
|
|
||||||
.vscode/.browse.c_cpp.db*
|
|
||||||
.vscode/c_cpp_properties.json
|
|
||||||
.vscode/launch.json
|
|
||||||
.vscode/ipch
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
|
||||||
// for the documentation about the extensions.json format
|
|
||||||
"recommendations": [
|
|
||||||
"platformio.platformio-ide"
|
|
||||||
],
|
|
||||||
"unwantedRecommendations": [
|
|
||||||
"ms-vscode.cpptools-extension-pack"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
# USDA Pecan Embedded Software (PlatformIO)
|
||||||
|
|
||||||
|
This repo contains separate branches for each microcontroller to store
|
||||||
|
the individualized software.
|
||||||
|
|
||||||
|
Each of:
|
||||||
|
|
||||||
|
- jc
|
||||||
|
- sheller
|
||||||
|
|
||||||
|
Each branch implements the prerequisites for setting up a PlatformIO
|
||||||
|
project to listen to and control equipment via MQTT, as well as
|
||||||
|
sending back relevant diagnostic and statistical information.
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
|
|
||||||
This directory is intended for project header files.
|
|
||||||
|
|
||||||
A header file is a file containing C declarations and macro definitions
|
|
||||||
to be shared between several project source files. You request the use of a
|
|
||||||
header file in your project source file (C, C++, etc) located in `src` folder
|
|
||||||
by including it, with the C preprocessing directive `#include'.
|
|
||||||
|
|
||||||
```src/main.c
|
|
||||||
|
|
||||||
#include "header.h"
|
|
||||||
|
|
||||||
int main (void)
|
|
||||||
{
|
|
||||||
...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Including a header file produces the same results as copying the header file
|
|
||||||
into each source file that needs it. Such copying would be time-consuming
|
|
||||||
and error-prone. With a header file, the related declarations appear
|
|
||||||
in only one place. If they need to be changed, they can be changed in one
|
|
||||||
place, and programs that include the header file will automatically use the
|
|
||||||
new version when next recompiled. The header file eliminates the labor of
|
|
||||||
finding and changing all the copies as well as the risk that a failure to
|
|
||||||
find one copy will result in inconsistencies within a program.
|
|
||||||
|
|
||||||
In C, the usual convention is to give header files names that end with `.h'.
|
|
||||||
It is most portable to use only letters, digits, dashes, and underscores in
|
|
||||||
header file names, and at most one dot.
|
|
||||||
|
|
||||||
Read more about using header files in official GCC documentation:
|
|
||||||
|
|
||||||
* Include Syntax
|
|
||||||
* Include Operation
|
|
||||||
* Once-Only Headers
|
|
||||||
* Computed Includes
|
|
||||||
|
|
||||||
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
|
|
||||||
46
lib/README
46
lib/README
|
|
@ -1,46 +0,0 @@
|
||||||
|
|
||||||
This directory is intended for project specific (private) libraries.
|
|
||||||
PlatformIO will compile them to static libraries and link into executable file.
|
|
||||||
|
|
||||||
The source code of each library should be placed in an own separate directory
|
|
||||||
("lib/your_library_name/[here are source files]").
|
|
||||||
|
|
||||||
For example, see a structure of the following two libraries `Foo` and `Bar`:
|
|
||||||
|
|
||||||
|--lib
|
|
||||||
| |
|
|
||||||
| |--Bar
|
|
||||||
| | |--docs
|
|
||||||
| | |--examples
|
|
||||||
| | |--src
|
|
||||||
| | |- Bar.c
|
|
||||||
| | |- Bar.h
|
|
||||||
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
|
|
||||||
| |
|
|
||||||
| |--Foo
|
|
||||||
| | |- Foo.c
|
|
||||||
| | |- Foo.h
|
|
||||||
| |
|
|
||||||
| |- README --> THIS FILE
|
|
||||||
|
|
|
||||||
|- platformio.ini
|
|
||||||
|--src
|
|
||||||
|- main.c
|
|
||||||
|
|
||||||
and a contents of `src/main.c`:
|
|
||||||
```
|
|
||||||
#include <Foo.h>
|
|
||||||
#include <Bar.h>
|
|
||||||
|
|
||||||
int main (void)
|
|
||||||
{
|
|
||||||
...
|
|
||||||
}
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
PlatformIO Library Dependency Finder will find automatically dependent
|
|
||||||
libraries scanning project source files.
|
|
||||||
|
|
||||||
More information about PlatformIO Library Dependency Finder
|
|
||||||
- https://docs.platformio.org/page/librarymanager/ldf.html
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
; PlatformIO Project Configuration File
|
|
||||||
;
|
|
||||||
; Build options: build flags, source filter
|
|
||||||
; Upload options: custom upload port, speed and extra flags
|
|
||||||
; Library options: dependencies, extra library storages
|
|
||||||
; Advanced options: extra scripting
|
|
||||||
;
|
|
||||||
; Please visit documentation for the other options and examples
|
|
||||||
; https://docs.platformio.org/page/projectconf.html
|
|
||||||
|
|
||||||
[env:opta]
|
|
||||||
platform = ststm32
|
|
||||||
board = opta
|
|
||||||
framework = arduino
|
|
||||||
lib_extra_dirs = ~/Documents/Arduino/libraries
|
|
||||||
131
src/sheller.ino
131
src/sheller.ino
|
|
@ -1,131 +0,0 @@
|
||||||
#include <WiFi.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
#undef DEBUG
|
|
||||||
|
|
||||||
const char* ssid = "IOT-pecan";
|
|
||||||
const char* password = "aaaaaaaa";
|
|
||||||
const char* mqttServer = "192.168.1.110";
|
|
||||||
const int mqttPort = 1883;
|
|
||||||
const char* mqttTopic = "/sheller/angle";
|
|
||||||
|
|
||||||
WiFiClient wifiClient;
|
|
||||||
PubSubClient client(wifiClient);
|
|
||||||
|
|
||||||
String inputString = "";
|
|
||||||
|
|
||||||
const float homeAngle = 2.5;
|
|
||||||
const unsigned long fullRetractTime = 14000;
|
|
||||||
const unsigned long homeTime = 4030;
|
|
||||||
const float maxAngle = 5.5;
|
|
||||||
const float minAngle = 2.5;
|
|
||||||
const unsigned long timeTo5Degrees = 8200;
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
Serial.begin(9600);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
WiFi.begin(ssid, password);
|
|
||||||
while (WiFi.status() != WL_CONNECTED) {
|
|
||||||
delay(1000);
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
Serial.println("Connecting to WiFi...");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
Serial.println("Connected to WiFi");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
client.setServer(mqttServer, mqttPort);
|
|
||||||
client.setCallback(callback);
|
|
||||||
|
|
||||||
digitalWrite(LED_BUILTIN, HIGH);
|
|
||||||
|
|
||||||
pinMode(RELAY3, OUTPUT);
|
|
||||||
pinMode(RELAY4, OUTPUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
unsigned int wifiRetryCount = 0;
|
|
||||||
if (WiFi.status() != WL_CONNECTED){
|
|
||||||
WiFi.disconnect();
|
|
||||||
WiFi.reconnect();
|
|
||||||
|
|
||||||
while (WiFi.status() != WL_CONNECTED){
|
|
||||||
if (wifiRetryCount++ > 5) return;
|
|
||||||
delay(1000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!client.connected()) {
|
|
||||||
reconnect();
|
|
||||||
}
|
|
||||||
client.loop();
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
while (Serial.available() > 0) {
|
|
||||||
char inChar = Serial.read();
|
|
||||||
if (inChar == '\n') {
|
|
||||||
handleInput(inputString);
|
|
||||||
inputString = "";
|
|
||||||
} else {
|
|
||||||
inputString += inChar;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
String input;
|
|
||||||
for (int i = 0; i < length; i++) {
|
|
||||||
input += (char)payload[i];
|
|
||||||
}
|
|
||||||
handleInput(input);
|
|
||||||
}
|
|
||||||
|
|
||||||
void handleInput(String input) {
|
|
||||||
float desiredAngle = input.toFloat();
|
|
||||||
|
|
||||||
if(desiredAngle == 0) {
|
|
||||||
// Fully retract without homing
|
|
||||||
digitalWrite(RELAY3, HIGH);
|
|
||||||
delay(fullRetractTime);
|
|
||||||
digitalWrite(RELAY3, LOW);
|
|
||||||
}
|
|
||||||
else if (desiredAngle >= minAngle && desiredAngle <= maxAngle) {
|
|
||||||
// Fully retract
|
|
||||||
digitalWrite(RELAY3, HIGH);
|
|
||||||
delay(fullRetractTime);
|
|
||||||
digitalWrite(RELAY3, LOW);
|
|
||||||
|
|
||||||
// Home
|
|
||||||
digitalWrite(RELAY3, HIGH);
|
|
||||||
digitalWrite(RELAY4, HIGH);
|
|
||||||
delay(homeTime);
|
|
||||||
digitalWrite(RELAY3, LOW);
|
|
||||||
digitalWrite(RELAY4, LOW);
|
|
||||||
|
|
||||||
unsigned long timeToDesiredAngle = ((desiredAngle - homeAngle) / (maxAngle - homeAngle)) * timeTo5Degrees;
|
|
||||||
|
|
||||||
// Move to desired angle
|
|
||||||
digitalWrite(RELAY3, HIGH);
|
|
||||||
digitalWrite(RELAY4, HIGH);
|
|
||||||
delay(timeToDesiredAngle);
|
|
||||||
digitalWrite(RELAY3, LOW);
|
|
||||||
digitalWrite(RELAY4, LOW);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void reconnect() {
|
|
||||||
while (!client.connected()) {
|
|
||||||
if (client.connect("ArduinoClient")) {
|
|
||||||
client.subscribe(mqttTopic);
|
|
||||||
} else {
|
|
||||||
delay(5000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
11
test/README
11
test/README
|
|
@ -1,11 +0,0 @@
|
||||||
|
|
||||||
This directory is intended for PlatformIO Test Runner and project tests.
|
|
||||||
|
|
||||||
Unit Testing is a software testing method by which individual units of
|
|
||||||
source code, sets of one or more MCU program modules together with associated
|
|
||||||
control data, usage procedures, and operating procedures, are tested to
|
|
||||||
determine whether they are fit for use. Unit testing finds problems early
|
|
||||||
in the development cycle.
|
|
||||||
|
|
||||||
More information about PlatformIO Unit Testing:
|
|
||||||
- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html
|
|
||||||
Loading…
Reference in New Issue